From fdf69629c66f6c1a69d88a00bb6c1311c97b631b Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sat, 20 Jul 2013 15:08:31 -0400
Subject: Ported away from and removed "sp-metrics.*".

(bzr r12380.1.47)
---
 src/sp-text.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 8d42b7d59..d84bbdc6c 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -43,7 +43,6 @@
 #include "sp-namedview.h"
 #include "style.h"
 #include "inkscape.h"
-#include "sp-metrics.h"
 #include "xml/quote.h"
 #include "xml/repr.h"
 #include "mod360.h"
@@ -392,7 +391,8 @@ static char * sp_text_description(SPItem *item)
         n = g_strdup(_("&lt;no name found&gt;"));
     }
 
-    GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, sp_desktop_namedview(SP_ACTIVE_DESKTOP)->getDefaultMetric());
+    Inkscape::Util::Quantity q = Inkscape::Util::Quantity(style->font_size.computed, "px");
+    GString *xs = g_string_new(q.string(*sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units).c_str());
 
     char const *trunc = "";
     Inkscape::Text::Layout const *layout = te_get_layout((SPItem *) item);
-- 
cgit v1.2.3


From f1cdb3b3f47c7187d9325e8ddd8e630268dc8e8b Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Wed, 31 Jul 2013 18:33:03 -0400
Subject: Eliminate "unit-constants.h".

(bzr r12380.1.54)
---
 src/sp-text.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index d84bbdc6c..9e0befcca 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -55,7 +55,6 @@
 #include "sp-tspan.h"
 
 #include "text-editing.h"
-#include "unit-constants.h"
 
 /*#####################################################
 #  SPTEXT
-- 
cgit v1.2.3