[Libreoffice-commits] core.git: sfx2/source

[Lionel Elie Mamane]

 sfx2/source/view/viewfrm.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 542ae4e06f9f70e328a3e85f1272ead558b36766
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Aug 31 21:48:12 2014 +0200

    fdo#83302 don't display read-only infobar for Base form in normal mode
    
    Change-Id: I6faae7f5b1b2ec243c53453a8627bd0a540a46ad
    Reviewed-on: https://gerrit.libreoffice.org/11219
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 40d4b67..c01974d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1346,7 +1346,13 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                 SfxBindings& rBind = GetBindings();
                 rBind.Invalidate( SID_RELOAD );
                 rBind.Invalidate( SID_EDITDOC );
-                if ( !xObjSh->IsReadOnly() )
+                SfxViewShell *pVSh;
+                FmFormShell *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