diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-02-05 16:57:48 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-02-05 16:57:48 +0000 |
| commit | 2fe2bf0ac3026964cbf3c76c357a37f2ab4341ef (patch) | |
| tree | e24173bd7cf248d3e369ddf0b04774f7f57a84d7 /src | |
| parent | Fix C++11 errors and warnings with g++-7 (diff) | |
| download | inkscape-2fe2bf0ac3026964cbf3c76c357a37f2ab4341ef.tar.gz inkscape-2fe2bf0ac3026964cbf3c76c357a37f2ab4341ef.zip | |
Fix styling breakage from r15471.
(bzr r15478)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-object.cpp | 2 | ||||
| -rw-r--r-- | src/style.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index cc862417d..7807703f6 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -1063,7 +1063,7 @@ Inkscape::XML::Node* SPObject::write(Inkscape::XML::Document *doc, Inkscape::XML if (style) { // Write if property set by style attribute in this object Glib::ustring s = - style->write(SP_STYLE_FLAG_IFSET & SP_STYLE_FLAG_IFSRC, SP_STYLE_SRC_STYLE_PROP); + style->write(SP_STYLE_FLAG_IFSET | SP_STYLE_FLAG_IFSRC, SP_STYLE_SRC_STYLE_PROP); // Check for valid attributes. This may be time consuming. // It is useful, though, for debugging Inkscape code. diff --git a/src/style.cpp b/src/style.cpp index b65cb26cb..0b0358bb2 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1003,7 +1003,7 @@ SPStyle::readIfUnset( gint id, gchar const *val, SPStyleSrc const &source ) { Glib::ustring SPStyle::write( guint const flags, SPStyleSrc const &style_src_req, SPStyle const *const base ) const { - // std::cout << "SPStyle::write" << std::endl; + // std::cout << "SPStyle::write: flags: " << flags << std::endl; Glib::ustring style_string; for(std::vector<SPIBase*>::size_type i = 0; i != _properties.size(); ++i) { @@ -1114,7 +1114,7 @@ SPStyle::_mergeString( gchar const *const p ) { CRDeclaration *const decl_list = cr_declaration_parse_list_from_buf(reinterpret_cast<guchar const *>(p), CR_UTF_8); if (decl_list) { - _mergeDeclList( decl_list, SP_STYLE_SRC_ATTRIBUTE ); + _mergeDeclList( decl_list, SP_STYLE_SRC_STYLE_PROP ); cr_declaration_destroy(decl_list); } } |