diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-12-07 19:07:41 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-12-07 19:07:41 +0000 |
| commit | 9b078f84a03865319b411bf537c256744d46e8e3 (patch) | |
| tree | e3e807556156d4de588c55a8e5d26480b0a537ab /src | |
| parent | Update to trunk (diff) | |
| download | inkscape-9b078f84a03865319b411bf537c256744d46e8e3.tar.gz inkscape-9b078f84a03865319b411bf537c256744d46e8e3.zip | |
fixing extra LPE on copies on release
(bzr r15295.1.15)
Diffstat (limited to 'src')
| -rw-r--r-- | src/live_effects/lpe-measure-line.cpp | 9 | ||||
| -rw-r--r-- | src/live_effects/lpe-mirror_symmetry.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp index 8b73781b5..3d0583f55 100644 --- a/src/live_effects/lpe-measure-line.cpp +++ b/src/live_effects/lpe-measure-line.cpp @@ -696,7 +696,9 @@ LPEMeasureLine::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/) void LPEMeasureLine::doOnRemove (SPLPEItem const* /*lpeitem*/) { + std::cout << "111111111111111111111111\n"; if (!erase_extra_objects) { + std::cout << "2222222222222222222222222\n"; processObjects(LPE_TO_OBJECTS); elements.clear(); return; @@ -720,7 +722,12 @@ LPEMeasureLine::processObjects(LpeAction lpe_action) Glib::ustring css_str; switch (lpe_action){ case LPE_TO_OBJECTS: - elemref->getRepr()->setAttribute("inkscape:path-effect", NULL); + std::cout << sp_lpe_item->getId() << "sp_lpe_item->getId()\n"; + std::cout << id << "Id()\n"; + if (std::strcmp(sp_lpe_item->getId(), id) != 0) { + std::cout << id << "loborro\n"; + elemref->getRepr()->setAttribute("inkscape:path-effect", NULL); + } elemref->getRepr()->setAttribute("sodipodi:insensitive", NULL); break; diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index abf578078..fd7c7824d 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -334,7 +334,7 @@ LPEMirrorSymmetry::processObjects(LpeAction lpe_action) Glib::ustring css_str; switch (lpe_action){ case LPE_TO_OBJECTS: - if (sp_lpe_item->getId() != id) { + if (std::strcmp(sp_lpe_item->getId(), id) != 0) { elemref->getRepr()->setAttribute("inkscape:path-effect", NULL); } elemref->getRepr()->setAttribute("sodipodi:insensitive", NULL); |