diff options
| author | Henry Castro <hcastro@collabora.com> | 2018-05-06 22:40:05 -0400 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-05-23 13:19:20 +0200 |
| commit | a2e6f31c6f90e446d1462e7c80f6b1317f7825bc (patch) | |
| tree | 3e009520526d97336d29ba6a45fb1ff22e7b14f5 /sc/inc | |
| parent | 40cf5a9b3dd619a650a94d8b65bf6987125b75fb (diff) | |
tdf#117228: crash in SfxItemSet::GetItemState...
(unsigned short, bool, SfxPoolItem const**) when pasting comment of closed document
Re-work commit 1b7a8277aa3e9f73ccdf15e933a1ee3b42849a44.
In the tiled rendering case, each view has its own clipboard,
but not in desktop version which it has a shared clipboard each view.
Change-Id: I57b1ab81e4c141829dbad899330e5c22204c384a
Reviewed-on: https://gerrit.libreoffice.org/53922
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/scmod.hxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 253c5cb637e0..76e512424d89 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -29,6 +29,8 @@ #include "shellids.hxx" #include <unotools/options.hxx> +#include <com/sun/star/datatransfer/XTransferable2.hpp> + #include <algorithm> #include <vector> #include <map> @@ -80,7 +82,8 @@ class ScModule: public SfxModule, public SfxListener, public utl::ConfigurationL ScDragData* m_pDragData; ScSelectionTransferObj* m_pSelTransfer; ScMessagePool* m_pMessagePool; - // there is no global InputHandler anymore, each View has its own + css::uno::Reference<css::datatransfer::XTransferable2> m_xClipData; // Only used by Vba helper functions + // there is no global InputHandler anymore, each View has it's own ScInputHandler* m_pRefInputHandler; ScViewCfg* m_pViewCfg; ScDocCfg* m_pDocCfg; @@ -172,6 +175,11 @@ public: void SetPrintOptions ( const ScPrintOptions& rOpt ); void InsertEntryToLRUList(sal_uInt16 nFIndex); + SC_DLLPUBLIC css::uno::Reference<css::datatransfer::XTransferable2> + GetClipData() { return m_xClipData; } + SC_DLLPUBLIC void SetClipData( + const css::uno::Reference<css::datatransfer::XTransferable2>& xTransferable) { m_xClipData = xTransferable; } + static void GetSpellSettings( LanguageType& rDefLang, LanguageType& rCjkLang, LanguageType& rCtlLang, bool& rAutoSpell ); static void SetAutoSpellProperty( bool bSet ); |