summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-07-27 11:44:25 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-07-27 11:44:25 +0000
commit3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af (patch)
tree981526f208f9998ea858cfd55a2c946f72dcb02e /src/ui/widget
parentupdate to trunk (r13454) (diff)
parentProperly fix 1309050, revert incorrect fix for 601336 (diff)
downloadinkscape-3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af.tar.gz
inkscape-3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af.zip
update to trunk (r13472)
(bzr r13398.1.5)
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/style-swatch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index a33c1d09f..98f4e47cd 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -261,7 +261,7 @@ 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);
- if (~css_string.empty()) {
+ if (!css_string.empty()) {
sp_style_merge_from_style_string (temp_spstyle, css_string.c_str());
}