summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-09-08 11:26:05 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-09-08 11:26:05 +0000
commit291794ddbd15dc81b6b958c8fa68df032ad3487c (patch)
tree1d5a9deee6b189d8b93db851bc870f37d1b14f83 /src
parentAttempt to fix the 245 floor / 255 page size adjustment problem. (diff)
downloadinkscape-291794ddbd15dc81b6b958c8fa68df032ad3487c.tar.gz
inkscape-291794ddbd15dc81b6b958c8fa68df032ad3487c.zip
Fix LP #258124 and crash when copying LPEs
(bzr r6778)
Diffstat (limited to 'src')
-rw-r--r--src/ui/clipboard.cpp2
-rw-r--r--src/ui/dialog/livepatheffect-editor.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index ac35e7be6..cad6fa011 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -454,7 +454,7 @@ bool ClipboardManagerImpl::pastePathEffect()
if ( effect ) {
_pasteDefs(tempdoc);
// make sure all selected items are converted to paths first (i.e. rectangles)
- sp_selected_path_to_curves(false);
+ sp_selected_path_to_curves(desktop, false);
for (GSList *item = const_cast<GSList *>(selection->itemList()) ; item ; item = item->next) {
_applyPathEffect(reinterpret_cast<SPItem*>(item->data), effect);
}
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 567ee24da..44f37083b 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -354,7 +354,7 @@ LivePathEffectEditor::onApply()
// If item is a SPRect, convert it to path first:
if ( SP_IS_RECT(item) ) {
- sp_selected_path_to_curves(false);
+ sp_selected_path_to_curves(current_desktop, false);
item = sel->singleItem(); // get new item
}