summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/dialog')
-rw-r--r--svx/source/dialog/_contdlg.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx2
-rw-r--r--svx/source/dialog/langbox.cxx4
-rw-r--r--svx/source/dialog/rlrcitem.cxx20
-rw-r--r--svx/source/dialog/svxruler.cxx4
-rw-r--r--svx/source/dialog/swframeexample.cxx2
6 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index d148e9adbc47..a189d195496c 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -306,7 +306,7 @@ bool SvxSuperContourDlg::Close()
bRet = false;
}
- return( bRet ? SfxFloatingWindow::Close() : false );
+ return bRet && SfxFloatingWindow::Close();
}
// Enabled or disabled all Controls
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index b90df70e737d..76470da30158 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -251,7 +251,7 @@ bool SvxIMapDlg::Close()
bRet = false;
}
- return( bRet ? SfxModelessDialog::Close() : false );
+ return bRet && SfxModelessDialog::Close();
}
// Enabled or disable all Controls
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 40ce13a0c0ad..950a11af2a71 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -347,8 +347,8 @@ sal_Int32 SvxLanguageBoxBase::ImplInsertLanguage( const LanguageType nLangType,
if ( xSpell.is() )
m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() );
}
- bFound = m_pSpellUsedLang ?
- lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : false;
+ bFound = m_pSpellUsedLang &&
+ lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang );
nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
}
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index d87ddabb5826..4822c1be155f 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -62,14 +62,14 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
case SID_ATTR_LONG_LRSPACE:
{
const SvxLongLRSpaceItem *pItem = PTR_CAST(SvxLongLRSpaceItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxLRSpaceItem expected");
rRuler.UpdateFrame(pItem);
break;
}
case SID_ATTR_LONG_ULSPACE:
{
const SvxLongULSpaceItem *pItem = PTR_CAST(SvxLongULSpaceItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxULSpaceItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxULSpaceItem expected");
rRuler.UpdateFrame(pItem);
break;
}
@@ -77,7 +77,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
case SID_ATTR_TABSTOP:
{
const SvxTabStopItem *pItem = PTR_CAST(SvxTabStopItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxTabStopItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxTabStopItem expected");
rRuler.Update(pItem);
break;
}
@@ -85,7 +85,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
case SID_ATTR_PARA_LRSPACE:
{
const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxLRSpaceItem expected");
rRuler.UpdatePara(pItem);
break;
}
@@ -95,7 +95,7 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
case SID_RULER_ROWS_VERTICAL:
{
const SvxColumnItem *pItem = PTR_CAST(SvxColumnItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxColumnItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxColumnItem expected");
#ifdef DBG_UTIL
if(pItem)
{
@@ -114,35 +114,35 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
case SID_RULER_PAGE_POS:
{ // Position page, page width
const SvxPagePosSizeItem *pItem = PTR_CAST(SvxPagePosSizeItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxPagePosSizeItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxPagePosSizeItem expected");
rRuler.Update(pItem);
break;
}
case SID_RULER_OBJECT:
{ // Object selection
const SvxObjectItem *pItem = PTR_CAST(SvxObjectItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxObjectItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxObjectItem expected");
rRuler.Update(pItem);
break;
}
case SID_RULER_PROTECT:
{
const SvxProtectItem *pItem = PTR_CAST(SvxProtectItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxProtectItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxProtectItem expected");
rRuler.Update(pItem);
break;
}
case SID_RULER_BORDER_DISTANCE:
{
const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SvxLRSpaceItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SvxLRSpaceItem expected");
rRuler.UpdateParaBorder(pItem);
}
break;
case SID_RULER_TEXT_RIGHT_TO_LEFT :
{
const SfxBoolItem *pItem = PTR_CAST(SfxBoolItem, pState);
- DBG_ASSERT(pState? 0 != pItem: true, "SfxBoolItem expected");
+ DBG_ASSERT(pState == nullptr || pItem != nullptr, "SfxBoolItem expected");
rRuler.UpdateTextRTL(pItem);
}
break;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index c0e565c1ec70..9c8146dd2ba8 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2348,7 +2348,7 @@ void SvxRuler::ApplyBorders()
#endif // DEBUGLIN
SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY,
- nDragType & DRAG_OBJECT_ACTLINE_ONLY ? true : false);
+ (nDragType & DRAG_OBJECT_ACTLINE_ONLY) != 0);
sal_uInt16 nColId = mxRulerImpl->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
(bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
@@ -3021,7 +3021,7 @@ void SvxRuler::CalcMinMax()
{
if(mxObjectItem->HasLimits())
{
- if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? false : true))
+ if(CalcLimits(nMaxLeft, nMaxRight, (nIdx & 1) == 0))
{
nMaxLeft = ConvertPosPixel(nMaxLeft);
nMaxRight = ConvertPosPixel(nMaxRight);
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 70a173b9add7..35ab86b85636 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -689,7 +689,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor);
// Frame View
- bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? true : bTrans;
+ bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) || bTrans;
DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor );
}
generated by cgit (git 2.34.1) at 2025-02-12 23:43:11 +0000