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

[Samuel Mehrbrodt]

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

New commits:
commit 8cf89c24906c6d50a3c15f1ebef4df071ad6ec79
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date:   Sun Aug 31 22:37:47 2014 +0200

    fdo#83311 Fix infobar for documents with read-only property
    
    Change-Id: Ic813ab3eb74a088b60b4dc3dcd56e7b19683190c
    Reviewed-on: https://gerrit.libreoffice.org/11220
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index efef8f4..40d4b67 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -403,6 +403,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     pSh->SetModifyPasswordEntered();
                 }
 
+                // Remove infobar if document was read-only (after password check)
+                RemoveInfoBar("readonly");
+
                 nOpenMode = pSh->IsOriginallyReadOnlyMedium() ? SFX_STREAM_READONLY : SFX_STREAM_READWRITE;
 
                 // if only the view was in the readonly mode then there is no need to do the reload
@@ -416,7 +419,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     return;
                 }
 
-                RemoveInfoBar("readonly");
+
                 pSh->SetReadOnlyUI( false );
             }