diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
| commit | d2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch) | |
| tree | e2703384779e83312c456399999997fcc289c5cf /src/desktop-style.cpp | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 19582c9ee..23f803d6a 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -197,10 +197,8 @@ sp_desktop_set_style(Inkscape::ObjectSet *set, SPDesktop *desktop, SPCSSAttr *cs SPObject *obj = *i; Box3DSide *side = dynamic_cast<Box3DSide *>(obj); if (side) { - const char * descr = box3d_side_axes_string(side); - if (descr != NULL) { - prefs->mergeStyle(Glib::ustring("/desktop/") + descr + "/style", css_write); - } + prefs->mergeStyle( + Glib::ustring("/desktop/") + box3d_side_axes_string(side) + "/style", css_write); } } sp_repr_css_attr_unref(css_write); |