diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2016-09-23 12:51:11 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2016-09-23 12:51:11 +0000 |
| commit | 23fe0d70dbef6ac9b12090c36c50abdc5387c547 (patch) | |
| tree | 6c67e18c9e92508ceb0babbd1d4d27991db7d9e6 /src/preferences.cpp | |
| parent | Remove "== true"s (diff) | |
| parent | Remove properties with default values from 'style' entries in users preferenc... (diff) | |
| download | inkscape-23fe0d70dbef6ac9b12090c36c50abdc5387c547.tar.gz inkscape-23fe0d70dbef6ac9b12090c36c50abdc5387c547.zip | |
Merged.
(bzr r15100.1.20)
Diffstat (limited to 'src/preferences.cpp')
| -rw-r--r-- | src/preferences.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/preferences.cpp b/src/preferences.cpp index 988604a14..4d522a1d8 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -24,6 +24,7 @@ #include "xml/node-iterators.h" #include "xml/attribute-record.h" #include "util/units.h" +#include "attribute-rel-util.h" #define PREFERENCES_FILE_NAME "preferences.xml" @@ -495,6 +496,7 @@ void Preferences::mergeStyle(Glib::ustring const &pref_path, SPCSSAttr *style) { SPCSSAttr *current = getStyle(pref_path); sp_repr_css_merge(current, style); + sp_attribute_purge_default_style(current, SP_ATTR_CLEAN_DEFAULT_REMOVE); Glib::ustring css_str; sp_repr_css_write_string(current, css_str); _setRawValue(pref_path, css_str); |