diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-07-14 11:04:32 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-07-14 11:04:32 +0000 |
| commit | 676707120d5527ff8c8c8c89ea33d1eadf9cf1b4 (patch) | |
| tree | c2d91ac1c2c2453f8db7a5bed7b9f52b67320178 /src/sp-tref-reference.cpp | |
| parent | fix "arrange" tool (typo) (diff) | |
| download | inkscape-676707120d5527ff8c8c8c89ea33d1eadf9cf1b4.tar.gz inkscape-676707120d5527ff8c8c8c89ea33d1eadf9cf1b4.zip | |
Fix for circular references detection in almost all cases, fixing https://bugs.launchpad.net/inkscape/+bug/167247 and a few of its duplicates.
This fix is aimed at preventing any sort of circular references with the URIReference::_acceptObject method, checking the absence of loops in the reference+child tree.
There can be some performance improvements done if we add a pointer from cloned sub-objects to their origin sub-object.
The remaining cases that are not fixed can involve non-trivial loops using one or more "url()" stylesheet references. Being able to take them into account would require a non-obvious style.cpp refactoring making use of URIReference for this kind of reference (and not handling manually the signals in the styling code, which would probably be a good thing to do anyway)
(bzr r14245)
Diffstat (limited to 'src/sp-tref-reference.cpp')
| -rw-r--r-- | src/sp-tref-reference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sp-tref-reference.cpp b/src/sp-tref-reference.cpp index e82f575e0..7c6ff00e7 100644 --- a/src/sp-tref-reference.cpp +++ b/src/sp-tref-reference.cpp @@ -21,7 +21,7 @@ bool SPTRefReference::_acceptObject(SPObject * const obj) const { SPObject *owner = getOwner(); if (SP_IS_TREF(owner)) - return sp_tref_reference_allowed(SP_TREF(getOwner()), obj); + return URIReference::_acceptObject(obj); else return false; } |
