summaryrefslogtreecommitdiffstats
path: root/src/sp-tspan.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-30 21:35:42 +0000
commit8756c49b91fd4262b6770ac3b2f229209bdae96b (patch)
tree67ac89d7bc7c69e04e811324734dccafc07f33c9 /src/sp-tspan.cpp
parentMerged from trunk (r12465). (diff)
parentMerge emf/wmf work (diff)
downloadinkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.tar.gz
inkscape-8756c49b91fd4262b6770ac3b2f229209bdae96b.zip
Merged from trunk (r12488).
(bzr r11608.1.120)
Diffstat (limited to 'src/sp-tspan.cpp')
-rw-r--r--src/sp-tspan.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 00cdf5722..63dcd07d8 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -326,7 +326,7 @@ void SPTextPath::update(SPCtx *ctx, guint flags) {
}
-void refresh_textpath_source(SPTextPath* tp)
+void refresh_textpath_source(SPTextPath* tp)
{
if ( tp == NULL ) {
return;
@@ -429,21 +429,19 @@ Inkscape::XML::Node* SPTextPath::write(Inkscape::XML::Document *xml_doc, Inkscap
}
-SPItem *
-sp_textpath_get_path_item(SPTextPath *tp)
+SPItem *sp_textpath_get_path_item(SPTextPath *tp)
{
if (tp && tp->sourcePath) {
SPItem *refobj = tp->sourcePath->getObject();
if (SP_IS_ITEM(refobj)) {
- return (SPItem *) refobj;
+ return refobj;
}
}
return NULL;
}
-void
-sp_textpath_to_text(SPObject *tp)
+void sp_textpath_to_text(SPObject *tp)
{
SPObject *text = tp->parent;