diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2013-10-12 22:24:05 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2013-10-12 22:24:05 +0000 |
| commit | a970dc423d59ea844bdb1af48d5d9419a5e2a287 (patch) | |
| tree | 8f6a51df0574fe048ae7e791f276e72716aa090c /src/ui/dialog/document-properties.cpp | |
| parent | Fix crash with experimental lpe tool. (diff) | |
| download | inkscape-a970dc423d59ea844bdb1af48d5d9419a5e2a287.tar.gz inkscape-a970dc423d59ea844bdb1af48d5d9419a5e2a287.zip | |
Units: stop newing Unit objects. pass around pointers to "undeletable" Unit objects in the UnitTable. I think we should move to using indexed units, and pass around the index of the unit in the unittable, or smth like that... ?
(bzr r12679)
Diffstat (limited to 'src/ui/dialog/document-properties.cpp')
| -rw-r--r-- | src/ui/dialog/document-properties.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 37d0ce213..a6019c55c 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -1441,7 +1441,7 @@ void DocumentProperties::update() _rum_deflt.setUnit (nv->doc_units->abbr); double doc_w = sp_desktop_document(dt)->getRoot()->width.value; - Glib::ustring doc_w_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->width.unit).abbr; + Glib::ustring doc_w_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->width.unit)->abbr; if (doc_w_unit == "") { doc_w_unit = "px"; } else if (doc_w_unit == "%" && sp_desktop_document(dt)->getRoot()->viewBox_set) { @@ -1449,7 +1449,7 @@ void DocumentProperties::update() doc_w = sp_desktop_document(dt)->getRoot()->viewBox.width(); } double doc_h = sp_desktop_document(dt)->getRoot()->height.value; - Glib::ustring doc_h_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->height.unit).abbr; + Glib::ustring doc_h_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->height.unit)->abbr; if (doc_h_unit == "") { doc_h_unit = "px"; } else if (doc_h_unit == "%" && sp_desktop_document(dt)->getRoot()->viewBox_set) { @@ -1644,11 +1644,11 @@ void DocumentProperties::onDocUnitChange() { SPDocument *doc = SP_ACTIVE_DOCUMENT; Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr(); - Inkscape::Util::Unit old_doc_unit = unit_table.getUnit("px"); + Inkscape::Util::Unit const *old_doc_unit = unit_table.getUnit("px"); if(repr->attribute("inkscape:document-units")) { old_doc_unit = unit_table.getUnit(repr->attribute("inkscape:document-units")); } - Inkscape::Util::Unit doc_unit = _rum_deflt.getUnit(); + Inkscape::Util::Unit const *doc_unit = _rum_deflt.getUnit(); // Don't execute when change is being undone if (!DocumentUndo::getUndoSensitive(doc)) { @@ -1657,7 +1657,7 @@ void DocumentProperties::onDocUnitChange() // Set document unit Inkscape::SVGOStringStream os; - os << doc_unit.abbr; + os << doc_unit->abbr; repr->setAttribute("inkscape:document-units", os.str().c_str()); // Set viewBox |