diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-07-06 16:43:38 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-07-06 16:43:38 +0000 |
| commit | 49d1acd3a9813ad7a8fda3d204a30401cb35d8fd (patch) | |
| tree | b74755bcefb028fbbd3831dacd47342429cebdef /src/ui/dialog/document-properties.cpp | |
| parent | Fix for bug #1740146: always get current namedview, because it might have cha... (diff) | |
| download | inkscape-49d1acd3a9813ad7a8fda3d204a30401cb35d8fd.tar.gz inkscape-49d1acd3a9813ad7a8fda3d204a30401cb35d8fd.zip | |
Fix #1740146.
(bzr r3190)
Diffstat (limited to 'src/ui/dialog/document-properties.cpp')
| -rw-r--r-- | src/ui/dialog/document-properties.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 9bf2d761d..0817b06ab 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -529,10 +529,12 @@ on_doc_replaced (SPDesktop* dt, SPDocument* doc) void DocumentProperties::onNewGrid() { - Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); + SPDesktop *dt = SP_ACTIVE_DESKTOP; + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt)); + SPDocument *doc = sp_desktop_document(dt); Glib::ustring typestring = _grids_combo_gridtype.get_active_text(); - CanvasGrid::writeNewGridToRepr(repr, CanvasGrid::getGridTypeFromName(typestring.c_str())); + CanvasGrid::writeNewGridToRepr(repr, doc, CanvasGrid::getGridTypeFromName(typestring.c_str())); } @@ -564,7 +566,7 @@ DocumentProperties::onRemoveGrid() // delete the grid that corresponds with the selected tab // when the grid is deleted from SVG, the SPNamedview handler automatically deletes the object, so found_grid becomes an invalid pointer! found_grid->repr->parent()->removeChild(found_grid->repr); - sp_document_done(sp_desktop_document(dt), SP_VERB_DIALOG_NAMEDVIEW, _("Remove grid")); + sp_document_done(sp_desktop_document(dt), SP_VERB_DIALOG_NAMEDVIEW, _("Remove grid")); } } |