summaryrefslogtreecommitdiffstats
path: root/src/sp-flowtext.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/sp-flowtext.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/sp-flowtext.cpp')
-rw-r--r--src/sp-flowtext.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 8d9f87037..6d2385aff 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -525,10 +525,10 @@ Inkscape::XML::Node *SPFlowtext::getAsText()
Glib::ustring::iterator span_text_start_iter;
this->layout.getSourceOfCharacter(it, &rawptr, &span_text_start_iter);
SPObject *source_obj = reinterpret_cast<SPObject *>(rawptr);
- gchar *style_text = sp_style_write_difference((dynamic_cast<SPString *>(source_obj) ? source_obj->parent : source_obj)->style, this->style);
- if (style_text && *style_text) {
- span_tspan->setAttribute("style", style_text);
- g_free(style_text);
+
+ Glib::ustring style_text = (dynamic_cast<SPString *>(source_obj) ? source_obj->parent : source_obj)->style->write( SP_STYLE_FLAG_IFDIFF, this->style);
+ if (!style_text.empty()) {
+ span_tspan->setAttribute("style", style_text.c_str());
}
SPString *str = dynamic_cast<SPString *>(source_obj);