summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--formula/inc/formula/FormulaCompiler.hxx2
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx2
-rw-r--r--sfx2/source/bastyp/bitset.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--svx/source/dialog/rlrcitem.cxx20
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx2
-rw-r--r--svx/source/svdraw/svdpoev.cxx2
8 files changed, 17 insertions, 17 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 3f24af7bb9be..75e163061ebe 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -135,7 +135,7 @@ public:
/// Get the symbol string matching an OpCode.
inline const String& getSymbol( const OpCode eOp ) const
{
- DBG_ASSERT( USHORT(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
+ DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
if (sal_uInt16(eOp) < mnSymbols)
return mpTable[ eOp ];
static String s_sEmpty;
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 09edeb6f781e..81378bf8ae0c 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -490,7 +490,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eOp )
{
- DBG_ASSERT( 0 < eOp && USHORT(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
+ DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
{
DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || (eOp == ocCurrency),
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 995f6ccfdce4..dde66315720f 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -388,7 +388,7 @@ sal_uInt16 IndexBitSet::GetFreeIndex()
*this|=i;
return i;
}
- DBG_ASSERT(FALSE, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
+ DBG_ASSERT(sal_False, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
return 0;
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index cf2c9b0d2425..54df29e63e4a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2257,7 +2257,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin )
{
// Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this!
- DBG_ASSERT( FALSE, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
+ DBG_ASSERT( sal_False, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
PopupMenu* pMenu = CreateContextMenu();
pMenu->Execute( pWin, rPos );
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index dfb2141bdfe8..7e2cd0868cce 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -76,14 +76,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 erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet");
rRuler.UpdateFrame(pItem);
break;
}
case SID_ATTR_LONG_ULSPACE:
{
const SvxLongULSpaceItem *pItem = PTR_CAST(SvxLongULSpaceItem, pState);
- DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxULSpaceItem erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxULSpaceItem erwartet");
rRuler.UpdateFrame(pItem);
break;
}
@@ -91,7 +91,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 erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxTabStopItem erwartet");
rRuler.Update(pItem);
break;
}
@@ -99,7 +99,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 erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet");
rRuler.UpdatePara(pItem);
break;
}
@@ -109,7 +109,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 erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxColumnItem erwartet");
#ifdef DBG_UTIL
if(pItem)
{
@@ -128,35 +128,35 @@ void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
case SID_RULER_PAGE_POS:
{ // Position Seite, Seitenbreite
const SvxPagePosSizeItem *pItem = PTR_CAST(SvxPagePosSizeItem, pState);
- DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxPagePosSizeItem erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxPagePosSizeItem erwartet");
rRuler.Update(pItem);
break;
}
case SID_RULER_OBJECT:
{ // Object-Selektion
const SvxObjectItem *pItem = PTR_CAST(SvxObjectItem, pState);
- DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxObjectItem erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxObjectItem erwartet");
rRuler.Update(pItem);
break;
}
case SID_RULER_PROTECT:
{
const SvxProtectItem *pItem = PTR_CAST(SvxProtectItem, pState);
- DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxProtectItem erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxProtectItem erwartet");
rRuler.Update(pItem);
break;
}
case SID_RULER_BORDER_DISTANCE:
{
const SvxLRSpaceItem *pItem = PTR_CAST(SvxLRSpaceItem, pState);
- DBG_ASSERT(pState? 0 != pItem: TRUE, "SvxLRSpaceItem erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SvxLRSpaceItem erwartet");
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 erwartet");
+ DBG_ASSERT(pState? 0 != pItem: sal_True, "SfxBoolItem erwartet");
rRuler.UpdateTextRTL(pItem);
}
break;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index c29cc1313a26..0c5e89b82532 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1866,7 +1866,7 @@ void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview)
if (!bPreview && bStarDrawPreviewMode && GetPageCount())
{
// Das Zuruecksetzen ist nicht erlaubt, da das Model ev. nicht vollstaendig geladen wurde
- DBG_ASSERT(FALSE,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig");
+ DBG_ASSERT(sal_False,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig");
}
else
{
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index b1634ff4717f..38784af56936 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2479,7 +2479,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const
sal_uInt32 nPoly,nPnt;
if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt))
{
- DBG_ASSERT(FALSE,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!");
+ DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!");
}
const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt));
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 64c9d35cb6cf..75be5919b114 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -406,7 +406,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(nNewPt0Idx)
{
// Korrektur notwendig?
- DBG_ASSERT(bKorregFlag==FALSE,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
+ DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()");
if(!bKorregFlag)
{
bKorregFlag = sal_True;
generated by cgit (git 2.34.1) at 2025-02-10 18:31:53 +0000