summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-08-31 21:48:12 +0200
committerAndras Timar <andras.timar@collabora.com>2015-02-06 16:44:33 +0100
commit4dbc1aaf31d231d7d9dd63ac393c5e176c9db268 (patch)
tree31091564700cb9237902faa6824fdd9a0da3d16b
parent16708bb3260069b9805f2e5864bd06d4fcceecb3 (diff)
fdo#83302 don't display read-only infobar for Base form in normal mode
Change-Id: I03c32883dbf8421824069efea2318e67c8dc4313 Reviewed-on: https://gerrit.libreoffice.org/11231 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
-rw-r--r--sfx2/source/view/viewfrm.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 84ddb88f1c7e..9f79c20a555d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1350,7 +1350,13 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
SfxBindings& rBind = GetBindings();
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
- if ( !xObjSh->IsReadOnly() )
+ const SfxViewShell *pVSh;
+ const SfxShell *pFSh;
+ if ( !xObjSh->IsReadOnly() ||
+ ( xObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED &&
+ (pVSh = xObjSh->GetViewShell()) &&
+ (pFSh = pVSh->GetFormShell()) &&
+ !pFSh->IsDesignMode()))
{
// In contrast to above (TITLE_CHANGED) does the UI not
// have to be updated because it was not obstructed