From 0908c7c1184ab7acb7b6f6740a82c2f12c296fae Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 16 Feb 2023 10:42:06 +0000 Subject: SfxViewShell::GetViewFrame never returns null, change to a reference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit various null checks can be seen to be redundant and removed Change-Id: Icf49c1de4b0302795d2769a370af3abceaad0221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147147 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sw/source/uibase/wrtsh/select.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/uibase/wrtsh/select.cxx') diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index fe2915a90234..5b7358c230ce 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -54,9 +54,9 @@ void SwWrtShell::Invalidate() { // to avoid making the slot volatile, invalidate it every time if something could have been changed // this is still much cheaper than asking for the state every 200 ms (and avoid background processing) - GetView().GetViewFrame()->GetBindings().Invalidate( FN_STAT_SELMODE ); - GetView().GetViewFrame()->GetBindings().Update(FN_STAT_SELMODE); // make selection mode control icon update immediately - SwWordCountWrapper *pWrdCnt = static_cast(GetView().GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId())); + GetView().GetViewFrame().GetBindings().Invalidate( FN_STAT_SELMODE ); + GetView().GetViewFrame().GetBindings().Update(FN_STAT_SELMODE); // make selection mode control icon update immediately + SwWordCountWrapper *pWrdCnt = static_cast(GetView().GetViewFrame().GetChildWindow(SwWordCountWrapper::GetChildWindowId())); if (pWrdCnt) pWrdCnt->UpdateCounts(); } @@ -439,7 +439,7 @@ void SwWrtShell::EndSelect() m_fnKillSel = &SwWrtShell::ResetSelect; } } - SwWordCountWrapper *pWrdCnt = static_cast(GetView().GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId())); + SwWordCountWrapper *pWrdCnt = static_cast(GetView().GetViewFrame().GetChildWindow(SwWordCountWrapper::GetChildWindowId())); if (pWrdCnt) pWrdCnt->UpdateCounts(); @@ -673,7 +673,7 @@ void SwWrtShell::SetInsMode( bool bOn ) m_bIns = bOn; SwCursorShell::SetOverwriteCursor( !m_bIns ); const SfxBoolItem aTmp( SID_ATTR_INSERT, m_bIns ); - GetView().GetViewFrame()->GetBindings().SetState( aTmp ); + GetView().GetViewFrame().GetBindings().SetState( aTmp ); StartAction(); EndAction(); Invalidate(); -- cgit