Ported "ui/widget/page-sizer.cpp" and "document.cpp" to "Util::Unit" class.

(bzr r12380.1.4)

1 files changed, 7 insertions, 4 deletions

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 452f57425..5184d37a9 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -1101,20 +1101,23 @@ bool SPNamedView::getGuides()
  * \return the margin size in px, else 0.0 if anything is invalid.
  */
 double SPNamedView::getMarginLength(gchar const * const key,
-                             SPUnit const * const margin_units,
-                             SPUnit const * const return_units,
+                             Inkscape::Util::Unit const * const margin_units,
+                             Inkscape::Util::Unit const * const return_units,
                              double const width,
                              double const height,
                              bool const use_width)
 {
     double value;
+    static Inkscape::Util::UnitTable unit_table;
+    Inkscape::Util::Unit percent = unit_table.getUnit("%");
     if(!this->storeAsDouble(key,&value)) {
         return 0.0;
     }
-    if (margin_units == &sp_unit_get_by_id (SP_UNIT_PERCENT)) {
+    if (*margin_units == percent) {
         return (use_width)? width * value : height * value; 
     }
-    if (!sp_convert_distance (&value, margin_units, return_units)) {
+//    if (!sp_convert_distance (&value, margin_units, return_units)) {
+    if (!margin_units->compatibleWith(return_units)) {
         return 0.0;
     }
     return value;