summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sfx2/stbitem.hxx16
-rw-r--r--include/svx/selctrl.hxx2
-rw-r--r--include/svx/zoomsliderctrl.hxx4
-rw-r--r--sfx2/source/statbar/stbitem.cxx12
-rw-r--r--svx/source/stbctrls/selctrl.cxx4
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx14
-rw-r--r--sw/source/core/uibase/inc/viewlayoutctrl.hxx2
-rw-r--r--sw/source/core/uibase/utlui/viewlayoutctrl.cxx4
8 files changed, 29 insertions, 29 deletions
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index c9b5dc1e06cf..06802341ad60 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -42,7 +42,7 @@ struct SfxStbCtrlFactory
{
SfxStatusBarControlCtor pCtor;
TypeId nTypeId;
- sal_uInt16 nSlotId;
+ sal_uInt16 nSlotId;
SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
@@ -60,8 +60,8 @@ class UserDrawEvent;
class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
{
- sal_uInt16 nSlotId;
- sal_uInt16 nId;
+ sal_uInt16 nSlotId;
+ sal_uInt16 nId;
StatusBar* pBar;
protected:
@@ -101,9 +101,9 @@ protected:
virtual void Click();
virtual void DoubleClick();
virtual void Command( const CommandEvent& rCEvt );
- virtual sal_Bool MouseButtonDown( const MouseEvent & );
- virtual sal_Bool MouseMove( const MouseEvent & );
- virtual sal_Bool MouseButtonUp( const MouseEvent & );
+ virtual bool MouseButtonDown( const MouseEvent & );
+ virtual bool MouseMove( const MouseEvent & );
+ virtual bool MouseButtonUp( const MouseEvent & );
virtual void Paint( const UserDrawEvent &rUDEvt );
static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
@@ -112,8 +112,8 @@ public:
SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar );
virtual ~SfxStatusBarControl();
- sal_uInt16 GetSlotId() const { return nSlotId; }
- sal_uInt16 GetId() const { return nId; }
+ sal_uInt16 GetSlotId() const { return nSlotId; }
+ sal_uInt16 GetId() const { return nId; }
StatusBar& GetStatusBar() const { return *pBar; }
void CaptureMouse();
void ReleaseMouse();
diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx
index b3081f112722..be8b05a51bdd 100644
--- a/include/svx/selctrl.hxx
+++ b/include/svx/selctrl.hxx
@@ -33,7 +33,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
- virtual sal_Bool MouseButtonDown( const MouseEvent& rEvt );
+ virtual bool MouseButtonDown( const MouseEvent& rEvt );
virtual void Paint( const UserDrawEvent& rEvt );
private:
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 11c962702df6..0aad2968cb22 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -44,8 +44,8 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
- virtual sal_Bool MouseButtonDown( const MouseEvent & );
- virtual sal_Bool MouseMove( const MouseEvent & rEvt );
+ virtual bool MouseButtonDown( const MouseEvent & );
+ virtual bool MouseMove( const MouseEvent & rEvt );
};
#endif
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 48c2023f6668..e205733741d8 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -459,7 +459,7 @@ void SfxStatusBarControl::StateChanged
-sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
+bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
/* [Description]
@@ -481,12 +481,12 @@ sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
*/
{
- return sal_False;
+ return false;
}
-sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
+bool SfxStatusBarControl::MouseMove( const MouseEvent & )
/* [Description]
@@ -508,12 +508,12 @@ sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
*/
{
- return sal_False;
+ return false;
}
-sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
+bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
/* [Description]
@@ -535,7 +535,7 @@ sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
*/
{
- return sal_False;
+ return false;
}
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index acfb2da8e098..1536aa49f3bb 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -109,7 +109,7 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
-sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
+bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
{
CaptureMouse();
SelectionTypePopup aPop( mnState );
@@ -136,7 +136,7 @@ sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
}
ReleaseMouse();
- return sal_True;
+ return true;
}
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 7497bfa6bad3..e0fa87935cc8 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -325,10 +325,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
-sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
+bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
{
if ( !mpImpl->mbValuesSet )
- return sal_True;
+ return true;
const Rectangle aControlRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel();
@@ -358,7 +358,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
if ( nOldZoom == mpImpl->mnCurrentZoom )
- return sal_True;
+ return true;
if ( GetStatusBar().AreItemsVisible() )
GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
@@ -379,15 +379,15 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mbOmitPaint = false;
- return sal_True;
+ return true;
}
-sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
+bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
{
if ( !mpImpl->mbValuesSet )
- return sal_True;
+ return true;
const short nButtons = rEvt.GetButtons();
@@ -424,7 +424,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
}
}
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
index 10648cd36671..531dc57d4196 100644
--- a/sw/source/core/uibase/inc/viewlayoutctrl.hxx
+++ b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
@@ -38,7 +38,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
- virtual sal_Bool MouseButtonDown( const MouseEvent & );
+ virtual bool MouseButtonDown( const MouseEvent & );
};
#endif
diff --git a/sw/source/core/uibase/utlui/viewlayoutctrl.cxx b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
index 798213d5471f..633af0550e22 100644
--- a/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
@@ -143,7 +143,7 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
pDev->DrawImage( aRect.TopLeft(), bBookMode ? mpImpl->maImageBookMode_Active : mpImpl->maImageBookMode );
}
-sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
+bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
{
const Rectangle aRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel();
@@ -188,7 +188,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
execute( aArgs );
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */