summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: be34f93)
raw | patch | inline | side by side (parent: be34f93)
author | sasilver <sasilver@users.sourceforge.net> | |
Tue, 8 Jul 2008 13:00:20 +0000 (13:00 +0000) | ||
committer | sasilver <sasilver@users.sourceforge.net> | |
Tue, 8 Jul 2008 13:00:20 +0000 (13:00 +0000) |
src/sp-flowtext.cpp | patch | blob | history | |
src/sp-text.cpp | patch | blob | history |
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 596d47ba4dacda946f3f469924bd678afa6975fa..8621a27b576005338c343d468184c13c52213426 100644 (file)
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -463,7 +463,7 @@ void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape,
layout.appendWrapShape(&shapes->back());
}
}
- else if (!SP_IS_FLOWREGIONEXCLUDE(child))
+ else if (!SP_IS_FLOWREGIONEXCLUDE(child) && !sp_repr_is_meta_element(child->repr))
_buildLayoutInput(child, exclusion_shape, shapes, pending_line_break_object);
}
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 8e4b732bc7e4ff35d88987b9eff3344d105d1046..0390df6bfa7901646c55470a47dda7a8c1f6b18c 100644 (file)
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -553,7 +553,7 @@ unsigned SPText::_buildLayoutInput(SPObject *root, Inkscape::Text::Layout::Optio
Glib::ustring const &string = SP_STRING(child)->string;
layout.appendText(string, root->style, child, &optional_attrs, child_attrs_offset + length);
length += string.length();
- } else {
+ } else if (!sp_repr_is_meta_element(child->repr)) {
length += _buildLayoutInput(child, optional_attrs, child_attrs_offset + length, in_textpath);
}
}