drop patch I didn't upstream

f41
Caolán McNamara 8 years ago
parent 01a2889236
commit efe739d355

@ -1,45 +0,0 @@
From 4c4a56255510a8044cdb169d6f3c6c5ed015ee27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
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<SdDrawDocument*>(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<SdDrawDocument*>(pWorkDoc); }
+ void SetWorkDocument(const SdDrawDocument* pWorkDoc);
const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; }
void SetView(const ::sd::View* pView);
--
2.7.4

@ -237,11 +237,10 @@ Patch2: 0001-add-X-TryExec-entries-to-desktop-files.patch
# not upstreamed: upstream wants an automatic restart after a crash; we
# want a nice abrt report
Patch3: 0001-don-t-suppress-crashes.patch
Patch4: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch
Patch5: 0001-change-from-glew-to-epoxy.patch
Patch6: 0001-gtk3-implement-opengl-support-for-slideshow.patch
Patch7: 0001-lower-the-system-epoxy-requirement.patch
Patch8: 0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch
Patch4: 0001-change-from-glew-to-epoxy.patch
Patch5: 0001-gtk3-implement-opengl-support-for-slideshow.patch
Patch6: 0001-lower-the-system-epoxy-requirement.patch
Patch7: 0001-Resolves-tdf-105998-distort-hairline-borders-to-fall.patch
%if 0%{?rhel}
# not upstreamed

Loading…
Cancel
Save