From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 16:11:35 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from svx
---
svx/source/dialog/rlrcitem.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'svx/source/dialog/rlrcitem.cxx')
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 23d62d4de85e..dfb2141bdfe8 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -49,7 +49,7 @@
// class SvxRulerItem ----------------------------------------------------
-SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
+SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings)
: SfxControllerItem(_nId, rBindings),
rRuler(rRul)
{
@@ -57,7 +57,7 @@ SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
// -----------------------------------------------------------------------
-void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState)
{
// SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff
--
cgit
From 27681d609137cc1c8b8957ada9b2b54061311cec Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Fri, 21 Jan 2011 13:06:20 +0100
Subject: removetooltypes01: #i112600# Fix build problems on non-pro
---
svx/source/dialog/rlrcitem.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'svx/source/dialog/rlrcitem.cxx')
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;
--
cgit