sfx2/source/view/viewfrm.cxx | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
New commits:
commit 544104b957e72cfb5701cd949bca5184324d20ed
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Thu Feb 23 14:31:52 2017 +0100
Simplify logic
Change-Id: I4d2e94bb050f163cc691fda90be9dccbd2ca5e5f
Reviewed-on: https://gerrit.libreoffice.org/34580
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3f1b106..b1fc522 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1213,24 +1213,9 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
const SfxViewShell *pVSh;
const SfxShell *pFSh;
- if ( !m_xObjSh->IsReadOnly() ||
- ( m_xObjSh->GetCreateMode() ==
SfxObjectCreateMode::EMBEDDED &&
- (pVSh = m_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
-
- // #i21560# InvalidateAll() causes the assertion
- // 'SfxBindings::Invalidate while in update" when
- // the sfx slot SID_BASICIDE_APPEAR is executed
- // via API from another thread (Java).
- // According to MBA this call is not necessary anymore,
- // because each document has its own SfxBindings.
- //GetDispatcher()->GetBindings()->InvalidateAll(true);
- }
- else
+ if ( m_xObjSh->IsReadOnly() &&
+ ( m_xObjSh->GetCreateMode() !=
SfxObjectCreateMode::EMBEDDED ||
+ ( pVSh = m_xObjSh->GetViewShell()) && (pFSh =
pVSh->GetFormShell()) && pFSh->IsDesignMode()))
{
bool bSignPDF = IsSignPDF(m_xObjSh);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
