summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-07-19 18:32:09 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-07-19 18:32:09 +0000
commit231a793d4d28f83b55fe9104a6593d72bca75219 (patch)
tree14494a4f55deb72bf489960cc3d78ef48cf8677c /src
parentRemoved "helper/unit-menu.h" and "helper/units.h" from "flood-context.h". (diff)
downloadinkscape-231a793d4d28f83b55fe9104a6593d72bca75219.tar.gz
inkscape-231a793d4d28f83b55fe9104a6593d72bca75219.zip
Removed "helper/units.h" from "ui/dialog/document-properties.cpp".
(bzr r12380.1.33)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/document-properties.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index af462a1df..77fb182e5 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -28,7 +28,6 @@
#include "document.h"
#include "desktop-handles.h"
#include "desktop.h"
-#include "helper/units.h"
#include "inkscape.h"
#include "io/sys.h"
#include "preferences.h"
@@ -1431,8 +1430,8 @@ void DocumentProperties::update()
_rcp_bord.setRgba32 (nv->bordercolor);
_rcb_shad.setActive (nv->showpageshadow);
- //if (nv->doc_units)
- // _rum_deflt.setUnit (nv->doc_units);
+ if (nv->doc_units)
+ _rum_deflt.setUnit (nv->doc_units->abbr);
double const doc_w_px = sp_desktop_document(dt)->getWidth();
double const doc_h_px = sp_desktop_document(dt)->getHeight();