summaryrefslogtreecommitdiffstats
path: root/src/splivarot.cpp
diff options
context:
space:
mode:
authorJohn Bintz <me@johnbintz.com>2007-03-31 12:42:17 +0000
committerjohncoswell <johncoswell@users.sourceforge.net>2007-03-31 12:42:17 +0000
commitc52b5ee650dd80490a3d13e3072de5e9186acfc6 (patch)
treec85ef360180fba5756d779e962370320eb6da8b1 /src/splivarot.cpp
parentChange tool switch message for paint bucket (diff)
downloadinkscape-c52b5ee650dd80490a3d13e3072de5e9186acfc6.tar.gz
inkscape-c52b5ee650dd80490a3d13e3072de5e9186acfc6.zip
Change paint bucket path union to properly create only one undo event, rather than two
(bzr r2792)
Diffstat (limited to 'src/splivarot.cpp')
-rw-r--r--src/splivarot.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 3035cb1a7..f1ce029f4 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -67,6 +67,12 @@ sp_selected_path_union()
}
void
+sp_selected_path_union_skip_undo()
+{
+ sp_selected_path_boolop(bool_op_union, SP_VERB_NONE, _("Union"));
+}
+
+void
sp_selected_path_intersect()
{
sp_selected_path_boolop(bool_op_inters, SP_VERB_SELECTION_INTERSECT, _("Intersection"));
@@ -573,7 +579,9 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
g_free(transform);
- sp_document_done(sp_desktop_document(desktop), verb, description);
+ if (verb != SP_VERB_NONE) {
+ sp_document_done(sp_desktop_document(desktop), verb, description);
+ }
delete res;
}