summaryrefslogtreecommitdiffstats
path: root/src/io/file.cpp
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-08-10 21:35:54 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-08-31 14:50:39 +0000
commitb3949ea33b9145a8c285ff835a61a9f92188fbe7 (patch)
treead64121b2e4bf52f6fa8ed2ac45c28ce769b5fe4 /src/io/file.cpp
parentTemplates: Remove unused "long_description" ("inkscape:_long" tag) (diff)
downloadinkscape-b3949ea33b9145a8c285ff835a61a9f92188fbe7.tar.gz
inkscape-b3949ea33b9145a8c285ff835a61a9f92188fbe7.zip
Templates: Accept non-underscored variants of "inkscape:templateinfo"
Diffstat (limited to 'src/io/file.cpp')
-rw-r--r--src/io/file.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/io/file.cpp b/src/io/file.cpp
index 877429d26..6317622bb 100644
--- a/src/io/file.cpp
+++ b/src/io/file.cpp
@@ -39,7 +39,15 @@ ink_file_new(const std::string &Template)
if (doc) {
// Remove all the template info from xml tree
Inkscape::XML::Node *myRoot = doc->getReprRoot();
- Inkscape::XML::Node *nodeToRemove = sp_repr_lookup_name(myRoot, "inkscape:_templateinfo");
+ Inkscape::XML::Node *nodeToRemove;
+
+ nodeToRemove = sp_repr_lookup_name(myRoot, "inkscape:templateinfo");
+ if (nodeToRemove != nullptr) {
+ Inkscape::DocumentUndo::ScopedInsensitive no_undo(doc);
+ sp_repr_unparent(nodeToRemove);
+ delete nodeToRemove;
+ }
+ nodeToRemove = sp_repr_lookup_name(myRoot, "inkscape:_templateinfo"); // backwards-compatibility
if (nodeToRemove != nullptr) {
Inkscape::DocumentUndo::ScopedInsensitive no_undo(doc);
sp_repr_unparent(nodeToRemove);