diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-09-19 17:32:15 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-09-19 17:32:15 +0000 |
| commit | 658a60b2ffdb7ed361b3c3b57d62efd419f7ba47 (patch) | |
| tree | 7f0f76347c27e59a784b4a3af990af7b247c5b41 /src/sp-string.cpp | |
| parent | Added gpl notice (diff) | |
| parent | Do not require a new layer for clipping paths in the Cairo renderer. (diff) | |
| download | inkscape-658a60b2ffdb7ed361b3c3b57d62efd419f7ba47.tar.gz inkscape-658a60b2ffdb7ed361b3c3b57d62efd419f7ba47.zip | |
Merged from trunk (r12544).
(bzr r11608.1.126)
Diffstat (limited to 'src/sp-string.cpp')
| -rw-r--r-- | src/sp-string.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/sp-string.cpp b/src/sp-string.cpp index a826d182d..be450b248 100644 --- a/src/sp-string.cpp +++ b/src/sp-string.cpp @@ -35,11 +35,11 @@ #include "sp-factory.h" namespace { - SPObject* createString() { - return new SPString(); - } + SPObject* createString() { + return new SPString(); + } - bool stringRegistered = SPFactory::instance().registerObject("string", createString); + bool stringRegistered = SPFactory::instance().registerObject("string", createString); } /*##################################################### @@ -54,24 +54,19 @@ SPString::~SPString() { } void SPString::build(SPDocument *doc, Inkscape::XML::Node *repr) { - SPString* object = this; + SPString* object = this; object->read_content(); SPObject::build(doc, repr); } void SPString::release() { - SPString* object = this; - SPString *string = SP_STRING(object); - - //string->string.~ustring(); - SPObject::release(); } void SPString::read_content() { - SPString* object = this; + SPString* object = this; SPString *string = SP_STRING(object); |