[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sfx2/source

[Samuel Mehrbrodt]

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

New commits:
commit 66ef0206967c5b0452fafe4fe75aa8d7f439f5f4
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Apr 7 12:44:23 2017 +0200

    tdf#106366 Show infobar for all read-only documents
    
    Except those who were set open r/o with the File->Properties checkbox
    
    Change-Id: Id44daac364cae73636b6f1c051521928743b88f4
    Reviewed-on: https://gerrit.libreoffice.org/36258
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 630186ff4e0eba7317e542f8c3eca39ebd068721)
    Reviewed-on: https://gerrit.libreoffice.org/38874
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index aafff1ff21b6..3a7a62394d80 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1140,7 +1140,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 
                 const SfxViewShell *pVSh;
                 const SfxShell *pFSh;
-                if ( m_xObjSh->IsOriginallyReadOnlyMedium() &&
+                if ( m_xObjSh->IsReadOnly() &&
+                    ! m_xObjSh->IsSecurityOptOpenReadOnly() &&
                     ( m_xObjSh->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ||
                         (( pVSh = m_xObjSh->GetViewShell()) && (pFSh = pVSh->GetFormShell()) && pFSh->IsDesignMode())))
                 {