From 7f33ed417b2e29e5470724ea76967f64699a2662 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 17 Jan 2011 15:06:54 +0100 Subject: removetooltypes01: #i112600# Remove tools types from sw --- sw/inc/grfatr.hxx | 104 +++++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'sw/inc/grfatr.hxx') diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index bee336490450..28c24e16b48a 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -52,11 +52,11 @@ RES_MIRROR_GRAPH_END class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem { - BOOL bGrfToggle; // auf geraden Seiten Grafiken spiegeln + sal_Bool bGrfToggle; // auf geraden Seiten Grafiken spiegeln public: SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT ) - : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< USHORT >(eMiro) ), bGrfToggle( sal_False ) + : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< sal_uInt16 >(eMiro) ), bGrfToggle( sal_False ) {} SwMirrorGrf( const SwMirrorGrf &rMirrorGrf ) : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()), @@ -67,7 +67,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // pure virtual-Methiden von SfxEnumItem - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -75,10 +75,10 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) { @@ -87,8 +87,8 @@ public: return *this; } - inline BOOL IsGrfToggle() const { return bGrfToggle; } - inline void SetGrfToggle( BOOL bNew ) { bGrfToggle = bNew; } + inline sal_Bool IsGrfToggle() const { return bGrfToggle; } + inline void SetGrfToggle( sal_Bool bNew ) { bGrfToggle = bNew; } }; @@ -127,10 +127,10 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; } const Size& GetUnrotatedSize() const { return aUnrotatedSize; } @@ -171,7 +171,7 @@ public: class SwChannelGrf : public SfxInt16Item { protected: - SwChannelGrf( sal_Int16 nVal, USHORT nWhichL ) + SwChannelGrf( sal_Int16 nVal, sal_uInt16 nWhichL ) : SfxInt16Item( nWhichL, nVal ) {} @@ -236,10 +236,10 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); const double& GetValue() const { return nValue; } @@ -276,16 +276,16 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); }; class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem { public: - SwDrawModeGrf( USHORT nMode = 0 ) + SwDrawModeGrf( sal_uInt16 nMode = 0 ) : SfxEnumItem( RES_GRFATR_DRAWMODE, nMode ) {} @@ -293,17 +293,17 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // pure virtual-Methiden von SfxEnumItem - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); }; @@ -312,58 +312,58 @@ public: * Implementierung der GrafikAttribut Methoden vom SwAttrSet ******************************************************************************/ -inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const +inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(sal_Bool bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } -inline const SwCropGrf &SwAttrSet::GetCropGrf(BOOL bInP) const +inline const SwCropGrf &SwAttrSet::GetCropGrf(sal_Bool bInP) const { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); } -inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const +inline const SwRotationGrf &SwAttrSet::GetRotationGrf(sal_Bool bInP) const { return (const SwRotationGrf&)Get( RES_GRFATR_ROTATION,bInP); } -inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(BOOL bInP) const +inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(sal_Bool bInP) const { return (const SwLuminanceGrf&)Get( RES_GRFATR_LUMINANCE,bInP); } -inline const SwContrastGrf &SwAttrSet::GetContrastGrf(BOOL bInP) const +inline const SwContrastGrf &SwAttrSet::GetContrastGrf(sal_Bool bInP) const { return (const SwContrastGrf&)Get( RES_GRFATR_CONTRAST,bInP); } -inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(BOOL bInP) const +inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(sal_Bool bInP) const { return (const SwChannelRGrf&)Get( RES_GRFATR_CHANNELR,bInP); } -inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(BOOL bInP) const +inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(sal_Bool bInP) const { return (const SwChannelGGrf&)Get( RES_GRFATR_CHANNELG,bInP); } -inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(BOOL bInP) const +inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(sal_Bool bInP) const { return (const SwChannelBGrf&)Get( RES_GRFATR_CHANNELB,bInP); } -inline const SwGammaGrf &SwAttrSet::GetGammaGrf(BOOL bInP) const +inline const SwGammaGrf &SwAttrSet::GetGammaGrf(sal_Bool bInP) const { return (const SwGammaGrf&)Get( RES_GRFATR_GAMMA,bInP); } -inline const SwInvertGrf &SwAttrSet::GetInvertGrf(BOOL bInP) const +inline const SwInvertGrf &SwAttrSet::GetInvertGrf(sal_Bool bInP) const { return (const SwInvertGrf&)Get( RES_GRFATR_INVERT,bInP); } -inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(BOOL bInP) const +inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(sal_Bool bInP) const { return (const SwTransparencyGrf&)Get( RES_GRFATR_TRANSPARENCY,bInP); } -inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const +inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(sal_Bool bInP) const { return (const SwDrawModeGrf&)Get( RES_GRFATR_DRAWMODE,bInP); } /****************************************************************************** * Implementierung der GrafikAttribut Methoden vom SwFmt ******************************************************************************/ -inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const +inline const SwMirrorGrf &SwFmt::GetMirrorGrf(sal_Bool bInP) const { return aSet.GetMirrorGrf(bInP); } -inline const SwCropGrf &SwFmt::GetCropGrf(BOOL bInP) const +inline const SwCropGrf &SwFmt::GetCropGrf(sal_Bool bInP) const { return aSet.GetCropGrf(bInP); } -inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const +inline const SwRotationGrf &SwFmt::GetRotationGrf(sal_Bool bInP) const { return aSet.GetRotationGrf(bInP); } -inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(BOOL bInP) const +inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(sal_Bool bInP) const { return aSet.GetLuminanceGrf( bInP); } -inline const SwContrastGrf &SwFmt::GetContrastGrf(BOOL bInP) const +inline const SwContrastGrf &SwFmt::GetContrastGrf(sal_Bool bInP) const { return aSet.GetContrastGrf( bInP); } -inline const SwChannelRGrf &SwFmt::GetChannelRGrf(BOOL bInP) const +inline const SwChannelRGrf &SwFmt::GetChannelRGrf(sal_Bool bInP) const { return aSet.GetChannelRGrf( bInP); } -inline const SwChannelGGrf &SwFmt::GetChannelGGrf(BOOL bInP) const +inline const SwChannelGGrf &SwFmt::GetChannelGGrf(sal_Bool bInP) const { return aSet.GetChannelGGrf( bInP); } -inline const SwChannelBGrf &SwFmt::GetChannelBGrf(BOOL bInP) const +inline const SwChannelBGrf &SwFmt::GetChannelBGrf(sal_Bool bInP) const { return aSet.GetChannelBGrf( bInP); } -inline const SwGammaGrf &SwFmt::GetGammaGrf(BOOL bInP) const +inline const SwGammaGrf &SwFmt::GetGammaGrf(sal_Bool bInP) const { return aSet.GetGammaGrf( bInP); } -inline const SwInvertGrf &SwFmt::GetInvertGrf(BOOL bInP) const +inline const SwInvertGrf &SwFmt::GetInvertGrf(sal_Bool bInP) const { return aSet.GetInvertGrf( bInP); } -inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(BOOL bInP) const +inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(sal_Bool bInP) const { return aSet.GetTransparencyGrf( bInP); } -inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(BOOL bInP) const +inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(sal_Bool bInP) const { return aSet.GetDrawModeGrf(bInP); } -- cgit