summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/sdruler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/sdruler.cxx')
-rwxr-xr-xsd/source/ui/view/sdruler.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 679c28bb3a93..2964f5e79219 100755
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -57,18 +57,18 @@ class RulerCtrlItem : public SfxControllerItem
Ruler &rRuler;
protected:
- virtual void StateChanged( USHORT nSId, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
const SfxPoolItem* pItem );
public:
- RulerCtrlItem(USHORT nId, Ruler& rRlr, SfxBindings& rBind);
+ RulerCtrlItem(sal_uInt16 nId, Ruler& rRlr, SfxBindings& rBind);
};
/*************************************************************************
|*
\************************************************************************/
-RulerCtrlItem::RulerCtrlItem(USHORT _nId, Ruler& rRlr, SfxBindings& rBind)
+RulerCtrlItem::RulerCtrlItem(sal_uInt16 _nId, Ruler& rRlr, SfxBindings& rBind)
: SfxControllerItem(_nId, rBind)
, rRuler(rRlr)
{
@@ -79,14 +79,14 @@ RulerCtrlItem::RulerCtrlItem(USHORT _nId, Ruler& rRlr, SfxBindings& rBind)
|*
\************************************************************************/
-void RulerCtrlItem::StateChanged( USHORT nSId, SfxItemState, const SfxPoolItem* pState )
+void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolItem* pState )
{
switch( nSId )
{
case SID_RULER_NULL_OFFSET:
{
const SfxPointItem* pItem = dynamic_cast< const SfxPointItem* >(pState);
- DBG_ASSERT(pState ? pItem != NULL : TRUE, "SfxPointItem erwartet");
+ DBG_ASSERT(pState ? pItem != NULL : sal_True, "SfxPointItem erwartet");
if ( pItem )
rRuler.SetNullOffset(pItem->GetValue());
}
@@ -101,7 +101,7 @@ void RulerCtrlItem::StateChanged( USHORT nSId, SfxItemState, const SfxPoolItem*
|*
\************************************************************************/
-Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle)
+Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle)
: SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle)
, pSdWin(pWin)
, pDrViewShell(&rViewSh)
@@ -112,12 +112,12 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USH
if ( nWinStyle & WB_HSCROLL )
{
- bHorz = TRUE;
+ bHorz = sal_True;
SetHelpId( HID_SD_RULER_HORIZONTAL );
}
else
{
- bHorz = FALSE;
+ bHorz = sal_False;
SetHelpId( HID_SD_RULER_VERTICAL );
}
}