diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-04 17:43:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-05-04 17:56:49 +0200 |
| commit | db0d96472519042e3527805b8fa5c90038934bf5 (patch) | |
| tree | 54fcbbad52b7badb12477927826f4b1dc25286b5 /include/sfx2/viewsh.hxx | |
| parent | 46c87a5e8a52afd0060a399f71e8814cc120852c (diff) | |
sfx2: fix SfxViewShell::CheckIPClient_Impl()
Probably the Edit->Plug-in removal removed the wrong branch there since
m_bPlugInsActive was always true before.
This caused embded::UnreachableStateException to be thrown out of a
Timer and that was only handled as a FatalError in desktop::Main,
for example on kde84498-1.html.
(regression from 4b3c211cfb4f64f0f31461aa2e623d64224c4423)
Change-Id: If9e2578f722ea5c5b0821d3d894bb439dbf3c40c
Diffstat (limited to 'include/sfx2/viewsh.hxx')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 865f7588d38d..f76e00c70328 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -315,7 +315,7 @@ public: SAL_DLLPRIVATE void ExecPrint_Impl(SfxRequest &); SAL_DLLPRIVATE void ExecMisc_Impl(SfxRequest &); SAL_DLLPRIVATE void GetState_Impl(SfxItemSet&); - SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient* ); + SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const Rectangle&); SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true ); SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); } SAL_DLLPRIVATE void TakeOwnership_Impl(); |