summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-04-07 12:44:23 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-06-16 15:07:35 +0200
commit66ef0206967c5b0452fafe4fe75aa8d7f439f5f4 (patch)
tree5df4becaf75cdc82aed7d61ab5911673bd8289e2 /sfx2
parent952a2c2cbace5987e81731d1f648e260053a1c77 (diff)
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@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 630186ff4e0eba7317e542f8c3eca39ebd068721) Reviewed-on: https://gerrit.libreoffice.org/38874 Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/viewfrm.cxx3
1 files changed, 2 insertions, 1 deletions
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())))
{