diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-12-25 11:40:35 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-12-25 11:40:35 +0000 |
| commit | 9a8bd0c8c29161a2fd91ccb48a3a813d4a45ac99 (patch) | |
| tree | ff76ccc40eff6789fba245ff1c8ee15d5b5303da /src/ui/widget/style-swatch.cpp | |
| parent | Remove sp_style_read_from_object() (diff) | |
| download | inkscape-9a8bd0c8c29161a2fd91ccb48a3a813d4a45ac99.tar.gz inkscape-9a8bd0c8c29161a2fd91ccb48a3a813d4a45ac99.zip | |
Remove sp_style_write_string() and sp_style_write_difference().
(bzr r13822.1.4)
Diffstat (limited to 'src/ui/widget/style-swatch.cpp')
| -rw-r--r-- | src/ui/widget/style-swatch.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index 157fd2ad9..fa8543c46 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -260,13 +260,12 @@ void StyleSwatch::setStyle(SPCSSAttr *css) Glib::ustring css_string; sp_repr_css_write_string (_css, css_string); - SPStyle *temp_spstyle = sp_style_new(SP_ACTIVE_DOCUMENT); + + SPStyle style(SP_ACTIVE_DOCUMENT); if (!css_string.empty()) { - sp_style_merge_from_style_string (temp_spstyle, css_string.c_str()); + style.mergeString(css_string.c_str()); } - - setStyle (temp_spstyle); - sp_style_unref (temp_spstyle); + setStyle (&style); } void StyleSwatch::setStyle(SPStyle *query) |