summaryrefslogtreecommitdiffstats
path: root/src/text-editing.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-03-29 23:52:42 +0000
committerMarkus Engel <markus.engel@tum.de>2013-03-29 23:52:42 +0000
commita168040d5a452544328a1e6ad35aaac351f94d44 (patch)
treefae1ba829f543a473da281bd5fa6e4deabbf6912 /src/text-editing.cpp
parentRemoved function pointers from SPObject and subclasses. (diff)
parentDutch translation update (diff)
downloadinkscape-a168040d5a452544328a1e6ad35aaac351f94d44.tar.gz
inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.zip
merged from trunk
(bzr r11608.1.56)
Diffstat (limited to 'src/text-editing.cpp')
-rw-r--r--src/text-editing.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 44b323989..401f56bb2 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -29,6 +29,7 @@
#include "document.h"
#include "xml/repr.h"
#include "xml/attribute-record.h"
+#include "xml/sp-css-attr.h"
#include "sp-textpath.h"
#include "sp-flowtext.h"
@@ -68,7 +69,7 @@ void te_update_layout_now_recursive(SPItem *item)
if (SP_IS_GROUP(item)) {
GSList *item_list = sp_item_group_item_list(SP_GROUP(item));
for(GSList* elem = item_list; elem; elem = elem->next) {
- SPItem* list_item = (SPItem*) elem->data;
+ SPItem* list_item = static_cast<SPItem*>(elem->data);
te_update_layout_now_recursive(list_item);
}
g_slist_free(item_list);