summaryrefslogtreecommitdiffstats
path: root/src/sp-style-elem.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-12-24 10:27:30 +0000
committertavmjong-free <tavmjong@free.fr>2014-12-24 10:27:30 +0000
commitc10ae6598c095b0273672f764f0fe0e684c94b87 (patch)
treed837f1351dc1aa71f23eaf063b805e64cb4d336b /src/sp-style-elem.cpp
parentAdd missing SPStyle::readFromPrefs(), remove sp_style_read_from_prefs(). (diff)
downloadinkscape-c10ae6598c095b0273672f764f0fe0e684c94b87.tar.gz
inkscape-c10ae6598c095b0273672f764f0fe0e684c94b87.zip
Remove sp_style_read_from_object()
(bzr r13822.1.3)
Diffstat (limited to 'src/sp-style-elem.cpp')
-rw-r--r--src/sp-style-elem.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/sp-style-elem.cpp b/src/sp-style-elem.cpp
index da17b08d9..668780272 100644
--- a/src/sp-style-elem.cpp
+++ b/src/sp-style-elem.cpp
@@ -319,13 +319,14 @@ void SPStyleElem::read_content() {
//requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
// Style references via class= do not, and actually cannot, use autoupdating URIReferences.
- // Therefore, if an object refers to a stylesheet which has not yet loaded when the object is being loaded
- // (e.g. if the stylesheet is below or inside the object in XML), its class= has no effect (bug 1491639).
- // Below is a partial hack that fixes this for a single case: when the <style> is a child of the object
- // that uses a style from it. It just forces the parent of <style> to reread its style as soon as the stylesheet
- // is fully loaded. Naturally, this won't work if the user of the stylesheet is its grandparent or precedent.
+ // Therefore, if an object refers to a stylesheet which has not yet loaded when the object is
+ // being loaded (e.g. if the stylesheet is below or inside the object in XML), its class= has
+ // no effect (bug 1491639). Below is a partial hack that fixes this for a single case: when
+ // the <style> is a child of the object that uses a style from it. It just forces the parent of
+ // <style> to reread its style as soon as the stylesheet is fully loaded. Naturally, this won't
+ // work if the user of the stylesheet is its grandparent or precedent.
if ( parent ) {
- sp_style_read_from_object(parent->style, parent);
+ parent->style->readFromObject( parent );
}
}