From de91fb305ef9afbead53d70421db60f3fb7d8a4c Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 1 Jun 2016 21:13:32 +0200
Subject: Remove last use of getSVGUnit() and remove all remnants of this
 abomination.

(bzr r14939)
---
 src/document.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/document.cpp')

diff --git a/src/document.cpp b/src/document.cpp
index 2500a5cee..e9388893e 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -589,15 +589,6 @@ Inkscape::Util::Unit const* SPDocument::getDisplayUnit() const
     return nv ? nv->getDisplayUnit() : unit_table.getUnit("px");
 }
 
-/// guaranteed not to return nullptr
-// returns 'px' units as default, like legacy Inkscape
-// THIS SHOULD NOT BE USED... INSTEAD USE DOCUMENT SCALE
-Inkscape::Util::Unit const& SPDocument::getSVGUnit() const
-{
-    SPNamedView const* nv = sp_document_namedview(this, NULL);
-    return nv ? nv->getSVGUnit() : *unit_table.getUnit("px");
-}
-
 /// Sets document scale (by changing viewBox)
 void SPDocument::setDocumentScale( double scaleX, double scaleY ) {
 
-- 
cgit v1.2.3


From 5401a129da2f319316221727fef5c516c3a72906 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 8 Jun 2016 11:16:29 +0200
Subject: Only update inkscape.version on successful file write.

(bzr r14965)
---
 src/document.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/document.cpp')

diff --git a/src/document.cpp b/src/document.cpp
index e9388893e..d8c3f1269 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -369,11 +369,6 @@ SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc,
     // Recursively build object tree
     document->root->invoke_build(document, rroot, false);
 
-    /* fixme: Not sure about this, but lets assume ::build updates */
-    rroot->setAttribute("inkscape:version", Inkscape::version_string);
-    /* fixme: Again, I moved these here to allow version determining in ::build (Lauris) */
-
-
     /* Eliminate obsolete sodipodi:docbase, for privacy reasons */
     rroot->setAttribute("sodipodi:docbase", NULL);
 
-- 
cgit v1.2.3