diff options
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r-- | sw/source/uibase/uiview/viewsrch.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewtab.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 6be76c0485c3..e6fc466dfc9a 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -871,7 +871,7 @@ SvxSearchDialog* SwView::GetSearchDialog() #if HAVE_FEATURE_DESKTOP const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId(); SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->GetChildWindow(nId) ); - auto pSrchDlg = (pWrp) ? pWrp->getDialog() : nullptr; + auto pSrchDlg = pWrp ? pWrp->getDialog() : nullptr; return pSrchDlg; #else return nullptr; diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index c866213a36b5..67667185360a 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -2157,7 +2157,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) const SwFormatCol* pCols = pFormat ? &pFormat->GetCol(): &rDesc.GetMaster().GetCol(); const SwColumns& rCols = pCols->GetColumns(); - const sal_uInt16 nBorder = (pFormat) + const sal_uInt16 nBorder = pFormat ? pFormat->GetBox().GetSmallestDistance() : rDesc.GetMaster().GetBox().GetSmallestDistance(); |