summaryrefslogtreecommitdiffstats
path: root/src/extension/dbus/document-interface.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-09-24 22:17:24 +0000
committerMarkus Engel <markus.engel@tum.de>2013-09-24 22:17:24 +0000
commitbcca22a25ae98f70c36fff6292f0a8fe4e578d89 (patch)
treea18d382d32f471b7119b9b7b2782cec04d6da43f /src/extension/dbus/document-interface.cpp
parentRefactored SPUse. (diff)
parentFix my email address through codebase (diff)
downloadinkscape-bcca22a25ae98f70c36fff6292f0a8fe4e578d89.tar.gz
inkscape-bcca22a25ae98f70c36fff6292f0a8fe4e578d89.zip
Merged from trunk (r12588).
(bzr r11608.1.129)
Diffstat (limited to 'src/extension/dbus/document-interface.cpp')
-rw-r--r--src/extension/dbus/document-interface.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index 3cb03646a..ccc39fbef 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -43,6 +43,7 @@
#include "sp-object.h"
#include "sp-root.h"
#include "style.h" //style_write
+#include "util/units.h"
#include "extension/system.h" //IO
@@ -543,13 +544,13 @@ gchar *document_interface_node(DocumentInterface *doc_interface, gchar *type, GE
gdouble
document_interface_document_get_width (DocumentInterface *doc_interface)
{
- return doc_interface->target.getDocument()->getWidth();
+ return doc_interface->target.getDocument()->getWidth().value("px");
}
gdouble
document_interface_document_get_height (DocumentInterface *doc_interface)
{
- return doc_interface->target.getDocument()->getHeight();
+ return doc_interface->target.getDocument()->getHeight().value("px");
}
gchar *document_interface_document_get_css(DocumentInterface *doc_interface, GError ** error)