Kaydet (Commit) e9745e3a authored tarafından Noel Grandin's avatar Noel Grandin

sfx2/stbitem.hxx: sal_Bool->bool

Change-Id: I7303d9533551fcfa7c7a99c9592402511492165a
üst 12f49da9
...@@ -42,7 +42,7 @@ struct SfxStbCtrlFactory ...@@ -42,7 +42,7 @@ struct SfxStbCtrlFactory
{ {
SfxStatusBarControlCtor pCtor; SfxStatusBarControlCtor pCtor;
TypeId nTypeId; TypeId nTypeId;
sal_uInt16 nSlotId; sal_uInt16 nSlotId;
SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor, SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
TypeId nTheTypeId, sal_uInt16 nTheSlotId ): TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
...@@ -60,8 +60,8 @@ class UserDrawEvent; ...@@ -60,8 +60,8 @@ class UserDrawEvent;
class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
{ {
sal_uInt16 nSlotId; sal_uInt16 nSlotId;
sal_uInt16 nId; sal_uInt16 nId;
StatusBar* pBar; StatusBar* pBar;
protected: protected:
...@@ -101,9 +101,9 @@ protected: ...@@ -101,9 +101,9 @@ protected:
virtual void Click(); virtual void Click();
virtual void DoubleClick(); virtual void DoubleClick();
virtual void Command( const CommandEvent& rCEvt ); virtual void Command( const CommandEvent& rCEvt );
virtual sal_Bool MouseButtonDown( const MouseEvent & ); virtual bool MouseButtonDown( const MouseEvent & );
virtual sal_Bool MouseMove( const MouseEvent & ); virtual bool MouseMove( const MouseEvent & );
virtual sal_Bool MouseButtonUp( const MouseEvent & ); virtual bool MouseButtonUp( const MouseEvent & );
virtual void Paint( const UserDrawEvent &rUDEvt ); virtual void Paint( const UserDrawEvent &rUDEvt );
static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
...@@ -112,8 +112,8 @@ public: ...@@ -112,8 +112,8 @@ public:
SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar ); SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar );
virtual ~SfxStatusBarControl(); virtual ~SfxStatusBarControl();
sal_uInt16 GetSlotId() const { return nSlotId; } sal_uInt16 GetSlotId() const { return nSlotId; }
sal_uInt16 GetId() const { return nId; } sal_uInt16 GetId() const { return nId; }
StatusBar& GetStatusBar() const { return *pBar; } StatusBar& GetStatusBar() const { return *pBar; }
void CaptureMouse(); void CaptureMouse();
void ReleaseMouse(); void ReleaseMouse();
......
...@@ -33,7 +33,7 @@ public: ...@@ -33,7 +33,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ); const SfxPoolItem* pState );
virtual sal_Bool MouseButtonDown( const MouseEvent& rEvt ); virtual bool MouseButtonDown( const MouseEvent& rEvt );
virtual void Paint( const UserDrawEvent& rEvt ); virtual void Paint( const UserDrawEvent& rEvt );
private: private:
......
...@@ -44,8 +44,8 @@ public: ...@@ -44,8 +44,8 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt ); virtual void Paint( const UserDrawEvent& rEvt );
virtual sal_Bool MouseButtonDown( const MouseEvent & ); virtual bool MouseButtonDown( const MouseEvent & );
virtual sal_Bool MouseMove( const MouseEvent & rEvt ); virtual bool MouseMove( const MouseEvent & rEvt );
}; };
#endif #endif
......
...@@ -459,7 +459,7 @@ void SfxStatusBarControl::StateChanged ...@@ -459,7 +459,7 @@ void SfxStatusBarControl::StateChanged
sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
/* [Description] /* [Description]
...@@ -481,12 +481,12 @@ sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) ...@@ -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] /* [Description]
...@@ -508,12 +508,12 @@ sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & ) ...@@ -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] /* [Description]
...@@ -535,7 +535,7 @@ sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & ) ...@@ -535,7 +535,7 @@ sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
*/ */
{ {
return sal_False; return false;
} }
......
...@@ -109,7 +109,7 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, ...@@ -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(); CaptureMouse();
SelectionTypePopup aPop( mnState ); SelectionTypePopup aPop( mnState );
...@@ -136,7 +136,7 @@ sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) ...@@ -136,7 +136,7 @@ sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
} }
ReleaseMouse(); ReleaseMouse();
return sal_True; return true;
} }
......
...@@ -325,10 +325,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) ...@@ -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 ) if ( !mpImpl->mbValuesSet )
return sal_True; return true;
const Rectangle aControlRect = getControlRect(); const Rectangle aControlRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel(); const Point aPoint = rEvt.GetPosPixel();
...@@ -358,7 +358,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) ...@@ -358,7 +358,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom; mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
if ( nOldZoom == mpImpl->mnCurrentZoom ) if ( nOldZoom == mpImpl->mnCurrentZoom )
return sal_True; return true;
if ( GetStatusBar().AreItemsVisible() ) if ( GetStatusBar().AreItemsVisible() )
GetStatusBar().SetItemData( GetId(), 0 ); // force repaint GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
...@@ -379,15 +379,15 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) ...@@ -379,15 +379,15 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mbOmitPaint = false; mpImpl->mbOmitPaint = false;
return sal_True; return true;
} }
sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
{ {
if ( !mpImpl->mbValuesSet ) if ( !mpImpl->mbValuesSet )
return sal_True; return true;
const short nButtons = rEvt.GetButtons(); const short nButtons = rEvt.GetButtons();
...@@ -424,7 +424,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) ...@@ -424,7 +424,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
} }
} }
return sal_True; return true;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt ); virtual void Paint( const UserDrawEvent& rEvt );
virtual sal_Bool MouseButtonDown( const MouseEvent & ); virtual bool MouseButtonDown( const MouseEvent & );
}; };
#endif #endif
......
...@@ -143,7 +143,7 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt ) ...@@ -143,7 +143,7 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
pDev->DrawImage( aRect.TopLeft(), bBookMode ? mpImpl->maImageBookMode_Active : mpImpl->maImageBookMode ); 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 Rectangle aRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel(); const Point aPoint = rEvt.GetPosPixel();
...@@ -188,7 +188,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt ) ...@@ -188,7 +188,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
execute( aArgs ); execute( aArgs );
return sal_True; return true;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment