summaryrefslogtreecommitdiffstats
path: root/src/document.cpp
diff options
context:
space:
mode:
authorRaphael Rosch <launchpad@insaner.com>2014-02-20 19:22:58 +0000
committerinsaner <launchpad@insaner.com>2014-02-20 19:22:58 +0000
commit8a6810210b3b1ce2cb82055063eee635174be637 (patch)
treecd4aadb12ed5f3334ba3b460412964a6e99b9a6a /src/document.cpp
parentReverting r13045. (diff)
downloadinkscape-8a6810210b3b1ce2cb82055063eee635174be637.tar.gz
inkscape-8a6810210b3b1ce2cb82055063eee635174be637.zip
crash on cut n paste, or alt+scroll..
Fixed bugs: - https://launchpad.net/bugs/1171109 (bzr r13047)
Diffstat (limited to '')
-rw-r--r--src/document.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 470d0cc5a..112503320 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -1544,15 +1544,13 @@ void SPDocument::importDefs(SPDocument *source)
// Prevent duplicates of solid swatches by checking if equivalent swatch already exists
if (src && SP_IS_GRADIENT(src)) {
SPGradient *gr = SP_GRADIENT(src);
- if (gr->isSolid() || gr->getVector()->isSolid()) {
- for (SPObject *trg = this->getDefs()->firstChild() ; trg ; trg = trg->getNext()) {
- if (trg && SP_IS_GRADIENT(trg) && src != trg) {
- if (gr->isEquivalent(SP_GRADIENT(trg))) {
- // Change object references to the existing equivalent gradient
- change_def_references(src, trg);
- duplicate = true;
- break;
- }
+ for (SPObject *trg = this->getDefs()->firstChild() ; trg ; trg = trg->getNext()) {
+ if (trg && SP_IS_GRADIENT(trg) && src != trg) {
+ if (gr->isEquivalent(SP_GRADIENT(trg))) {
+ // Change object references to the existing equivalent gradient
+ change_def_references(src, trg);
+ duplicate = true;
+ break;
}
}
}