diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-06-27 05:41:53 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-06-27 05:41:53 +0000 |
| commit | 6f008746350aab3d895a7905e1dd036a9b615a94 (patch) | |
| tree | 736226313250bc53a193b4f4cf516f6909efcc8e /src/text-editing.cpp | |
| parent | fix issue introduced in r14229 (diff) | |
| download | inkscape-6f008746350aab3d895a7905e1dd036a9b615a94.tar.gz inkscape-6f008746350aab3d895a7905e1dd036a9b615a94.zip | |
switch SPStyle to using SPFilterReference for filters; sp_style_new now requires an SPDocument; SPURIReference and SPFilterReference have an alternative constructor taking an owner_document instead of owner object
(bzr r3116)
Diffstat (limited to 'src/text-editing.cpp')
| -rw-r--r-- | src/text-editing.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp index b84361324..233ac8d3f 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -1103,7 +1103,7 @@ as opposed to sp_style_merge_from_style_string which merges its parameter underneath the existing styles (ie ignoring already set properties). */ static void overwrite_style_with_string(SPObject *item, gchar const *style_string) { - SPStyle *new_style = sp_style_new(); + SPStyle *new_style = sp_style_new(SP_OBJECT_DOCUMENT(item)); sp_style_merge_from_style_string(new_style, style_string); gchar const *item_style_string = SP_OBJECT_REPR(item)->attribute("style"); if (item_style_string && *item_style_string) @@ -1128,7 +1128,7 @@ static bool objects_have_equal_style(SPObject const *parent, SPObject const *chi gchar *parent_style = sp_style_write_string(parent->style, SP_STYLE_FLAG_ALWAYS); // we have to write parent_style then read it again, because some properties format their values // differently depending on whether they're set or not (*cough*dash-offset*cough*) - SPStyle *parent_spstyle = sp_style_new(); + SPStyle *parent_spstyle = sp_style_new(SP_OBJECT_DOCUMENT(parent)); sp_style_merge_from_style_string(parent_spstyle, parent_style); g_free(parent_style); parent_style = sp_style_write_string(parent_spstyle, SP_STYLE_FLAG_ALWAYS); @@ -1144,7 +1144,7 @@ static bool objects_have_equal_style(SPObject const *parent, SPObject const *chi } child = SP_OBJECT_PARENT(child); } - SPStyle *child_spstyle = sp_style_new(); + SPStyle *child_spstyle = sp_style_new(SP_OBJECT_DOCUMENT(parent)); sp_style_merge_from_style_string(child_spstyle, child_style_construction.c_str()); gchar *child_style = sp_style_write_string(child_spstyle, SP_STYLE_FLAG_ALWAYS); sp_style_unref(child_spstyle); |