|
 |
2ce0d09 |
From 4c4a56255510a8044cdb169d6f3c6c5ed015ee27 Mon Sep 17 00:00:00 2001
|
|
|
2ce0d09 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
2ce0d09 |
Date: Fri, 30 Sep 2016 15:56:44 +0100
|
|
|
2ce0d09 |
Subject: [PATCH] rhbz#1353069 don't record undo information in the clipboard
|
|
|
2ce0d09 |
document
|
|
|
2ce0d09 |
|
|
|
2ce0d09 |
Change-Id: Ib1c5cbcaa2f1a2abc53ab66993af8a5adfd7ca59
|
|
|
2ce0d09 |
---
|
|
|
2ce0d09 |
sd/source/ui/app/sdxfer.cxx | 6 ++++++
|
|
|
2ce0d09 |
sd/source/ui/inc/sdxfer.hxx | 2 +-
|
|
|
2ce0d09 |
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
2ce0d09 |
|
|
|
2ce0d09 |
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
|
|
|
2ce0d09 |
index 27b8aab..6d6d82d 100644
|
|
|
2ce0d09 |
--- a/sd/source/ui/app/sdxfer.cxx
|
|
|
2ce0d09 |
+++ b/sd/source/ui/app/sdxfer.cxx
|
|
|
2ce0d09 |
@@ -689,6 +689,12 @@ void SdTransferable::ObjectReleased()
|
|
|
2ce0d09 |
SD_MOD()->pTransferSelection = nullptr;
|
|
|
2ce0d09 |
}
|
|
|
2ce0d09 |
|
|
|
2ce0d09 |
+void SdTransferable::SetWorkDocument(const SdDrawDocument* pWorkDoc)
|
|
|
2ce0d09 |
+{
|
|
|
2ce0d09 |
+ mpSdDrawDocument = mpSdDrawDocumentIntern = const_cast<SdDrawDocument*>(pWorkDoc);
|
|
|
2ce0d09 |
+ mpSdDrawDocument->EnableUndo(false);
|
|
|
2ce0d09 |
+}
|
|
|
2ce0d09 |
+
|
|
|
2ce0d09 |
void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc )
|
|
|
2ce0d09 |
{
|
|
|
2ce0d09 |
delete mpObjDesc;
|
|
|
2ce0d09 |
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
|
|
|
2ce0d09 |
index ba00241..5ba767e 100644
|
|
|
2ce0d09 |
--- a/sd/source/ui/inc/sdxfer.hxx
|
|
|
2ce0d09 |
+++ b/sd/source/ui/inc/sdxfer.hxx
|
|
|
2ce0d09 |
@@ -47,7 +47,7 @@ public:
|
|
|
2ce0d09 |
void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; }
|
|
|
2ce0d09 |
const SfxObjectShellRef& GetDocShell() const { return maDocShellRef; }
|
|
|
2ce0d09 |
|
|
|
2ce0d09 |
- void SetWorkDocument( const SdDrawDocument* pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = const_cast<SdDrawDocument*>(pWorkDoc); }
|
|
|
2ce0d09 |
+ void SetWorkDocument(const SdDrawDocument* pWorkDoc);
|
|
|
2ce0d09 |
const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; }
|
|
|
2ce0d09 |
|
|
|
2ce0d09 |
void SetView(const ::sd::View* pView);
|
|
|
2ce0d09 |
--
|
|
|
2ce0d09 |
2.7.4
|
|
|
2ce0d09 |
|