summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2014-08-31 22:37:47 +0200
committerAndras Timar <andras.timar@collabora.com>2015-02-06 16:41:19 +0100
commit16708bb3260069b9805f2e5864bd06d4fcceecb3 (patch)
treeb24022e9cc42684741d0b1080362517c4d5e3524
parentadd80f5cce7d5d222b20e8c0237072a6a3601437 (diff)
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@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
-rw-r--r--sfx2/source/view/viewfrm.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4014167e3b0d..84ddb88f1c7e 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 );
}