summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-12-28 02:38:52 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-12-28 14:01:10 +0100
commit23a83639f5a06708074b13bc13ea4f6f819f55f0 (patch)
treed2a4632b2113fb548843ed7b03b3ccee10b5f9e4
parent7f15b7ae482be5994c6803b982c13cbc036a734f (diff)
tdf#104870 - Impress crashes switching views in read-only mode
We need to check read only mode similar to SidebarController::CreatePanels() method. Otherwise SfxUnoPanels::getByName() creates an invalid panel. Change-Id: Ib7801b81c95f3f505a06c00f749ba4ed5809bfe0 Reviewed-on: https://gerrit.libreoffice.org/47116 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
-rw-r--r--sfx2/source/sidebar/UnoPanels.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/UnoPanels.cxx b/sfx2/source/sidebar/UnoPanels.cxx
index a74763572cdb..49815a9ff649 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -108,6 +108,9 @@ sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& aName )
iPanel(aPanels.begin()), iEnd(aPanels.end());
iPanel!=iEnd; ++iPanel)
{
+ // Determine if the panel can be displayed.
+ if(pSidebarController->IsDocumentReadOnly() && !iPanel->mbShowForReadOnlyDocuments)
+ continue;
if (iPanel->msId == aName)
return true;
}