diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-01-24 18:11:26 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-01-24 18:11:26 +0000 |
| commit | 176b68d76f6b684b4bf0797e1d132e8377bddab0 (patch) | |
| tree | b1918157cb8d5ada5bb76a0fd98b2433d2dd476d /src/file.cpp | |
| parent | Fix a translation bug in rotate copies LPE (diff) | |
| parent | Put namespace as constant (diff) | |
| download | inkscape-176b68d76f6b684b4bf0797e1d132e8377bddab0.tar.gz inkscape-176b68d76f6b684b4bf0797e1d132e8377bddab0.zip | |
merge lp:~inkscape.dev/inkscape/doc_rotate
(bzr r15444)
Diffstat (limited to 'src/file.cpp')
| -rw-r--r-- | src/file.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/file.cpp b/src/file.cpp index e8248bb8e..6613b1e65 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -293,10 +293,12 @@ 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(); + page_border_rotated = sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated; } - + SPDocument *doc = NULL; bool cancelled = false; try { @@ -315,7 +317,6 @@ bool sp_file_open(const Glib::ustring &uri, } if (doc) { - SPDocument *existing = desktop ? desktop->getDocument() : NULL; if (existing && existing->virgin && replace_empty) { @@ -323,6 +324,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. |