diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-08-29 21:06:10 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-08-29 21:06:10 +0000 |
| commit | 4d331e73a76dce7d703716093923ca01b3cc5936 (patch) | |
| tree | b444657ba269b25f60684e66858a138b74fe240d /src/sp-use.cpp | |
| parent | Fix compiler warnings (diff) | |
| parent | Updating outdated test. Fixes bug #1202271. (diff) | |
| download | inkscape-4d331e73a76dce7d703716093923ca01b3cc5936.tar.gz inkscape-4d331e73a76dce7d703716093923ca01b3cc5936.zip | |
merge from trunk (r12487)
(bzr r11668.1.75)
Diffstat (limited to 'src/sp-use.cpp')
| -rw-r--r-- | src/sp-use.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/sp-use.cpp b/src/sp-use.cpp index 2220b4b47..5ec1f2523 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -252,8 +252,7 @@ sp_use_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML:: return repr; } -static Geom::OptRect -sp_use_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBoxType type) +static Geom::OptRect sp_use_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBoxType type) { SPUse const *use = SP_USE(item); Geom::OptRect bbox; @@ -269,8 +268,7 @@ sp_use_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBoxType return bbox; } -static void -sp_use_print(SPItem *item, SPPrintContext *ctx) +static void sp_use_print(SPItem *item, SPPrintContext *ctx) { bool translated = false; SPUse *use = SP_USE(item); @@ -290,12 +288,10 @@ sp_use_print(SPItem *item, SPPrintContext *ctx) } } -static gchar * -sp_use_description(SPItem *item) +static gchar *sp_use_description(SPItem *item) { SPUse *use = SP_USE(item); - char *ret; if (use->child) { if( SP_IS_SYMBOL( use->child ) ) { @@ -316,7 +312,7 @@ sp_use_description(SPItem *item) char *child_desc = SP_ITEM(use->child)->description(); --recursion_depth; - ret = g_strdup_printf(_("<b>Clone</b> of: %s"), child_desc); + char *ret = g_strdup_printf(_("<b>Clone</b> of: %s"), child_desc); g_free(child_desc); return ret; } else { |