From 2ce0d0931450ce6dded70c931a555306352683f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 30 Sep 2016 16:37:11 +0100 Subject: [PATCH] rhbz#1353069 don't record undo information in the clipboard doc --- ...-t-record-undo-information-in-the-cl.patch | 45 +++++++++++++++++++ libreoffice.spec | 1 + 2 files changed, 46 insertions(+) create mode 100644 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch diff --git a/0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch b/0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch new file mode 100644 index 0000000..d647925 --- /dev/null +++ b/0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch @@ -0,0 +1,45 @@ +From 4c4a56255510a8044cdb169d6f3c6c5ed015ee27 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 30 Sep 2016 15:56:44 +0100 +Subject: [PATCH] rhbz#1353069 don't record undo information in the clipboard + document + +Change-Id: Ib1c5cbcaa2f1a2abc53ab66993af8a5adfd7ca59 +--- + sd/source/ui/app/sdxfer.cxx | 6 ++++++ + sd/source/ui/inc/sdxfer.hxx | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx +index 27b8aab..6d6d82d 100644 +--- a/sd/source/ui/app/sdxfer.cxx ++++ b/sd/source/ui/app/sdxfer.cxx +@@ -689,6 +689,12 @@ void SdTransferable::ObjectReleased() + SD_MOD()->pTransferSelection = nullptr; + } + ++void SdTransferable::SetWorkDocument(const SdDrawDocument* pWorkDoc) ++{ ++ mpSdDrawDocument = mpSdDrawDocumentIntern = const_cast(pWorkDoc); ++ mpSdDrawDocument->EnableUndo(false); ++} ++ + void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ) + { + delete mpObjDesc; +diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx +index ba00241..5ba767e 100644 +--- a/sd/source/ui/inc/sdxfer.hxx ++++ b/sd/source/ui/inc/sdxfer.hxx +@@ -47,7 +47,7 @@ public: + void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } + const SfxObjectShellRef& GetDocShell() const { return maDocShellRef; } + +- void SetWorkDocument( const SdDrawDocument* pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = const_cast(pWorkDoc); } ++ void SetWorkDocument(const SdDrawDocument* pWorkDoc); + const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; } + + void SetView(const ::sd::View* pView); +-- +2.7.4 + diff --git a/libreoffice.spec b/libreoffice.spec index ebd1f25..70c8428 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -252,6 +252,7 @@ Patch17: 0001-Resolves-tdf-102293-triple-click-results-in-visually.patch Patch18: 0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch Patch19: 0001-fix-build-on-32-bit-ARM-on-latest-Rawhide.patch Patch20: 0001-only-date-autofilter-menus-need-the-space-for-the-tr.patch +Patch21: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch %if 0%{?fedora} >= 26 Patch400: 0001-Switch-from-orcus-0.11-to-orcus-0.12.patch