diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 80e35dec095f..304c4d4a3a50 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -246,8 +246,6 @@ void SwRedlineAcceptDlg::InitAuthors() SwView *pView = ::GetActiveView(); SwWrtShell* pSh = pView ? pView->GetWrtShellPtr() : nullptr; - if (!pSh) - return; SvxTPFilter *pFilterPage = m_xTabPagesCTRL->GetFilterPage(); @@ -1131,12 +1129,12 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl, weld::TreeView&, void) IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl, Timer *, void) { + m_aSelectTimer.Stop(); + SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); if (!pSh) return; - m_aSelectTimer.Stop(); - bool bIsNotFormated = false; bool bSel = false; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 29aac4eadee1..6b22c60dd2ed 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3757,10 +3757,7 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void) // Query view because the Navigator is cleared too late. SwView* pView = GetParentWindow()->GetCreateView(); - if (!pView) - return; - - SwWrtShell* pActShell = pView->GetWrtShellPtr(); + SwWrtShell* pActShell = pView ? pView->GetWrtShellPtr() : nullptr; if(pActShell && pActShell->GetWin() && (pActShell->GetWin()->HasFocus() || m_bDocHasChanged || m_bViewHasChanged) && !IsInDrag() && !pActShell->ActionPend()) |