summaryrefslogtreecommitdiffstats
path: root/src/desktop-style.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-12-25 11:40:35 +0000
committertavmjong-free <tavmjong@free.fr>2014-12-25 11:40:35 +0000
commit9a8bd0c8c29161a2fd91ccb48a3a813d4a45ac99 (patch)
treeff76ccc40eff6789fba245ff1c8ee15d5b5303da /src/desktop-style.cpp
parentRemove sp_style_read_from_object() (diff)
downloadinkscape-9a8bd0c8c29161a2fd91ccb48a3a813d4a45ac99.tar.gz
inkscape-9a8bd0c8c29161a2fd91ccb48a3a813d4a45ac99.zip
Remove sp_style_write_string() and sp_style_write_difference().
(bzr r13822.1.4)
Diffstat (limited to 'src/desktop-style.cpp')
-rw-r--r--src/desktop-style.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 3eb11bea6..ee9fa39ec 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -428,10 +428,9 @@ sp_desktop_get_font_size_tool(SPDesktop *desktop)
double ret = 12;
if (!style_str.empty()) {
- SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT);
- sp_style_merge_from_style_string(style, style_str.data());
- ret = style->font_size.computed;
- sp_style_unref(style);
+ SPStyle style(SP_ACTIVE_DOCUMENT);
+ style.mergeString(style_str.data());
+ ret = style.font_size.computed;
}
return ret;
}