From c7f5c676fa15f59f5f78c934263539981a26bbd2 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 10 Oct 2016 14:08:35 +0200
Subject: Fix some canvas problems and refactorization

(bzr r15142.1.8)
---
 src/file.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/file.cpp')

diff --git a/src/file.cpp b/src/file.cpp
index 7c17a6158..5a51bbf52 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -259,8 +259,9 @@ bool sp_file_open(const Glib::ustring &uri,
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop) {
         desktop->setWaitingCursor();
+        desktop->remove_temporary_canvasitem(sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated);
     }
-
+    
     SPDocument *doc = NULL;
     bool cancelled = false;
     try {
@@ -287,7 +288,6 @@ bool sp_file_open(const Glib::ustring &uri,
             doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc->getDisplayUnit()), doc->getHeight().value(doc->getDisplayUnit())));
             DocumentUndo::setUndoSensitive(doc, true);
         }
-
         SPDocument *existing = desktop ? desktop->getDocument() : NULL;
 
         if (existing && existing->virgin && replace_empty) {
-- 
cgit v1.2.3


From b949d0bdb9f751a94fd71f8bab7610d9a6a11a90 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 10 Oct 2016 16:06:22 +0200
Subject: Fix some canvas item problems and refresh items on rotate

(bzr r15142.1.10)
---
 src/file.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/file.cpp')

diff --git a/src/file.cpp b/src/file.cpp
index 5a51bbf52..324998774 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -257,9 +257,10 @@ bool sp_file_open(const Glib::ustring &uri,
                   bool replace_empty)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    Inkscape::Display::TemporaryItem *page_border_rotated = NULL;
     if (desktop) {
         desktop->setWaitingCursor();
-        desktop->remove_temporary_canvasitem(sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated);
+        page_border_rotated = sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated;
     }
     
     SPDocument *doc = NULL;
@@ -295,6 +296,7 @@ bool sp_file_open(const Glib::ustring &uri,
             doc->ensureUpToDate(); // TODO this will trigger broken link warnings, etc.
             desktop->change_document(doc);
             doc->emitResizedSignal(doc->getWidth().value("px"), doc->getHeight().value("px"));
+            desktop->remove_temporary_canvasitem(page_border_rotated);
         } else {
             // create a whole new desktop and window
             SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
-- 
cgit v1.2.3