summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennard Wasserthal <Wasserthal@nefkom.net>2013-05-12 17:50:12 +0200
committerBosdonnat Cedric <cedric.bosdonnat@free.fr>2013-05-14 14:15:50 +0000
commit9fa5c64eeb5d038a5fac25dfd80e72bd22b5ed18 (patch)
tree78de217728405b560edee0626932e491da39d208
parent16a0badd3ec3588d4a6561a3cba7992cbef6b5da (diff)
fdo#55582 calc part
Since the actual Patch for fdo#55582 hangs on the writer part, I commit that bloody sc part NOW, to appear as early as in 4.1. Change-Id: I01ce4a7a7738304f47efc718c382a5b1dee68ea2 Signed-off-by: Lennard Wasserthal <Wasserthal@nefkom.net> Reviewed-on: https://gerrit.libreoffice.org/3872 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
-rw-r--r--sc/sdi/drawsh.sdi1
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx3
2 files changed, 3 insertions, 1 deletions
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 6c9ec0bcf14a..ff8cd359d722 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -142,6 +142,7 @@ interface TableDraw
SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_COPY [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
+ SID_PASTE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_SELECTALL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ]
SID_OBJECT_ROTATE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
SID_OBJECT_MIRROR [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ]
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 153ea1634c09..8a82fda696fc 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -23,6 +23,7 @@
#include <sfx2/request.hxx>
#include <sfx2/bindings.hxx>
#include <tools/urlobj.hxx>
+#include <cliputil.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <svx/fmglob.hxx>
@@ -357,7 +358,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
break;
case SID_PASTE:
- OSL_FAIL( "SdrView::PasteClipboard not supported anymore" );
+ ScClipUtil::PasteFromClipboard ( GetViewData(), GetViewData()->GetViewShell(), true );
break;
case SID_SELECTALL: