summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/applab.cxx2
-rw-r--r--sw/source/uibase/app/docst.cxx2
-rw-r--r--sw/source/uibase/chrdlg/ccoll.cxx2
-rw-r--r--sw/source/uibase/misc/glshell.cxx2
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx2
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx2
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx4
8 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index bacf171d9552..6f688a5d9903 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -327,7 +327,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
pSh->Push();
pSh->SttDoc();
bool bInFly = nullptr != pSh->WizardGetFly();
- pSh->Pop((bInFly) ? SwCursorShell::PopMode::DeleteStack : SwCursorShell::PopMode::DeleteCurrent);
+ pSh->Pop(bInFly ? SwCursorShell::PopMode::DeleteStack : SwCursorShell::PopMode::DeleteCurrent);
if( bInFly )
pSh->EndDoc(true); // select all content
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index f390339ce2bb..c414b3c05368 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -824,7 +824,7 @@ sal_uInt16 SwDocShell::Edit(
// In HTML mode, we do not always have a printer. In order to show
// the correct page size in the Format - Page dialog, we have to
// get one here.
- SwWrtShell* pCurrShell = (pActShell) ? pActShell : m_pWrtShell;
+ SwWrtShell* pCurrShell = pActShell ? pActShell : m_pWrtShell;
if( ( HTMLMODE_ON & nHtmlMode ) &&
!pCurrShell->getIDocumentDeviceAccess().getPrinter( false ) )
pCurrShell->InitPrt( pCurrShell->getIDocumentDeviceAccess().getPrinter( true ) );
diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
index d066d7a86e91..d88268e2495c 100644
--- a/sw/source/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/uibase/chrdlg/ccoll.cxx
@@ -170,7 +170,7 @@ void
SwCondCollItem::SetStyle(OUString const*const pStyle, sal_uInt16 const nPos)
{
if( nPos < COND_COMMAND_COUNT )
- m_sStyles[nPos] = (pStyle) ? *pStyle : OUString();
+ m_sStyles[nPos] = pStyle ? *pStyle : OUString();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 8e691ed9c25f..f5757699e130 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -131,7 +131,7 @@ static bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
}
SwGlosDocShell::SwGlosDocShell(bool bNewShow)
- : SwDocShell( (bNewShow)
+ : SwDocShell( bNewShow
? SfxObjectCreateMode::STANDARD : SfxObjectCreateMode::INTERNAL )
{
}
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();
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 9091fb7208a6..28c2c7f85454 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -300,12 +300,12 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe
SwNodeIndex aIdx( rNds.GetEndOfContent(), -1 );
SwContentNode * pNd = aIdx.GetNode().GetContentNode();
- SwPosition aPos(aIdx, SwIndex(pNd, (pNd) ? pNd->Len() : 0));
+ SwPosition aPos(aIdx, SwIndex(pNd, pNd ? pNd->Len() : 0));
bool bRet = false;
pInsDoc->getIDocumentFieldsAccess().LockExpFields();
{
- SwDoc *const pDoc((pxCursor) ? pxCursor->GetDoc() : &pxRange->GetDoc());
+ SwDoc *const pDoc(pxCursor ? pxCursor->GetDoc() : &pxRange->GetDoc());
SwPaM aPam(pDoc->GetNodes());
SwPaM * pPam(nullptr);
if(pxCursor)
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 1d4a9c6196f7..0d82750de8ce 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -949,7 +949,7 @@ Reference< XIndexAccess >
if(!pResultCursor)
throw RuntimeException("No result cursor");
Reference< XIndexAccess > xRet;
- xRet = SwXTextRanges::Create( (nResult) ? &(*pResultCursor) : nullptr );
+ xRet = SwXTextRanges::Create( nResult ? &(*pResultCursor) : nullptr );
return xRet;
}
@@ -2525,7 +2525,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
if (pSwView)
{
// PDF export should not make use of the SwPrtOptions
- const SwPrintData *pPrtOptions = (bIsPDFExport)
+ const SwPrintData *pPrtOptions = bIsPDFExport
? nullptr : m_pRenderData->GetSwPrtOptions();
bool setShowPlaceHoldersInPDF = false;
if(bIsPDFExport)
generated by cgit (git 2.34.1) at 2024-07-17 18:58:38 +0000