diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-12-26 18:49:12 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-12-26 18:49:12 +0000 |
| commit | 74f6d0cf39c974ca1980a7be7742f2154d2025f2 (patch) | |
| tree | f98b503be33ccc32c1074c5c670a0cd9b5fb5332 /src/sp-flowtext.cpp | |
| parent | Documentation. Fix for bug #1405653 (Outdated links in hacking doc). (diff) | |
| parent | SPStyle ref counting clean up. (diff) | |
| download | inkscape-74f6d0cf39c974ca1980a7be7742f2154d2025f2.tar.gz inkscape-74f6d0cf39c974ca1980a7be7742f2154d2025f2.zip | |
Replace sp_style_xxx functions with SPStyle member functions.
Fix a bunch of memory leaks. One leak still remaining in Layout::appendText.
(bzr r13824)
Diffstat (limited to 'src/sp-flowtext.cpp')
| -rw-r--r-- | src/sp-flowtext.cpp | 8 |
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); |