diff options
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 13 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 41a20fe38a8e..f8c8ed0d220a 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1017,7 +1017,8 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt aEvent.Requery = sal_False; aEvent.State = aState; - if (pDispatcher && pDispatcher->GetFrame()) { + if (pDispatcher && pDispatcher->GetFrame()) + { InterceptLOKStateChangeEvent( pDispatcher->GetFrame()->GetObjectShell(), aEvent); } @@ -1047,14 +1048,14 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt void SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent) const { - if (!objSh || !objSh->isTiledRendering()) { + if (!objSh || !objSh->isTiledRendering()) return; - } if (aEvent.FeatureURL.Path == "Bold" || - aEvent.FeatureURL.Path == "Italic" || - aEvent.FeatureURL.Path == "Underline" || - aEvent.FeatureURL.Path == "StrikeOut") { + aEvent.FeatureURL.Path == "Italic" || + aEvent.FeatureURL.Path == "Underline" || + aEvent.FeatureURL.Path == "StrikeOut") + { OUStringBuffer aBuffer; aBuffer.append(aEvent.FeatureURL.Complete); diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 9df4e546bdaa..aadb70713ed7 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1302,15 +1302,15 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal void SwDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const { - if (!m_pDoc) { + if (!m_pDoc) return; - } SwDrawModel* pDrawModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel(); pDrawModel->libreOfficeKitCallback(nType, pPayload); } -bool SwDocShell::isTiledRendering() const { +bool SwDocShell::isTiledRendering() const +{ SwDrawModel* pDrawModel = m_pDoc->getIDocumentDrawModelAccess().GetDrawModel(); return pDrawModel->isTiledRendering(); } |