diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
| commit | e8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch) | |
| tree | dae18a3acbf29c192118e7c003f80df8da8e21ae /include | |
| parent | 1c8402465cfd4df862409dc310f5f099d044c4d8 (diff) | |
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'include')
101 files changed, 1382 insertions, 1384 deletions
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index c90effc9cb40..e486242670b1 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -105,7 +105,7 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, const OString& rID, const OUString& rUIXMLDescription ); ~SfxModelessDialog(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Resize(); virtual void Move(); virtual void StateChanged( StateChangedType nStateChange ); @@ -144,7 +144,7 @@ protected: ~SfxFloatingWindow(); virtual void StateChanged( StateChangedType nStateChange ); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Resize(); virtual void Move(); virtual bool Notify( NotifyEvent& rNEvt ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index f13514d21dc3..3d572b341884 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -372,7 +372,7 @@ public: inline void CheckYes() { m_aYesButton.Check(); } inline void CheckNo() { m_aNoButton.Check(); } - inline bool IsYesChecked() const { return m_aYesButton.IsChecked() != sal_False; } + inline bool IsYesChecked() const { return m_aYesButton.IsChecked(); } }; // struct CustomPropertyLine --------------------------------------------- diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 333bdc455891..b8dd5826cbb8 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -58,14 +58,14 @@ protected: CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void Resize(); - virtual sal_Bool PrepareToggleFloatingMode(); + virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); virtual void StartDocking(); - virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + virtual bool Docking( const Point& rPos, Rectangle& rRect ); virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); virtual void Resizing( Size& rSize ); virtual void Paint( const Rectangle& rRect ); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Move(); SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; } diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 8ae93a8ef088..dec3c734ac0a 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -47,7 +47,7 @@ public: virtual void Resize(); virtual void Resizing( Size& rSize ); - virtual sal_Bool Close(); + virtual bool Close(); }; #endif diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index 78090270af91..cc7ad04c2845 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -36,8 +36,8 @@ class SFX2_DLLPUBLIC SfxHelp : public Help private: SAL_DLLPRIVATE sal_Bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); - SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const OUString& rKeyWord ); - SAL_DLLPRIVATE virtual sal_Bool Start( const OUString& rURL, const Window* pWindow ); + SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ); + SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ); SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index c859d1a2f7c0..ac7d66a51768 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -120,7 +120,7 @@ private: protected: virtual void PopupModeEnd(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void DeleteFloatingWindow(); sal_uInt16 GetId() const { return m_nId; } diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 7290d36a53e0..9b60912bb38b 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -420,7 +420,7 @@ public: virtual void Select(); - virtual sal_Bool ShowDropDown( sal_Bool bShow ); + virtual bool ShowDropDown( sal_Bool bShow ); virtual Calendar* CreateCalendar( Window* pParent ); Calendar* GetCalendar(); diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 35244183228a..75ea3b89faa2 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.hxx @@ -36,9 +36,9 @@ public: virtual ~SvtHelpOptions(); void SetExtendedHelp( sal_Bool b ); - sal_Bool IsExtendedHelp() const; + bool IsExtendedHelp() const; void SetHelpTips( sal_Bool b ); - sal_Bool IsHelpTips() const; + bool IsHelpTips() const; const OUString& GetHelpStyleSheet()const; void SetHelpStyleSheet(const OUString& rStyleSheet); diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index c7613ae3c5b4..9e7bad264ec2 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -120,7 +120,7 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow Image maImgPipette; - virtual sal_Bool Close(); + virtual bool Close(); #ifdef BMPMASK_PRIVATE diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index cf5b596e5099..631a1c9fd24a 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -95,7 +95,7 @@ private: virtual void GetFocus (void); protected: - virtual sal_Bool Close(); + virtual bool Close(); virtual void Resize(); virtual void Resizing( Size& rSize ); diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx index 1a1c574df883..8ee5db519559 100644 --- a/include/svx/galbrws.hxx +++ b/include/svx/galbrws.hxx @@ -58,7 +58,7 @@ private: /// bitfield void InitSettings(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Resize(); virtual void GetFocus(); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 0515a22f4c49..d6877356cc36 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -99,7 +99,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow SvxIMapDlgItem aIMapItem; virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); DECL_LINK( TbxClickHdl, ToolBox* ); DECL_LINK( InfoHdl, IMapWindow* ); diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index d15ce37a8116..2e34aadec167 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -118,7 +118,7 @@ private: protected: virtual void Resizing( Size& rSize ); virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void PopupModeEnd(); /** This function is called when the window gets the focus. It grabs diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 149f73aefa52..b8010ac79155 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -143,7 +143,7 @@ class SvxRubyDialog : public SfxModelessDialog void AssertOneEntry(); void Update(); - virtual sal_Bool Close(); + virtual bool Close(); long GetLastPos() const {return nLastPos;} void SetLastPos(long nSet) {nLastPos = nSet;} diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 07cf33028b6c..319727e57b66 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -122,7 +122,7 @@ public: SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); ~SvxSearchDialog(); - virtual sal_Bool Close(); + virtual bool Close(); // Window virtual void Activate(); diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 8f73740a688a..4c6b87815e9e 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -57,7 +57,7 @@ namespace svx Color maCurColor; Rectangle maUpdRect; Size maBmpSize; - sal_Bool mbWasHiContrastMode; + bool mbWasHiContrastMode; }; //........................................................................ diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 641383d1c50a..97e27861ad39 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -287,7 +287,7 @@ private: OUString maActionCommand; protected: - void ImplClickedOrToggled( sal_Bool bToggled ); + void ImplClickedOrToggled( bool bToggled ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext(); diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx index 091b6b2f7be6..13d2beff9cb9 100644 --- a/include/vcl/FilterConfigItem.hxx +++ b/include/vcl/FilterConfigItem.hxx @@ -38,12 +38,12 @@ class VCL_DLLPUBLIC FilterConfigItem ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; - sal_Bool bModified; + bool bModified; - sal_Bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny, + bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet, const OUString& rPropName, - sal_Bool bTestPropertyAvailability ); + bool bTestPropertyAvailability ); void ImpInitTree( const OUString& rTree ); @@ -51,7 +51,7 @@ class VCL_DLLPUBLIC FilterConfigItem static ::com::sun::star::beans::PropertyValue* GetPropertyValue( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, const OUString& rName ); - static sal_Bool WritePropertyValue( + static bool WritePropertyValue( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, const ::com::sun::star::beans::PropertyValue& rPropValue ); @@ -66,14 +66,14 @@ public : // 1. FilterData PropertySequence // 2. configuration // 3. given default - sal_Bool ReadBool( const OUString& rKey, sal_Bool bDefault ); + bool ReadBool( const OUString& rKey, bool bDefault ); sal_Int32 ReadInt32( const OUString& rKey, sal_Int32 nDefault ); OUString ReadString( const OUString& rKey, const OUString& rDefault ); // try to store to configuration // and always stores into the FilterData sequence - void WriteBool( const OUString& rKey, sal_Bool bValue ); + void WriteBool( const OUString& rKey, bool bValue ); void WriteInt32( const OUString& rKey, sal_Int32 nValue ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const; diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index 44f5041b3756..b61506ebcf8d 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -44,14 +44,14 @@ private: KeyCode maCurKeyCode; sal_uInt16 mnCurId; sal_uInt16 mnCurRepeat; - sal_Bool mbIsCancel; + bool mbIsCancel; sal_Bool* mpDel; SAL_DLLPRIVATE void ImplInit(); SAL_DLLPRIVATE void ImplCopyData( ImplAccelData& rAccelData ); SAL_DLLPRIVATE void ImplDeleteData(); SAL_DLLPRIVATE void ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, - sal_Bool bEnable, Accelerator* pAutoAccel ); + bool bEnable, Accelerator* pAutoAccel ); SAL_DLLPRIVATE ImplAccelEntry* ImplGetAccelData( const KeyCode& rKeyCode ) const; @@ -74,7 +74,7 @@ public: sal_uInt16 GetCurItemId() const { return mnCurId; } const KeyCode& GetCurKeyCode() const { return maCurKeyCode; } sal_uInt16 GetCurRepeat() const { return mnCurRepeat; } - sal_Bool IsCancel() const { return mbIsCancel; } + bool IsCancel() const { return mbIsCancel; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index acbb70b7d911..282074f8d73e 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -54,17 +54,17 @@ public: return (AlphaMask&) Bitmap::operator=( rAlphaMask ); } - sal_Bool operator!() const + bool operator!() const { return Bitmap::operator!(); } - sal_Bool operator==( const AlphaMask& rAlphaMask ) const + bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } - sal_Bool operator!=( const AlphaMask& rAlphaMask ) const + bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } @@ -105,12 +105,12 @@ public: Bitmap GetBitmap() const; - sal_Bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, + bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc = NULL); - sal_Bool Erase( sal_uInt8 cTransparency ); - sal_Bool Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency ); - sal_Bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, + bool Erase( sal_uInt8 cTransparency ); + bool Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency ); + bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong nTol = 0UL ); BitmapReadAccess* AcquireReadAccess() diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 7d5c7310d7b0..7c3b8e43e438 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -50,7 +50,7 @@ struct VCL_DLLPUBLIC AnimationBitmap Size aSizePix; long nWait; Disposal eDisposal; - sal_Bool bUserInput; + bool bUserInput; AnimationBitmap() {} AnimationBitmap( @@ -65,7 +65,7 @@ struct VCL_DLLPUBLIC AnimationBitmap aSizePix ( rSizePix ), nWait ( _nWait ), eDisposal ( _eDisposal ), - bUserInput ( sal_False ) + bUserInput ( false ) {} bool operator==( const AnimationBitmap& rAnimBmp ) const @@ -81,7 +81,7 @@ struct VCL_DLLPUBLIC AnimationBitmap bool operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); } - sal_Bool IsEqual( const AnimationBitmap& rAnimBmp ) const + bool IsEqual( const AnimationBitmap& rAnimBmp ) const { return( rAnimBmp.aPosPix == aPosPix && rAnimBmp.aSizePix == aSizePix && @@ -106,14 +106,14 @@ struct AInfo OutputDevice* pOutDev; void* pViewData; long nExtraData; - sal_Bool bWithSize; - sal_Bool bPause; + bool bWithSize; + bool bPause; AInfo() : pOutDev( NULL ), pViewData( NULL ), nExtraData( 0L ), - bWithSize( sal_False ), - bPause( sal_False ) {} + bWithSize( false ), + bPause( false ) {} }; class ImplAnimView; @@ -136,11 +136,11 @@ class VCL_DLLPUBLIC Animation size_t mnPos; Disposal meLastDisposal; CycleMode meCycleMode; - sal_Bool mbFirst; - sal_Bool mbIsInAnimation; - sal_Bool mbWithSize; - sal_Bool mbLoopTerminated; - sal_Bool mbIsWaiting; + bool mbFirst; + bool mbIsInAnimation; + bool mbWithSize; + bool mbLoopTerminated; + bool mbIsWaiting; SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); @@ -165,7 +165,7 @@ public: void Clear(); - sal_Bool Start( + bool Start( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, @@ -177,9 +177,9 @@ public: void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz ) const; - sal_Bool IsInAnimation() const { return mbIsInAnimation; } - sal_Bool IsTransparent() const; - sal_Bool IsTerminated() const { return mbLoopTerminated; } + bool IsInAnimation() const { return mbIsInAnimation; } + bool IsTransparent() const; + bool IsTerminated() const { return mbLoopTerminated; } const Size& GetDisplaySizePixel() const { return maGlobalSize; } void SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; } @@ -198,7 +198,7 @@ public: const Link& GetNotifyHdl() const { return maNotifyLink; } size_t Count() const { return maList.size(); } - sal_Bool Insert( const AnimationBitmap& rAnimationBitmap ); + bool Insert( const AnimationBitmap& rAnimationBitmap ); const AnimationBitmap& Get( sal_uInt16 nAnimation ) const; void Replace( const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation ); @@ -207,23 +207,23 @@ public: public: - sal_Bool Convert( BmpConversion eConversion ); - sal_Bool ReduceColors( + bool Convert( BmpConversion eConversion ); + bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); - sal_Bool Invert(); - sal_Bool Mirror( sal_uLong nMirrorFlags ); - sal_Bool Adjust( + bool Invert(); + bool Mirror( sal_uLong nMirrorFlags ); + bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - sal_Bool bInvert = sal_False + bool bInvert = false ); - sal_Bool Filter( + bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 9003be4b995e..3e64da7657ad 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -328,38 +328,38 @@ public: SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const; - SAL_DLLPRIVATE sal_Bool ImplScaleFast( const double& rScaleX, const double& rScaleY ); - SAL_DLLPRIVATE sal_Bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ); - SAL_DLLPRIVATE sal_Bool ImplScaleSuper( const double& rScaleX, const double& rScaleY ); - SAL_DLLPRIVATE sal_Bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const Kernel& aKernel); + SAL_DLLPRIVATE bool ImplScaleFast( const double& rScaleX, const double& rScaleY ); + SAL_DLLPRIVATE bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ); + SAL_DLLPRIVATE bool ImplScaleSuper( const double& rScaleX, const double& rScaleY ); + SAL_DLLPRIVATE bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const Kernel& aKernel); SAL_DLLPRIVATE bool ImplConvolutionPass( Bitmap& aNewBitmap, const int nNewSize, BitmapReadAccess* pReadAcc, int aNumberOfContributions, double* pWeights, int* pPixels, int* pCount ); - SAL_DLLPRIVATE sal_Bool ImplMakeMono( sal_uInt8 cThreshold ); - SAL_DLLPRIVATE sal_Bool ImplMakeMonoDither(); - SAL_DLLPRIVATE sal_Bool ImplMakeGreyscales( sal_uInt16 nGreyscales ); - SAL_DLLPRIVATE sal_Bool ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor = NULL ); - SAL_DLLPRIVATE sal_Bool ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor = NULL ); - SAL_DLLPRIVATE sal_Bool ImplConvertGhosted(); - SAL_DLLPRIVATE sal_Bool ImplDitherMatrix(); - SAL_DLLPRIVATE sal_Bool ImplDitherFloyd(); - SAL_DLLPRIVATE sal_Bool ImplDitherFloyd16(); - SAL_DLLPRIVATE sal_Bool ImplReduceSimple( sal_uInt16 nColorCount ); - SAL_DLLPRIVATE sal_Bool ImplReducePopular( sal_uInt16 nColorCount ); - SAL_DLLPRIVATE sal_Bool ImplReduceMedian( sal_uInt16 nColorCount ); + SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold ); + SAL_DLLPRIVATE bool ImplMakeMonoDither(); + SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales ); + SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor = NULL ); + SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor = NULL ); + SAL_DLLPRIVATE bool ImplConvertGhosted(); + SAL_DLLPRIVATE bool ImplDitherMatrix(); + SAL_DLLPRIVATE bool ImplDitherFloyd(); + SAL_DLLPRIVATE bool ImplDitherFloyd16(); + SAL_DLLPRIVATE bool ImplReduceSimple( sal_uInt16 nColorCount ); + SAL_DLLPRIVATE bool ImplReducePopular( sal_uInt16 nColorCount ); + SAL_DLLPRIVATE bool ImplReduceMedian( sal_uInt16 nColorCount ); SAL_DLLPRIVATE void ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, long nR1, long nR2, long nG1, long nG2, long nB1, long nB2, long nColors, long nPixels, long& rIndex ); - SAL_DLLPRIVATE sal_Bool ImplConvolute3( const long* pMatrix, long nDivisor, + SAL_DLLPRIVATE bool ImplConvolute3( const long* pMatrix, long nDivisor, const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE sal_Bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius = 0.7 ); SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius = 0.7 ); @@ -376,14 +376,14 @@ public: virtual ~Bitmap(); Bitmap& operator=( const Bitmap& rBitmap ); - inline sal_Bool operator!() const; - inline sal_Bool operator==( const Bitmap& rBitmap ) const; - inline sal_Bool operator!=( const Bitmap& rBitmap ) const; + inline bool operator!() const; + inline bool operator==( const Bitmap& rBitmap ) const; + inline bool operator!=( const Bitmap& rBitmap ) const; - inline sal_Bool IsSameInstance( const Bitmap& rBmp ) const; - sal_Bool IsEqual( const Bitmap& rBmp ) const; + inline bool IsSameInstance( const Bitmap& rBmp ) const; + bool IsEqual( const Bitmap& rBmp ) const; - inline sal_Bool IsEmpty() const; + inline bool IsEmpty() const; void SetEmpty(); inline const MapMode& GetPrefMapMode() const; @@ -397,7 +397,7 @@ public: sal_uInt16 GetBitCount() const; inline sal_uLong GetColorCount() const; inline sal_uLong GetSizeBytes() const; - sal_Bool HasGreyPalette() const; + bool HasGreyPalette() const; /** get system dependent bitmap data @param rData @@ -416,7 +416,7 @@ public: public: - sal_Bool MakeMono( sal_uInt8 cThreshold ); + bool MakeMono( sal_uInt8 cThreshold ); /** Convert bitmap format @@ -426,7 +426,7 @@ public: @return sal_True, if the conversion was completed successfully. */ - sal_Bool Convert( BmpConversion eConversion ); + bool Convert( BmpConversion eConversion ); /** Reduce number of colors for the bitmap @@ -438,7 +438,7 @@ public: @return sal_True, if the color reduction operation was completed successfully. */ - sal_Bool ReduceColors( sal_uInt16 nNewColorCount, + bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); /** Apply a dither algorithm to the bitmap @@ -450,7 +450,7 @@ public: @param nDitherFlags The algorithm to be used for dithering */ - sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); + bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -466,7 +466,7 @@ public: nothing had to be cropped, because e.g. the crop rectangle included the bitmap, sal_False is returned, too! */ - sal_Bool Crop( const Rectangle& rRectPixel ); + bool Crop( const Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding @@ -483,7 +483,7 @@ public: not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, + bool Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor = NULL ); /** Copy a rectangular area from another bitmap @@ -508,7 +508,7 @@ public: nothing had to be done, e.g. because one of the rectangles are empty. */ - sal_Bool CopyPixel( const Rectangle& rRectDst, + bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const Bitmap* pBmpSrc = NULL ); @@ -522,7 +522,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool CombineSimple( const Bitmap& rMask, + bool CombineSimple( const Bitmap& rMask, BmpCombine eCombine ); /** Alpha-blend the given bitmap against a specified uniform @@ -541,7 +541,7 @@ public: @return sal_True, if blending was successful, sal_False otherwise */ - sal_Bool Blend( const AlphaMask& rAlpha, + bool Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ); /** Fill the entire bitmap with the given color @@ -551,13 +551,13 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Erase( const Color& rFillColor ); + bool Erase( const Color& rFillColor ); /** Perform the Invert operation on every pixel @return sal_True, if the operation was completed successfully. */ - sal_Bool Invert(); + bool Invert(); /** Mirror the bitmap @@ -566,7 +566,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Mirror( sal_uLong nMirrorFlags ); + bool Mirror( sal_uLong nMirrorFlags ); /** Scale the bitmap @@ -578,7 +578,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); + bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Scale the bitmap @@ -593,7 +593,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); + bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); // Adapt the BitCount of rNew to BitCount of lolal, including grey or color paltette // Can be used to create alpha/mask bitmaps after their processing in 24bit @@ -612,7 +612,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Rotate( long nAngle10, const Color& rFillColor ); + bool Rotate( long nAngle10, const Color& rFillColor ); /** Create on-off mask from bitmap @@ -655,7 +655,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Bitmap& rMask, const Color& rReplaceColor ); + bool Replace( const Bitmap& rMask, const Color& rReplaceColor ); /** Merge bitmap with given background color according to specified alpha mask @@ -667,7 +667,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); + bool Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); /** Replace all pixel having the search color with the specified color @@ -684,7 +684,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); + bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -704,7 +704,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Color* pSearchColors, const Color* rReplaceColors, + bool Replace( const Color* pSearchColors, const Color* rReplaceColors, sal_uLong nColorCount, sal_uLong* pTols = NULL ); /** Convert the bitmap to a PolyPolygon @@ -724,7 +724,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Vectorize( PolyPolygon& rPolyPoly, + bool Vectorize( PolyPolygon& rPolyPoly, sal_uLong nFlags = BMP_VECTORIZE_OUTER, const Link* pProgress = NULL ); @@ -749,7 +749,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, + bool Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, sal_uLong nFlags = BMP_VECTORIZE_INNER, const Link* pProgress = NULL ); @@ -780,13 +780,13 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Adjust( short nLuminancePercent = 0, + bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - sal_Bool bInvert = sal_False ); + bool bInvert = false ); /** Apply specified filter to the bitmap @@ -801,7 +801,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Filter( BmpFilter eFilter, + bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); @@ -817,27 +817,27 @@ public: ScopedWriteAccess; }; -inline sal_Bool Bitmap::operator!() const +inline bool Bitmap::operator!() const { return( mpImpBmp == NULL ); } -inline sal_Bool Bitmap::operator==( const Bitmap& rBitmap ) const +inline bool Bitmap::operator==( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp == mpImpBmp ); } -inline sal_Bool Bitmap::operator!=( const Bitmap& rBitmap ) const +inline bool Bitmap::operator!=( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp != mpImpBmp ); } -inline sal_Bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const +inline bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp == mpImpBmp ); } -inline sal_Bool Bitmap::IsEmpty() const +inline bool Bitmap::IsEmpty() const { return( mpImpBmp == NULL ); } diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 7306856bd779..506a38bc7fcb 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -58,7 +58,7 @@ private: Size aBitmapSize; Color aTransparentColor; TransparentType eTransparent; - sal_Bool bAlpha; + bool bAlpha; public: @@ -77,13 +77,13 @@ public: ~BitmapEx(); BitmapEx& operator=( const BitmapEx& rBitmapEx ); - sal_Bool operator==( const BitmapEx& rBitmapEx ) const; - sal_Bool operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); } - sal_Bool operator!() const { return !aBitmap; } + bool operator==( const BitmapEx& rBitmapEx ) const; + bool operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); } + bool operator!() const { return !aBitmap; } - sal_Bool IsEqual( const BitmapEx& rBmpEx ) const; + bool IsEqual( const BitmapEx& rBmpEx ) const; - sal_Bool IsEmpty() const; + bool IsEmpty() const; void SetEmpty(); void Clear(); @@ -92,7 +92,7 @@ public: void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const; - sal_Bool IsTransparent() const; + bool IsTransparent() const; TransparentType GetTransparentType() const { return eTransparent; } Bitmap GetBitmap( const Color* pTransReplaceColor = NULL ) const; @@ -100,7 +100,7 @@ public: BitmapEx GetColorTransformedBitmapEx() const; - sal_Bool IsAlpha() const; + bool IsAlpha() const; AlphaMask GetAlpha() const; const Size& GetSizePixel() const { return aBitmapSize; } @@ -128,7 +128,7 @@ public: @return sal_True, if the conversion was completed successfully. */ - sal_Bool Convert( BmpConversion eConversion ); + bool Convert( BmpConversion eConversion ); /** Reduce number of colors for the bitmap @@ -140,7 +140,7 @@ public: @return sal_True, if the color reduction operation was completed successfully. */ - sal_Bool ReduceColors( sal_uInt16 nNewColorCount, + bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); /** Apply a dither algorithm to the bitmap @@ -152,7 +152,7 @@ public: @param nDitherFlags The algorithm to be used for dithering */ - sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); + bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -168,7 +168,7 @@ public: nothing had to be cropped, because e.g. the crop rectangle included the bitmap, sal_False is returned, too! */ - sal_Bool Crop( const Rectangle& rRectPixel ); + bool Crop( const Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding @@ -188,9 +188,9 @@ public: not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, + bool Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor = NULL, - sal_Bool bExpandTransparent = sal_False ); + bool bExpandTransparent = false ); /** Copy a rectangular area from another bitmap @@ -214,7 +214,7 @@ public: nothing had to be done, e.g. because one of the rectangles are empty. */ - sal_Bool CopyPixel( const Rectangle& rRectDst, + bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const BitmapEx* pBmpExSrc = NULL ); @@ -226,13 +226,13 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Erase( const Color& rFillColor ); + bool Erase( const Color& rFillColor ); /** Perform the Invert operation on every pixel @return sal_True, if the operation was completed successfully. */ - sal_Bool Invert(); + bool Invert(); /** Mirror the bitmap @@ -241,7 +241,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Mirror( sal_uLong nMirrorFlags ); + bool Mirror( sal_uLong nMirrorFlags ); /** Scale the bitmap @@ -253,7 +253,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); + bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Scale the bitmap @@ -268,7 +268,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); + bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Rotate bitmap by the specified angle @@ -283,7 +283,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Rotate( long nAngle10, const Color& rFillColor ); + bool Rotate( long nAngle10, const Color& rFillColor ); /** Replace all pixel having the search color with the specified color @@ -300,7 +300,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); + bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -320,7 +320,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Replace( const Color* pSearchColors, const Color* pReplaceColors, + bool Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, const sal_uLong* pTols = NULL ); /** Change various global color characteristics @@ -350,13 +350,13 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Adjust( short nLuminancePercent = 0, + bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - sal_Bool bInvert = sal_False ); + bool bInvert = false ); /** Apply specified filter to the bitmap @@ -371,7 +371,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Filter( BmpFilter eFilter, + bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index f4cf36c978f0..a233e9624820 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -88,12 +88,12 @@ protected: ColorMask maColorMask; FncGetPixel mFncGetPixel; FncSetPixel mFncSetPixel; - sal_Bool mbModify; + bool mbModify; SAL_DLLPRIVATE void ImplCreate( Bitmap& rBitmap ); SAL_DLLPRIVATE void ImplDestroy(); -SAL_DLLPRIVATE sal_Bool ImplSetAccessPointers( sal_uLong nFormat ); +SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat ); public: @@ -117,21 +117,21 @@ SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const { return mpBuffer; } DECL_FORMAT( _32BIT_TC_RGBA ) DECL_FORMAT( _32BIT_TC_MASK ) protected: - BitmapReadAccess( Bitmap& rBitmap, sal_Bool bModify ); + BitmapReadAccess( Bitmap& rBitmap, bool bModify ); public: BitmapReadAccess( Bitmap& rBitmap ); virtual ~BitmapReadAccess(); - inline sal_Bool operator!() const; + inline bool operator!() const; inline long Width() const; inline long Height() const; inline Point TopLeft() const; inline Point BottomRight() const; - inline sal_Bool IsTopDown() const; - inline sal_Bool IsBottomUp() const; + inline bool IsTopDown() const; + inline bool IsBottomUp() const; inline sal_uLong GetScanlineFormat() const; inline sal_uLong GetScanlineSize() const; @@ -142,14 +142,14 @@ public: inline Scanline GetBuffer() const; inline Scanline GetScanline( long nY ) const; - inline sal_Bool HasPalette() const; + inline bool HasPalette() const; inline const BitmapPalette& GetPalette() const; inline sal_uInt16 GetPaletteEntryCount() const; inline const BitmapColor& GetPaletteColor( sal_uInt16 nColor ) const; inline const BitmapColor& GetBestPaletteColor( const BitmapColor& rBitmapColor ) const; sal_uInt16 GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const; - inline sal_Bool HasColorMask() const; + inline bool HasColorMask() const; inline ColorMask& GetColorMask() const; inline BitmapColor GetPixelFromData( const sal_uInt8* pData, long nX ) const; @@ -216,7 +216,7 @@ private: // - Inlines - // ----------- -inline sal_Bool BitmapReadAccess::operator!() const +inline bool BitmapReadAccess::operator!() const { return( mpBuffer == NULL ); } @@ -251,7 +251,7 @@ inline Point BitmapReadAccess::BottomRight() const // ------------------------------------------------------------------ -inline sal_Bool BitmapReadAccess::IsTopDown() const +inline bool BitmapReadAccess::IsTopDown() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer ? sal::static_int_cast<sal_Bool>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : sal_False ); @@ -259,7 +259,7 @@ inline sal_Bool BitmapReadAccess::IsTopDown() const // ------------------------------------------------------------------ -inline sal_Bool BitmapReadAccess::IsBottomUp() const +inline bool BitmapReadAccess::IsBottomUp() const { return !IsTopDown(); } @@ -317,7 +317,7 @@ inline Scanline BitmapReadAccess::GetScanline( long nY ) const // ------------------------------------------------------------------ -inline sal_Bool BitmapReadAccess::HasPalette() const +inline bool BitmapReadAccess::HasPalette() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer && !!mpBuffer->maPalette ); @@ -357,7 +357,7 @@ inline const BitmapColor& BitmapReadAccess::GetBestPaletteColor( const BitmapCol // ------------------------------------------------------------------ -inline sal_Bool BitmapReadAccess::HasColorMask() const +inline bool BitmapReadAccess::HasColorMask() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); const sal_uLong nFormat = BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 0239157302c2..4575cee5e803 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -44,7 +44,7 @@ private: long mnButtonSize; sal_uInt16 mnCurButtonId; sal_uInt16 mnFocusButtonId; - sal_Bool mbFormat; + bool mbFormat; Link maClickHdl; SAL_DLLPRIVATE void ImplInitButtonDialogData(); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 863d25f88e57..6c3fe18e8585 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -52,7 +52,7 @@ public: SAL_DLLPRIVATE sal_uInt16& ImplGetButtonState(); SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( OUString& rText, WinBits nWinStyle, sal_uLong nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, Size& rSize, - sal_Bool bLayout, sal_uLong nImageSep, sal_uLong nDrawFlags, + bool bLayout, sal_uLong nImageSep, sal_uLong nDrawFlags, sal_uInt16 nTextStyle, Rectangle *pSymbolRect=NULL, bool bAddImageSep = false ); SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle &rFocusRect ); SAL_DLLPRIVATE const Rectangle& ImplGetFocusRect() const; @@ -74,14 +74,14 @@ public: static OUString GetStandardText( StandardButtonType eButton ); - sal_Bool SetModeImage( const Image& rImage ); + bool SetModeImage( const Image& rImage ); const Image GetModeImage( ) const; - sal_Bool HasImage() const; + bool HasImage() const; void SetImageAlign( ImageAlign eAlign ); ImageAlign GetImageAlign() const; - void EnableImageDisplay( sal_Bool bEnable ); - void EnableTextDisplay( sal_Bool bEnable ); + void EnableImageDisplay( bool bEnable ); + void EnableTextDisplay( bool bEnable ); void SetFocusRect( const Rectangle& rFocusRect ); bool IsSmallSymbol() const; @@ -107,20 +107,20 @@ protected: TriState meState; TriState meSaveValue; sal_uInt16 mnDDStyle; - sal_Bool mbPressed; - sal_Bool mbInUserDraw; + bool mbPressed; + bool mbInUserDraw; Link maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); SAL_DLLPRIVATE void ImplDrawPushButton( bool bLayout = false ); using Button::ImplGetTextStyle; SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uLong nDrawFlags ) const; - SAL_DLLPRIVATE sal_Bool IsSymbol() const { return ( (meSymbol != SYMBOL_NOSYMBOL) && (meSymbol != SYMBOL_IMAGE) ); } - SAL_DLLPRIVATE sal_Bool IsImage() const { return Button::HasImage(); } + SAL_DLLPRIVATE bool IsSymbol() const { return ( (meSymbol != SYMBOL_NOSYMBOL) && (meSymbol != SYMBOL_IMAGE) ); } + SAL_DLLPRIVATE bool IsImage() const { return Button::HasImage(); } // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE PushButton( const PushButton & ); @@ -131,10 +131,10 @@ protected: using Control::ImplInitSettings; using Window::ImplInit; public: - SAL_DLLPRIVATE void ImplSetDefButton( sal_Bool bSet ); + SAL_DLLPRIVATE void ImplSetDefButton( bool bSet ); SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); - SAL_DLLPRIVATE static sal_Bool ImplHitTestPushButton( Window* pDev, const Point& rPos ); - SAL_DLLPRIVATE sal_Bool ImplIsDefButton() const; + SAL_DLLPRIVATE static bool ImplHitTestPushButton( Window* pDev, const Point& rPos ); + SAL_DLLPRIVATE bool ImplIsDefButton() const; protected: explicit PushButton( WindowType nType ); @@ -175,11 +175,11 @@ public: void SetState( TriState eState ); TriState GetState() const { return meState; } - void Check( sal_Bool bCheck = sal_True ); - sal_Bool IsChecked() const; + void Check( bool bCheck = true ); + bool IsChecked() const; - void SetPressed( sal_Bool bPressed ); - sal_Bool IsPressed() const { return mbPressed; } + void SetPressed( bool bPressed ); + bool IsPressed() const { return mbPressed; } void EndSelection(); @@ -194,12 +194,12 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue); }; -inline void PushButton::Check( sal_Bool bCheck ) +inline void PushButton::Check( bool bCheck ) { SetState( (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } -inline sal_Bool PushButton::IsChecked() const +inline bool PushButton::IsChecked() const { return (GetState() == STATE_CHECK); } @@ -288,10 +288,10 @@ private: Rectangle maStateRect; Rectangle maMouseRect; Image maImage; - sal_Bool mbChecked; - sal_Bool mbSaveValue; - sal_Bool mbRadioCheck; - sal_Bool mbStateChanged; + bool mbChecked; + bool mbSaveValue; + bool mbRadioCheck; + bool mbStateChanged; Link maToggleHdl; // when mbLegacyNoTextAlign is set then the old behaviour where // the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement @@ -300,7 +300,7 @@ private: bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitRadioButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, @@ -323,7 +323,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - SAL_DLLPRIVATE void ImplCallClick( sal_Bool bGrabFocus = sal_False, sal_uInt16 nFocusFlags = 0 ); + SAL_DLLPRIVATE void ImplCallClick( bool bGrabFocus = false, sal_uInt16 nFocusFlags = 0 ); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: @@ -362,20 +362,20 @@ public: virtual void Toggle(); - sal_Bool IsStateChanged() const { return mbStateChanged; } + bool IsStateChanged() const { return mbStateChanged; } - void EnableRadioCheck( sal_Bool bRadioCheck = sal_True ) { mbRadioCheck = bRadioCheck; } - sal_Bool IsRadioCheckEnabled() const { return mbRadioCheck; } + void EnableRadioCheck( bool bRadioCheck = true ) { mbRadioCheck = bRadioCheck; } + bool IsRadioCheckEnabled() const { return mbRadioCheck; } - sal_Bool SetModeRadioImage( const Image& rImage ); + bool SetModeRadioImage( const Image& rImage ); const Image& GetModeRadioImage( ) const; - void SetState( sal_Bool bCheck ); - void Check( sal_Bool bCheck = sal_True ); - sal_Bool IsChecked() const { return mbChecked; } + void SetState( bool bCheck ); + void Check( bool bCheck = true ); + bool IsChecked() const { return mbChecked; } void SaveValue() { mbSaveValue = IsChecked(); } - sal_Bool GetSavedValue() const { return mbSaveValue; } + bool GetSavedValue() const { return mbSaveValue; } static Image GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlags ); @@ -419,7 +419,7 @@ private: Rectangle maMouseRect; TriState meState; TriState meSaveValue; - sal_Bool mbTriState; + bool mbTriState; Link maToggleHdl; // when mbLegacyNoTextAlign is set then the old behaviour where // the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement @@ -428,7 +428,7 @@ private: bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitCheckBoxData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplInvalidateOrDrawCheckBoxState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, @@ -480,11 +480,11 @@ public: void SetState( TriState eState ); TriState GetState() const { return meState; } - void Check( sal_Bool bCheck = sal_True ); + void Check( bool bCheck = true ); bool IsChecked() const; - void EnableTriState( sal_Bool bTriState = sal_True ); - sal_Bool IsTriStateEnabled() const { return mbTriState; } + void EnableTriState( bool bTriState = true ); + bool IsTriStateEnabled() const { return mbTriState; } void SaveValue() { meSaveValue = GetState(); } TriState GetSavedValue() const { return meSaveValue; } @@ -502,7 +502,7 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue); }; -inline void CheckBox::Check( sal_Bool bCheck ) +inline void CheckBox::Check( bool bCheck ) { SetState( (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index fd49eaab8ad6..86b37ee4a72a 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -44,9 +44,9 @@ private: ImplListBoxFloatingWindow* mpFloatWin; sal_uInt16 mnDDHeight; sal_Unicode mcMultiSep; - sal_Bool mbDDAutoSize : 1; - sal_Bool mbSyntheticModify : 1; - sal_Bool mbMatchCase : 1; + bool mbDDAutoSize : 1; + bool mbSyntheticModify : 1; + bool mbMatchCase : 1; sal_Int32 m_nMaxWidthChars; Link maSelectHdl; Link maDoubleClickHdl; @@ -86,7 +86,7 @@ protected: protected: explicit ComboBox( WindowType nType ); - sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } + bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } virtual void FillLayoutData() const; public: @@ -122,9 +122,9 @@ public: sal_uInt16 GetDropDownLineCount() const; void EnableAutoSize( bool bAuto ); - sal_Bool IsAutoSizeEnabled() const { return mbDDAutoSize; } + bool IsAutoSizeEnabled() const { return mbDDAutoSize; } - void EnableDDAutoWidth( sal_Bool b ); + void EnableDDAutoWidth( bool b ); virtual void SetText( const OUString& rStr ); virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); @@ -142,25 +142,25 @@ public: OUString GetEntry( sal_uInt16 nPos ) const; sal_uInt16 GetEntryCount() const; - sal_Bool IsTravelSelect() const; - sal_Bool IsInDropDown() const; + bool IsTravelSelect() const; + bool IsInDropDown() const; void ToggleDropDown(); long CalcWindowSizePixel( sal_uInt16 nLines ) const; void SetUserItemSize( const Size& rSz ); - void EnableUserDraw( sal_Bool bUserDraw ); + void EnableUserDraw( bool bUserDraw ); - void DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False ); + void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); void SetBorderStyle( sal_uInt16 nBorderStyle ); void SetSeparatorPos( sal_uInt16 n = LISTBOX_ENTRY_NOTFOUND ); - void EnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase = sal_False ); - sal_Bool IsAutocompleteEnabled() const; + void EnableAutocomplete( bool bEnable, bool bMatchCase = false ); + bool IsAutocompleteEnabled() const; - void EnableMultiSelection( sal_Bool bMulti ); - sal_Bool IsMultiSelectionEnabled() const; + void EnableMultiSelection( bool bMulti ); + bool IsMultiSelectionEnabled() const; void SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; } sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; } @@ -191,8 +191,8 @@ public: sal_uInt16 GetSelectEntryCount() const; sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const; - sal_Bool IsEntryPosSelected( sal_uInt16 nPos ) const; - void SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ); + bool IsEntryPosSelected( sal_uInt16 nPos ) const; + void SelectEntryPos( sal_uInt16 nPos, bool bSelect = true ); void SetNoSelection(); Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index fb29c7168889..8b3bc14d27df 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -79,7 +79,7 @@ protected: @return if the Control instance has been destroyed in any of the call */ - sal_Bool ImplCallEventListenersAndHandler( + bool ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& rHandler, void* pCaller ); @@ -100,7 +100,7 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; - void ImplInitSettings( const sal_Bool _bFont, const sal_Bool _bForeground ); + void ImplInitSettings( const bool _bFont, const bool _bForeground ); public: SAL_DLLPRIVATE void ImplClearLayoutData() const; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 04279b6fb1b0..59a886227526 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -47,10 +47,10 @@ private: Dialog* mpPrevExecuteDlg; DialogImpl* mpDialogImpl; long mnMousePositioned; - sal_Bool mbInExecute; - sal_Bool mbOldSaveBack; - sal_Bool mbInClose; - sal_Bool mbModalMode; + bool mbInExecute; + bool mbOldSaveBack; + bool mbInClose; + bool mbModalMode; bool mbIsDefferedInit; bool mbIsCalculatingInitialLayoutSize; Timer maLayoutTimer; @@ -75,7 +75,7 @@ protected: SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox); public: - SAL_DLLPRIVATE sal_Bool IsInClose() const { return mbInClose; } + SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); } SAL_DLLPRIVATE void doDeferredInit(bool bResizable); SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } @@ -109,10 +109,10 @@ public: VclButtonBox* get_action_area(); VclBox* get_content_area(); - virtual sal_Bool Close(); + virtual bool Close(); virtual short Execute(); - sal_Bool IsInExecute() const { return mbInExecute; } + bool IsInExecute() const { return mbInExecute; } virtual void SetText( const OUString& rStr ); virtual OUString GetText() const; @@ -124,7 +124,7 @@ public: virtual void StartExecuteModal( const Link& rEndDialogHdl ); long GetResult() const; private: - sal_Bool ImplStartExecuteModal(); + bool ImplStartExecuteModal(); void ImplEndExecuteModal(); public: @@ -137,9 +137,9 @@ public: void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - void SetModalInputMode( sal_Bool bModal ); - void SetModalInputMode( sal_Bool bModal, sal_Bool bSubModalDialogs ); - sal_Bool IsModalInputMode() const { return mbModalMode; } + void SetModalInputMode( bool bModal ); + void SetModalInputMode( bool bModal, bool bSubModalDialogs ); + bool IsModalInputMode() const { return mbModalMode; } void GrabFocusToFirstControl(); }; @@ -172,7 +172,7 @@ public: protected: using Window::Show; - void Show( sal_Bool bVisible = sal_True ); + void Show( bool bVisible = true ); using Window::Hide; void Hide(); diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 3ba3f8077bb1..6d88ca02d06f 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -41,7 +41,7 @@ public: void SetAlign( WindowAlign eNewAlign ); WindowAlign GetAlign() const; - sal_Bool IsHorizontal() const; + bool IsHorizontal() const; virtual void Paint( const Rectangle& rRect ); virtual void Resize(); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 9d9c6f4d385a..f1f3fbd5e2f4 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -30,24 +30,24 @@ struct DockingData { Point maMousePos; // in Rectangle maTrackRect; // in/out - sal_Bool mbFloating; // out - sal_Bool mbLivemode; // in - sal_Bool mbInteractive; // in + bool mbFloating; // out + bool mbLivemode; // in + bool mbInteractive; // in DockingData() {}; - DockingData( const Point& rPt, const Rectangle& rRect, sal_Bool b) : - maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ), mbLivemode( sal_False ), mbInteractive( sal_True ) + DockingData( const Point& rPt, const Rectangle& rRect, bool b) : + maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ), mbLivemode( false ), mbInteractive( true ) {}; }; struct EndDockingData { Rectangle maWindowRect; // in - sal_Bool mbFloating; // in - sal_Bool mbCancelled; // in + bool mbFloating; // in + bool mbCancelled; // in EndDockingData() {}; - EndDockingData( const Rectangle& rRect, sal_Bool b, sal_Bool bCancelled ) : + EndDockingData( const Rectangle& rRect, bool b, bool bCancelled ) : maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled ) {}; }; @@ -55,10 +55,10 @@ struct EndDockingData struct EndPopupModeData { Point maFloatingPos; // in - sal_Bool mbTearoff; // in + bool mbTearoff; // in EndPopupModeData() {}; - EndPopupModeData( const Point& rPos, sal_Bool bTearoff ) : + EndPopupModeData( const Point& rPos, bool bTearoff ) : maFloatingPos( rPos ), mbTearoff( bTearoff ) {}; }; @@ -102,7 +102,7 @@ private: sal_Int32 mnDockRight; sal_Int32 mnDockBottom; WinBits mnFloatBits; - sal_Bool mbDockCanceled:1, + bool mbDockCanceled:1, mbFloatPrevented:1, mbDockable:1, mbDocking:1, @@ -120,21 +120,21 @@ private: void ImplInitData(); DECL_LINK( PopupModeEnd, void* ); - void ImplEnableStartDocking( sal_Bool bEnable = sal_True ) { mbStartDockingEnabled = bEnable; } - sal_Bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } + void ImplEnableStartDocking( bool bEnable = true ) { mbStartDockingEnabled = bEnable; } + bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } public: ImplDockingWindowWrapper( const Window *pWindow ); virtual ~ImplDockingWindowWrapper(); Window* GetWindow() { return mpDockingWindow; } - sal_Bool ImplStartDocking( const Point& rPos ); + bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers void StartDocking( const Point& rPos, Rectangle& rRect ); - sal_Bool Docking( const Point& rPos, Rectangle& rRect ); - void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); - sal_Bool PrepareToggleFloatingMode(); + bool Docking( const Point& rPos, Rectangle& rRect ); + void EndDocking( const Rectangle& rRect, bool bFloatMode ); + bool PrepareToggleFloatingMode(); void ToggleFloatingMode(); void SetDragArea( const Rectangle& rRect ); @@ -142,33 +142,33 @@ public: void Lock(); void Unlock(); - sal_Bool IsLocked() const; + bool IsLocked() const; void StartPopupMode( ToolBox* pParentToolBox, sal_uLong nPopupModeFlags ); - sal_Bool IsInPopupMode() const; + bool IsInPopupMode() const; void TitleButtonClick( sal_uInt16 nButton ); void Pin(); void Roll(); void PopupModeEnd(); void Resizing( Size& rSize ); - sal_Bool Close(); + bool Close(); void Tracking( const TrackingEvent& rTEvt ); long Notify( NotifyEvent& rNEvt ); - void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); + void ShowTitleButton( sal_uInt16 nButton, bool bVisible = true ); void SetMinOutputSizePixel( const Size& rSize ); void SetMaxOutputSizePixel( const Size& rSize ); - sal_Bool IsDocking() const { return mbDocking; } - sal_Bool IsDockable() const { return mbDockable; } - sal_Bool IsDockingCanceled() const { return mbDockCanceled; } - sal_Bool IsFloatingPrevented() const { return mbFloatPrevented; } + bool IsDocking() const { return mbDocking; } + bool IsDockable() const { return mbDockable; } + bool IsDockingCanceled() const { return mbDockCanceled; } + bool IsFloatingPrevented() const { return mbFloatPrevented; } - void SetFloatingMode( sal_Bool bFloatMode = sal_False ); - sal_Bool IsFloatingMode() const; + void SetFloatingMode( bool bFloatMode = false ); + bool IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } void SetFloatStyle( WinBits nWinStyle ); @@ -197,19 +197,19 @@ public: void RemoveWindow( const Window *pWin ); ImplDockingWindowWrapper* GetDockingWindowWrapper( const Window *pWin ); - sal_Bool IsDockable( const Window *pWin ); + bool IsDockable( const Window *pWin ); - sal_Bool IsFloating( const Window *pWin ); - void SetFloatingMode( const Window *pWin, sal_Bool bFloating ); + bool IsFloating( const Window *pWin ); + void SetFloatingMode( const Window *pWin, bool bFloating ); void Lock( const Window *pWin ); void Unlock( const Window *pWin ); - sal_Bool IsLocked( const Window *pWin ); + bool IsLocked( const Window *pWin ); void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin ); void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uLong nPopupModeFlags ); - sal_Bool IsInPopupMode( const Window *pWin ); + bool IsInPopupMode( const Window *pWin ); void EndPopupMode( const Window *pWin ); // required because those methods are not virtual in Window (!!!) and must @@ -246,7 +246,7 @@ private: sal_Int32 mnDockRight; sal_Int32 mnDockBottom; WinBits mnFloatBits; - sal_Bool mbDockCanceled:1, + bool mbDockCanceled:1, mbDockPrevented:1, mbFloatPrevented:1, mbDockable:1, @@ -273,7 +273,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - SAL_DLLPRIVATE sal_Bool ImplStartDocking( const Point& rPos ); + SAL_DLLPRIVATE bool ImplStartDocking( const Point& rPos ); protected: DockingWindow( WindowType nType ); @@ -284,9 +284,9 @@ public: ~DockingWindow(); virtual void StartDocking(); - virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + virtual bool Docking( const Point& rPos, Rectangle& rRect ); virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); - virtual sal_Bool PrepareToggleFloatingMode(); + virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); virtual void TitleButtonClick( sal_uInt16 nButton ); @@ -294,18 +294,18 @@ public: virtual void Roll(); virtual void PopupModeEnd(); virtual void Resizing( Size& rSize ); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetPin( sal_Bool bPin ); - sal_Bool IsPined() const; + void SetPin( bool bPin ); + bool IsPined() const; void RollUp(); void RollDown(); - sal_Bool IsRollUp() const; + bool IsRollUp() const; void SetRollUpOutputSizePixel( const Size& rSize ); Size GetRollUpOutputSizePixel() const; @@ -315,14 +315,14 @@ public: void SetMaxOutputSizePixel( const Size& rSize ); - sal_Bool IsDocking() const { return mbDocking; } - sal_Bool IsDockable() const { return mbDockable; } - sal_Bool IsDockingCanceled() const { return mbDockCanceled; } - sal_Bool IsDockingPrevented() const { return mbDockPrevented; } - sal_Bool IsFloatingPrevented() const { return mbFloatPrevented; } + bool IsDocking() const { return mbDocking; } + bool IsDockable() const { return mbDockable; } + bool IsDockingCanceled() const { return mbDockCanceled; } + bool IsDockingPrevented() const { return mbDockPrevented; } + bool IsFloatingPrevented() const { return mbFloatPrevented; } - void SetFloatingMode( sal_Bool bFloatMode = sal_False ); - sal_Bool IsFloatingMode() const; + void SetFloatingMode( bool bFloatMode = false ); + bool IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } void SetFloatingPos( const Point& rNewPos ); @@ -343,14 +343,14 @@ public: Size GetOutputSizePixel() const; }; -inline void DockingWindow::SetPin( sal_Bool bPin ) +inline void DockingWindow::SetPin( bool bPin ) { if ( mpFloatWin ) mpFloatWin->SetPin( bPin ); mbPined = bPin; } -inline sal_Bool DockingWindow::IsPined() const +inline bool DockingWindow::IsPined() const { if ( mpFloatWin ) return mpFloatWin->IsPined(); @@ -361,17 +361,17 @@ inline void DockingWindow::RollUp() { if ( mpFloatWin ) mpFloatWin->RollUp(); - mbRollUp = sal_True; + mbRollUp = true; } inline void DockingWindow::RollDown() { if ( mpFloatWin ) mpFloatWin->RollDown(); - mbRollUp = sal_False; + mbRollUp = false; } -inline sal_Bool DockingWindow::IsRollUp() const +inline bool DockingWindow::IsRollUp() const { if ( mpFloatWin ) return mpFloatWin->IsRollUp(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 4d6566acdf1f..927db6b3dcfd 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -74,7 +74,7 @@ private: sal_Int32 mnMaxWidthChars; AutocompleteAction meAutocompleteAction; sal_Unicode mcEchoChar; - sal_Bool mbModified:1, + bool mbModified:1, mbInternModified:1, mbReadOnly:1, mbInsertMode:1, @@ -98,18 +98,18 @@ private: SAL_DLLPRIVATE void ImplInvalidateOrRepaint(); SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection = 0 ); - SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = 0, sal_Bool bIsUserInput = sal_False ); + SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = 0, bool bIsUserInput = false ); SAL_DLLPRIVATE OUString ImplGetValidString( const OUString& rString ) const; SAL_DLLPRIVATE void ImplClearBackground( long nXStart, long nXEnd ); SAL_DLLPRIVATE void ImplPaintBorder( long nXStart, long nXEnd ); - SAL_DLLPRIVATE void ImplShowCursor( sal_Bool bOnlyIfVisible = sal_True ); + SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true ); SAL_DLLPRIVATE void ImplAlign(); SAL_DLLPRIVATE void ImplAlignAndPaint(); SAL_DLLPRIVATE sal_Int32 ImplGetCharPos( const Point& rWindowPos ) const; - SAL_DLLPRIVATE void ImplSetCursorPos( sal_Int32 nChar, sal_Bool bSelect ); + SAL_DLLPRIVATE void ImplSetCursorPos( sal_Int32 nChar, bool bSelect ); SAL_DLLPRIVATE void ImplShowDDCursor(); SAL_DLLPRIVATE void ImplHideDDCursor(); - SAL_DLLPRIVATE sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvt ); + SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvt ); SAL_DLLPRIVATE void ImplCopyToSelectionClipboard(); SAL_DLLPRIVATE void ImplCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard ); SAL_DLLPRIVATE void ImplPaste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard ); @@ -122,9 +122,9 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, sal_Bool bPaint = sal_True ); + SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true ); SAL_DLLPRIVATE int ImplGetNativeControlType() const; SAL_DLLPRIVATE long ImplGetExtraOffset() const; static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin ); @@ -171,7 +171,7 @@ public: virtual void Modify(); virtual void UpdateData(); - static sal_Bool IsCharInput( const KeyEvent& rKEvt ); + static bool IsCharInput( const KeyEvent& rKEvt ); virtual void SetModifyFlag(); virtual void ClearModifyFlag(); @@ -184,10 +184,10 @@ public: sal_Unicode GetEchoChar() const { return mcEchoChar; } virtual void SetReadOnly( sal_Bool bReadOnly = sal_True ); - virtual sal_Bool IsReadOnly() const { return mbReadOnly; } + virtual bool IsReadOnly() const { return mbReadOnly; } - void SetInsertMode( sal_Bool bInsert ); - sal_Bool IsInsertMode() const; + void SetInsertMode( bool bInsert ); + bool IsInsertMode() const; virtual void SetMaxTextLen( sal_Int32 nMaxLen = EDIT_NOLIMIT ); virtual sal_Int32 GetMaxTextLen() const { return mnMaxTextLen; } diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 1453ce4a9f6f..bdb983d19853 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -130,33 +130,33 @@ public: sal_uInt16 GetClicks() const { return mnClicks; } - sal_Bool IsEnterWindow() const + bool IsEnterWindow() const { return ((mnMode & MOUSE_ENTERWINDOW) != 0); } - sal_Bool IsLeaveWindow() const + bool IsLeaveWindow() const { return ((mnMode & MOUSE_LEAVEWINDOW) != 0); } - sal_Bool IsSynthetic() const + bool IsSynthetic() const { return ((mnMode & MOUSE_SYNTHETIC) != 0); } - sal_Bool IsModifierChanged() const + bool IsModifierChanged() const { return ((mnMode & MOUSE_MODIFIERCHANGED) != 0); } sal_uInt16 GetButtons() const { return (mnCode & (MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT)); } - sal_Bool IsLeft() const + bool IsLeft() const { return ((mnCode & MOUSE_LEFT) != 0); } - sal_Bool IsMiddle() const + bool IsMiddle() const { return ((mnCode & MOUSE_MIDDLE) != 0); } - sal_Bool IsRight() const + bool IsRight() const { return ((mnCode & MOUSE_RIGHT) != 0); } sal_uInt16 GetModifier() const { return (mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)); } bool IsShift() const { return ((mnCode & KEY_SHIFT) != 0); } - sal_Bool IsMod1() const + bool IsMod1() const { return ((mnCode & KEY_MOD1) != 0); } - sal_Bool IsMod2() const + bool IsMod2() const { return ((mnCode & KEY_MOD2) != 0); } - sal_Bool IsMod3() const + bool IsMod3() const { return ((mnCode & KEY_MOD3) != 0); } }; @@ -251,7 +251,7 @@ class VCL_DLLPUBLIC HelpEvent private: Point maPos; sal_uInt16 mnMode; - sal_Bool mbKeyboardActivated; + bool mbKeyboardActivated; public: explicit HelpEvent(); @@ -260,27 +260,27 @@ public: const Point& GetMousePosPixel() const; sal_uInt16 GetMode() const { return mnMode; } - sal_Bool KeyboardActivated() const { return mbKeyboardActivated; } - void SetKeyboardActivated( sal_Bool bKeyboard ) { mbKeyboardActivated = bKeyboard; } + bool KeyboardActivated() const { return mbKeyboardActivated; } + void SetKeyboardActivated( bool bKeyboard ) { mbKeyboardActivated = bKeyboard; } }; inline HelpEvent::HelpEvent() { mnMode = HELPMODE_CONTEXT; - mbKeyboardActivated = sal_True; + mbKeyboardActivated = true; } inline HelpEvent::HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode ) : maPos( rMousePos ) { mnMode = nHelpMode; - mbKeyboardActivated = sal_False; + mbKeyboardActivated = false; } inline HelpEvent::HelpEvent( sal_uInt16 nHelpMode ) { mnMode = nHelpMode; - mbKeyboardActivated = sal_True; + mbKeyboardActivated = true; } // ----------------- @@ -353,12 +353,12 @@ public: const MouseEvent& GetMouseEvent() const { return maMEvt; } - sal_Bool IsTrackingRepeat() const + bool IsTrackingRepeat() const { return ((mnFlags & TRACKING_REPEAT) != 0); } - sal_Bool IsTrackingEnded() const + bool IsTrackingEnded() const { return ((mnFlags & ENDTRACK_END) != 0); } - sal_Bool IsTrackingCanceled() const + bool IsTrackingCanceled() const { return ((mnFlags & ENDTRACK_CANCEL) != 0); } sal_uInt16 GetTrackingFlags() const { return mnFlags; } }; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index db6f8589fe3d..01f6c2f8d4fa 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -44,20 +44,20 @@ private: Edit* mpField; LocaleDataWrapper* mpLocaleDataWrapper; Link maErrorLink; - sal_Bool mbReformat; - sal_Bool mbStrictFormat; - sal_Bool mbEmptyFieldValue; - sal_Bool mbEmptyFieldValueEnabled; - sal_Bool mbDefaultLocale; + bool mbReformat; + bool mbStrictFormat; + bool mbEmptyFieldValue; + bool mbEmptyFieldValueEnabled; + bool mbDefaultLocale; protected: SAL_DLLPRIVATE void ImplSetText( const OUString& rText, Selection* pNewSel = NULL ); - SAL_DLLPRIVATE sal_Bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; } + SAL_DLLPRIVATE bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; } - void SetEmptyFieldValueData( sal_Bool bValue ) { mbEmptyFieldValue = bValue; } + void SetEmptyFieldValueData( bool bValue ) { mbEmptyFieldValue = bValue; } SAL_DLLPRIVATE LocaleDataWrapper& ImplGetLocaleDataWrapper() const; - sal_Bool IsDefaultLocale() const { return mbDefaultLocale; } + bool IsDefaultLocale() const { return mbDefaultLocale; } public: explicit FormatterBase( Edit* pField = NULL ); @@ -68,11 +68,11 @@ public: void SetField( Edit* pField ) { mpField = pField; } Edit* GetField() const { return mpField; } - sal_Bool MustBeReformatted() const { return mbReformat; } - void MarkToBeReformatted( sal_Bool b ) { mbReformat = b; } + bool MustBeReformatted() const { return mbReformat; } + void MarkToBeReformatted( bool b ) { mbReformat = b; } - void SetStrictFormat( sal_Bool bStrict ); - sal_Bool IsStrictFormat() const { return mbStrictFormat; } + void SetStrictFormat( bool bStrict ); + bool IsStrictFormat() const { return mbStrictFormat; } virtual void Reformat(); virtual void ReformatAll(); @@ -87,10 +87,10 @@ public: const Link& GetErrorHdl() const { return maErrorLink; } void SetEmptyFieldValue(); - sal_Bool IsEmptyFieldValue() const; + bool IsEmptyFieldValue() const; - void EnableEmptyFieldValue( sal_Bool bEnable ) { mbEmptyFieldValueEnabled = bEnable; } - sal_Bool IsEmptyFieldValueEnabled() const { return mbEmptyFieldValueEnabled; } + void EnableEmptyFieldValue( bool bEnable ) { mbEmptyFieldValueEnabled = bEnable; } + bool IsEmptyFieldValueEnabled() const { return mbEmptyFieldValueEnabled; } }; @@ -108,7 +108,7 @@ private: OUString maLiteralMask; sal_uInt16 mnFormatFlags; bool mbSameMask; - sal_Bool mbInPattKeyInput; + bool mbInPattKeyInput; protected: PatternFormatter(); @@ -116,7 +116,7 @@ protected: SAL_DLLPRIVATE void ImplSetMask(const OString& rEditMask, const OUString& rLiteralMask); SAL_DLLPRIVATE bool ImplIsSameMask() const { return mbSameMask; } - SAL_DLLPRIVATE sal_Bool& ImplGetInPattKeyInput() { return mbInPattKeyInput; } + SAL_DLLPRIVATE bool& ImplGetInPattKeyInput() { return mbInPattKeyInput; } public: virtual ~PatternFormatter(); @@ -132,7 +132,7 @@ public: void SetString( const OUString& rStr ); OUString GetString() const; - sal_Bool IsStringModified() const { return !(GetString() == maFieldString ); } + bool IsStringModified() const { return !(GetString() == maFieldString ); } }; // -------------------- @@ -152,8 +152,8 @@ protected: sal_Int64 mnCorrectedValue; sal_uInt16 mnType; sal_uInt16 mnDecimalDigits; - sal_Bool mbThousandSep; - sal_Bool mbShowTrailingZeros; + bool mbThousandSep; + bool mbShowTrailingZeros; // the members below are used in all derivatives of NumericFormatter // not in NumericFormatter itself. @@ -170,7 +170,7 @@ protected: void FieldLast(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE sal_Bool ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, OUString& rOutStr ); + SAL_DLLPRIVATE bool ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, OUString& rOutStr ); SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue ); SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection* pNewSelection = NULL ); @@ -194,18 +194,18 @@ public: void SetDecimalDigits( sal_uInt16 nDigits ); sal_uInt16 GetDecimalDigits() const; - void SetUseThousandSep( sal_Bool b ); - sal_Bool IsUseThousandSep() const { return mbThousandSep; } + void SetUseThousandSep( bool b ); + bool IsUseThousandSep() const { return mbThousandSep; } - void SetShowTrailingZeros( sal_Bool bShowTrailingZeros ); - sal_Bool IsShowTrailingZeros() const { return mbShowTrailingZeros; } + void SetShowTrailingZeros( bool bShowTrailingZeros ); + bool IsShowTrailingZeros() const { return mbShowTrailingZeros; } void SetUserValue( sal_Int64 nNewValue ); virtual void SetValue( sal_Int64 nNewValue ); virtual sal_Int64 GetValue() const; virtual OUString CreateFieldText( sal_Int64 nValue ) const; - sal_Bool IsValueModified() const; + bool IsValueModified() const; sal_Int64 GetCorrectedValue() const { return mnCorrectedValue; } sal_Int64 Normalize( sal_Int64 nValue ) const; @@ -232,7 +232,7 @@ protected: MetricFormatter(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE sal_Bool ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ); + SAL_DLLPRIVATE bool ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ); public: virtual ~MetricFormatter(); @@ -283,7 +283,7 @@ private: protected: CurrencyFormatter(); - SAL_DLLPRIVATE sal_Bool ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr ); + SAL_DLLPRIVATE bool ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr ); public: virtual ~CurrencyFormatter(); @@ -311,11 +311,11 @@ private: Date maMin; Date maMax; Date maCorrectedDate; - sal_Bool mbLongFormat; - sal_Bool mbShowDateCentury; + bool mbLongFormat; + bool mbShowDateCentury; sal_uInt16 mnDateFormat; sal_uLong mnExtDateFormat; - sal_Bool mbEnforceValidValue; + bool mbEnforceValidValue; SAL_DLLPRIVATE void ImplInit(); @@ -324,7 +324,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE const Date& ImplGetFieldDate() const { return maFieldDate; } - SAL_DLLPRIVATE sal_Bool ImplDateReformat( const OUString& rStr, OUString& rOutStr, + SAL_DLLPRIVATE bool ImplDateReformat( const OUString& rStr, OUString& rOutStr, const AllSettings& rSettings ); SAL_DLLPRIVATE void ImplSetUserDate( const Date& rNewDate, Selection* pNewSelection = NULL ); @@ -333,7 +333,7 @@ protected: SAL_DLLPRIVATE void ImplNewFieldValue( const Date& rDate ); CalendarWrapper& GetCalendarWrapper() const; - SAL_DLLPRIVATE sal_Bool ImplAllowMalformedInput() const; + SAL_DLLPRIVATE bool ImplAllowMalformedInput() const; public: virtual ~DateFormatter(); @@ -345,7 +345,7 @@ public: void SetExtDateFormat( ExtDateFieldFormat eFormat ); - ExtDateFieldFormat GetExtDateFormat( sal_Bool bResolveSystemFormat = sal_False ) const; + ExtDateFieldFormat GetExtDateFormat( bool bResolveSystemFormat = false ) const; void SetMin( const Date& rNewMin ); const Date& GetMin() const { return maMin; } @@ -358,17 +358,17 @@ public: // MT: Remove these methods too, ExtDateFormat should be enough! // What should happen if using DDMMYYYY, but ShowCentury=sal_False? // -------------------------------------------------------------- - void SetLongFormat( sal_Bool bLong ); - sal_Bool IsLongFormat() const { return mbLongFormat; } - void SetShowDateCentury( sal_Bool bShowCentury ); - sal_Bool IsShowDateCentury() const { return mbShowDateCentury; } + void SetLongFormat( bool bLong ); + bool IsLongFormat() const { return mbLongFormat; } + void SetShowDateCentury( bool bShowCentury ); + bool IsShowDateCentury() const { return mbShowDateCentury; } // -------------------------------------------------------------- void SetDate( const Date& rNewDate ); void SetUserDate( const Date& rNewDate ); Date GetDate() const; void SetEmptyDate(); - sal_Bool IsEmptyDate() const; + bool IsEmptyDate() const; Date GetCorrectedDate() const { return maCorrectedDate; } void ResetLastDate() { maLastDate = Date( 0, 0, 0 ); } @@ -390,8 +390,8 @@ public: In addition, if this is set to false, the text in the field will \em not be corrected when the control loses the focus - instead, the invalid input will be preserved. */ - void EnforceValidValue( sal_Bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } - inline sal_Bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } + void EnforceValidValue( bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } + inline bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } }; @@ -408,8 +408,8 @@ private: Time maCorrectedTime; TimeFieldFormat meFormat; sal_uInt16 mnTimeFormat; - sal_Bool mbDuration; - sal_Bool mbEnforceValidValue; + bool mbDuration; + bool mbEnforceValidValue; SAL_DLLPRIVATE void ImplInit(); @@ -419,10 +419,10 @@ protected: TimeFormatter(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE sal_Bool ImplTimeReformat( const OUString& rStr, OUString& rOutStr ); + SAL_DLLPRIVATE bool ImplTimeReformat( const OUString& rStr, OUString& rOutStr ); SAL_DLLPRIVATE void ImplNewFieldValue( const Time& rTime ); SAL_DLLPRIVATE void ImplSetUserTime( const Time& rNewTime, Selection* pNewSelection = NULL ); - SAL_DLLPRIVATE sal_Bool ImplAllowMalformedInput() const; + SAL_DLLPRIVATE bool ImplAllowMalformedInput() const; public: @@ -447,14 +447,14 @@ public: void SetFormat( TimeFieldFormat eNewFormat ); TimeFieldFormat GetFormat() const { return meFormat; } - void SetDuration( sal_Bool mbDuration ); - sal_Bool IsDuration() const { return mbDuration; } + void SetDuration( bool mbDuration ); + bool IsDuration() const { return mbDuration; } void SetTime( const Time& rNewTime ); void SetUserTime( const Time& rNewTime ); Time GetTime() const; void SetEmptyTime() { FormatterBase::SetEmptyFieldValue(); } - sal_Bool IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); } + bool IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); } Time GetCorrectedTime() const { return maCorrectedTime; } static Time GetInvalidTime() { return Time( 99, 99, 99 ); } @@ -471,8 +471,8 @@ public: In addition, if this is set to false, the text in the field will <em>not</em> be corrected when the control loses the focus - instead, the invalid input will be preserved. */ - void EnforceValidValue( sal_Bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } - inline sal_Bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } + void EnforceValidValue( bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } + inline bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } }; @@ -628,7 +628,7 @@ private: Date maLast; protected: - SAL_DLLPRIVATE void ImplDateSpinArea( sal_Bool bUp ); + SAL_DLLPRIVATE void ImplDateSpinArea( bool bUp ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -664,7 +664,7 @@ private: Time maLast; protected: - SAL_DLLPRIVATE void ImplTimeSpinArea( sal_Bool bUp ); + SAL_DLLPRIVATE void ImplTimeSpinArea( bool bUp ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 629c3c5818ee..8eba420ac504 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -44,7 +44,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout = false ) const; public: @@ -101,7 +101,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); protected: @@ -168,7 +168,7 @@ class VCL_DLLPUBLIC FixedImage : public Control { private: Image maImage; - sal_Bool mbInUserDraw; + bool mbInUserDraw; private: using Control::ImplInitSettings; @@ -198,7 +198,7 @@ public: void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } - sal_Bool SetModeImage( const Image& rImage ); + bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; virtual bool set_property(const OString &rKey, const OString &rValue); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index a3ece25dfe8b..fcc47519a7cb 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -76,14 +76,14 @@ private: sal_uLong mnPopupModeFlags; sal_uInt16 mnTitle; sal_uInt16 mnOldTitle; - sal_Bool mbInPopupMode; - sal_Bool mbPopupMode; - sal_Bool mbPopupModeCanceled; - sal_Bool mbPopupModeTearOff; - sal_Bool mbMouseDown; - sal_Bool mbOldSaveBackMode; - sal_Bool mbGrabFocus; // act as key input window, although focus is not set - sal_Bool mbInCleanUp; + bool mbInPopupMode; + bool mbPopupMode; + bool mbPopupModeCanceled; + bool mbPopupModeTearOff; + bool mbMouseDown; + bool mbOldSaveBackMode; + bool mbGrabFocus; // act as key input window, although focus is not set + bool mbInCleanUp; Link maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); @@ -105,15 +105,15 @@ public: #define IMPL_FLOATWIN_HITTEST_RECT ((sal_uInt16)0x0004) SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest ); SAL_DLLPRIVATE FloatingWindow* ImplFindLastLevelFloat(); - SAL_DLLPRIVATE sal_Bool ImplIsFloatPopupModeWindow( const Window* pWindow ); - SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = sal_True; } - SAL_DLLPRIVATE sal_Bool ImplIsMouseDown() const { return mbMouseDown; } + SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const Window* pWindow ); + SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; } + SAL_DLLPRIVATE bool ImplIsMouseDown() const { return mbMouseDown; } SAL_DLLPRIVATE static Point ImplCalcPos( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); - SAL_DLLPRIVATE sal_Bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } + SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } public: explicit FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); @@ -135,15 +135,15 @@ public: void AddPopupModeWindow( Window* pWindow ); sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; } void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; } - sal_Bool IsInPopupMode() const { return mbPopupMode; } - sal_Bool IsInCleanUp() const { return mbInCleanUp; } - sal_Bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } - sal_Bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } + bool IsInPopupMode() const { return mbPopupMode; } + bool IsInCleanUp() const { return mbInCleanUp; } + bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } + bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } - sal_Bool GrabsFocus() const { return mbGrabFocus; } + bool GrabsFocus() const { return mbGrabFocus; } static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); }; diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index d49d647f3655..dbd44fcddaf5 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -59,8 +59,8 @@ public: const Color& GetColor() const; void SetFillColor( const Color& ); const Color& GetFillColor() const; - void SetTransparent( sal_Bool bTransparent ); - sal_Bool IsTransparent() const; + void SetTransparent( bool bTransparent ); + bool IsTransparent() const; void SetAlign( FontAlign ); FontAlign GetAlign() const; @@ -93,11 +93,11 @@ public: void SetOrientation( short nLineOrientation ); short GetOrientation() const; - void SetVertical( sal_Bool bVertical ); + void SetVertical( bool bVertical ); bool IsVertical() const; void SetKerning( FontKerning nKerning ); FontKerning GetKerning() const; - sal_Bool IsKerning() const; + bool IsKerning() const; void SetWeight( FontWeight ); FontWeight GetWeight() const; @@ -105,10 +105,10 @@ public: FontWidth GetWidthType() const; void SetItalic( FontItalic ); FontItalic GetItalic() const; - void SetOutline( sal_Bool bOutline ); - sal_Bool IsOutline() const; - void SetShadow( sal_Bool bShadow ); - sal_Bool IsShadow() const; + void SetOutline( bool bOutline ); + bool IsOutline() const; + void SetShadow( bool bShadow ); + bool IsShadow() const; void SetRelief( FontRelief ); FontRelief GetRelief() const; void SetUnderline( FontUnderline ); @@ -119,8 +119,8 @@ public: FontStrikeout GetStrikeout() const; void SetEmphasisMark( FontEmphasisMark ); FontEmphasisMark GetEmphasisMark() const; - void SetWordLineMode( sal_Bool bWordLine ); - sal_Bool IsWordLineMode() const; + void SetWordLineMode( bool bWordLine ); + bool IsWordLineMode() const; void Merge( const Font& rFont ); void GetFontAttributes( ImplFontAttributes& rAttrs ) const; @@ -129,7 +129,7 @@ public: bool operator==( const Font& ) const; bool operator!=( const Font& rFont ) const { return !(Font::operator==( rFont )); } - sal_Bool IsSameInstance( const Font& ) const; + bool IsSameInstance( const Font& ) const; friend VCL_DLLPUBLIC SvStream& ReadFont( SvStream& rIStm, Font& ); friend VCL_DLLPUBLIC SvStream& WriteFont( SvStream& rOStm, const Font& ); diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index a322f8e2cf4f..fcb095ab6bba 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -81,9 +81,9 @@ private: GDIMetaFile* pPrev; GDIMetaFile* pNext; OutputDevice* pOutDev; - sal_Bool bPause; - sal_Bool bRecord; - sal_Bool bUseCanvas; + bool bPause; + bool bRecord; + bool bUseCanvas; SAL_DLLPRIVATE static Color ImplColAdjustFnc( const Color& rColor, const void* pColParam ); @@ -126,11 +126,11 @@ public: virtual ~GDIMetaFile(); GDIMetaFile& operator=( const GDIMetaFile& rMtf ); - sal_Bool operator==( const GDIMetaFile& rMtf ) const; - sal_Bool operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } + bool operator==( const GDIMetaFile& rMtf ) const; + bool operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } void Clear(); - sal_Bool Mirror( sal_uLong nMirrorFlags ); + bool Mirror( sal_uLong nMirrorFlags ); void Move( long nX, long nY ); // additional Move method getting specifics how to handle MapMode( MAP_PIXEL ) void Move( long nX, long nY, long nDPIX, long nDPIY ); @@ -150,7 +150,7 @@ public: void Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - sal_Bool bInvert = sal_False + bool bInvert = false ); void Convert( MtfConversion eConversion ); @@ -160,15 +160,15 @@ public: GDIMetaFile GetMonochromeMtf( const Color& rCol ) const; void Record( OutputDevice* pOutDev ); - sal_Bool IsRecord() const { return bRecord; } + bool IsRecord() const { return bRecord; } void Play( GDIMetaFile& rMtf, size_t nPos = GDI_METAFILE_END ); void Play( OutputDevice* pOutDev, size_t nPos = GDI_METAFILE_END ); void Play( OutputDevice* pOutDev, const Point& rPos, const Size& rSize, size_t nPos = GDI_METAFILE_END ); - void Pause( sal_Bool bPause ); - sal_Bool IsPause() const { return bPause; } + void Pause( bool bPause ); + bool IsPause() const { return bPause; } void Stop(); @@ -214,10 +214,10 @@ public: friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ); /// Creates an antialiased thumbnail, with maximum width or height of nMaximumExtent. - sal_Bool CreateThumbnail(BitmapEx& rBmpEx, sal_uInt32 nMaximumSize = 256) const; + bool CreateThumbnail(BitmapEx& rBmpEx, sal_uInt32 nMaximumSize = 256) const; - void UseCanvas( sal_Bool _bUseCanvas ); - sal_Bool GetUseCanvas() const { return bUseCanvas; } + void UseCanvas( bool _bUseCanvas ); + bool GetUseCanvas() const { return bUseCanvas; } }; /** Create a special metaaction that delegates rendering to specified diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 1bf3f68e2691..9ecde74de55d 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -61,7 +61,7 @@ struct ImpSwap sal_uInt8* GetData() const; - sal_Bool IsSwapped() const { return maURL.getLength() > 0; } + bool IsSwapped() const { return maURL.getLength() > 0; } void WriteTo( SvStream& rOStm ) const; }; @@ -137,11 +137,11 @@ public: GfxLink(); GfxLink( const GfxLink& ); GfxLink( const OUString& rPath, GfxLinkType nType ); - GfxLink( sal_uInt8* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, sal_Bool bOwns ); + GfxLink( sal_uInt8* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, bool bOwns ); ~GfxLink(); GfxLink& operator=( const GfxLink& ); - sal_Bool IsEqual( const GfxLink& ) const; + bool IsEqual( const GfxLink& ) const; GfxLinkType GetType() const; @@ -149,7 +149,7 @@ public: sal_uInt32 GetUserId() const { return mnUserId; } sal_uInt32 GetDataSize() const; - void SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, sal_Bool bOwns ); + void SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, bool bOwns ); const sal_uInt8* GetData() const; const Size& GetPrefSize() const; @@ -160,16 +160,16 @@ public: void SetPrefMapMode( const MapMode& rPrefMapMode ); bool IsPrefMapModeValid(); - sal_Bool IsNative() const; - sal_Bool IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } + bool IsNative() const; + bool IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } - sal_Bool LoadNative( Graphic& rGraphic ); + bool LoadNative( Graphic& rGraphic ); - sal_Bool ExportNative( SvStream& rOStream ) const; + bool ExportNative( SvStream& rOStream ) const; void SwapOut(); void SwapIn(); - sal_Bool IsSwappedOut() const { return( mpSwap != NULL ); } + bool IsSwappedOut() const { return( mpSwap != NULL ); } public: diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 3a10dc083ee3..9b044f0f103d 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -103,10 +103,10 @@ public: void GetBoundRect( const Rectangle& rRect, Rectangle &rBoundRect, Point& rCenter ) const; Gradient& operator=( const Gradient& rGradient ); - sal_Bool operator==( const Gradient& rGradient ) const; - sal_Bool operator!=( const Gradient& rGradient ) const + bool operator==( const Gradient& rGradient ) const; + bool operator!=( const Gradient& rGradient ) const { return !(Gradient::operator==( rGradient )); } - sal_Bool IsSameInstance( const Gradient& rGradient ) const + bool IsSameInstance( const Gradient& rGradient ) const { return (mpImplGradient == rGradient.mpImplGradient); } friend VCL_DLLPUBLIC SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient ); diff --git a/include/vcl/graph.h b/include/vcl/graph.h index abc7aa50275a..30f4230a11d4 100644 --- a/include/vcl/graph.h +++ b/include/vcl/graph.h @@ -39,7 +39,7 @@ protected: OUString maUpperName; ReaderData* mpReaderData; - sal_Bool mbIsReading; + bool mbIsReading; GraphicReader() : mpReaderData( NULL ), @@ -51,7 +51,7 @@ public: const OUString& GetUpperFilterName() const { return maUpperName; } ReaderData* GetReaderData() const { return mpReaderData; } - sal_Bool IsReading() const { return mbIsReading; } + bool IsReading() const { return mbIsReading; } // TODO: when incompatible changes are possible again // the preview size hint should be redone diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index ec04cd7dcf57..3d19705f0aa0 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -103,20 +103,20 @@ public: virtual ~Graphic(); Graphic& operator=( const Graphic& rGraphic ); - sal_Bool operator==( const Graphic& rGraphic ) const; - sal_Bool operator!=( const Graphic& rGraphic ) const; - sal_Bool operator!() const; + bool operator==( const Graphic& rGraphic ) const; + bool operator!=( const Graphic& rGraphic ) const; + bool operator!() const; void Clear(); GraphicType GetType() const; void SetDefaultType(); - sal_Bool IsSupportedGraphic() const; + bool IsSupportedGraphic() const; - sal_Bool IsTransparent() const; - sal_Bool IsAlpha() const; - sal_Bool IsAnimated() const; - sal_Bool IsEPS() const; + bool IsTransparent() const; + bool IsAlpha() const; + bool IsAnimated() const; + bool IsEPS() const; // #i102089# Access of Bitmap potentially will have to rasterconvert the Graphic // if it is a MetaFile. To be able to control this conversion it is necessary to @@ -176,17 +176,17 @@ public: const OUString& GetDocFileName() const; sal_uLong GetDocFilePos() const; - sal_Bool SwapOut(); - sal_Bool SwapOut( SvStream* pOStm ); - sal_Bool SwapIn(); - sal_Bool SwapIn( SvStream* pIStm ); - sal_Bool IsSwapOut() const; + bool SwapOut(); + bool SwapOut( SvStream* pOStm ); + bool SwapIn(); + bool SwapIn( SvStream* pIStm ); + bool IsSwapOut() const; void SetLink( const GfxLink& ); GfxLink GetLink() const; - sal_Bool IsLink() const; + bool IsLink() const; - sal_Bool ExportNative( SvStream& rOStream ) const; + bool ExportNative( SvStream& rOStream ) const; friend VCL_DLLPUBLIC SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic ); friend VCL_DLLPUBLIC SvStream& ReadGraphic( SvStream& rIStream, Graphic& rGraphic ); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 24d7057d62cc..d62cf40a3f69 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -132,37 +132,37 @@ class VCL_DLLPUBLIC GraphicDescriptor sal_uInt16 nBitsPerPixel; sal_uInt16 nPlanes; sal_uInt16 nFormat; - sal_Bool bCompressed; - sal_Bool bOwnStream; + bool bCompressed; + bool bOwnStream; void ImpConstruct(); - sal_Bool ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectSVG( SvStream& rStm, sal_Bool bExtendedInfo ); - sal_Bool ImpDetectMOV( SvStream& rStm, sal_Bool bExtendedInfo ); + bool ImpDetectBMP( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectGIF( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectJPG( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPCD( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPCX( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPNG( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectXBM( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectXPM( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPBM( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPGM( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPPM( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectRAS( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectTGA( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPSD( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectEPS( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectDXF( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectMET( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectPCT( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectSGF( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectSVM( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectWMF( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectSGV( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectEMF( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectSVG( SvStream& rStm, bool bExtendedInfo ); + bool ImpDetectMOV( SvStream& rStm, bool bExtendedInfo ); GraphicDescriptor( const GraphicDescriptor& ); GraphicDescriptor& operator=( const GraphicDescriptor& ); @@ -189,7 +189,7 @@ public: if bExtendedInfo == sal_True the file header is used to derive as many properties as possible (size, color, etc.) */ - virtual sal_Bool Detect( sal_Bool bExtendedInfo = sal_False ); + virtual bool Detect( sal_Bool bExtendedInfo = sal_False ); /** @return the file format, GFF_NOT if no format was recognized */ sal_uInt16 GetFileFormat() const { return nFormat; } @@ -207,7 +207,7 @@ public: sal_uInt16 GetPlanes() const { return nPlanes; } /** @return true if the graphic is compressed */ - sal_Bool IsCompressed() const { return bCompressed; } + bool IsCompressed() const { return bCompressed; } /** @return filter number that is needed by the GraphFilter to read this format */ static OUString GetImportFormatShortName( sal_uInt16 nFormat ); @@ -238,13 +238,13 @@ protected: OUString aFilterPath; FilterConfigCache* pConfig; FilterErrorEx* pErrorEx; - sal_Bool bAbort; - sal_Bool bUseConfig; + bool bAbort; + bool bUseConfig; long nExpGraphHint; public: - GraphicFilter( sal_Bool bUseConfig = sal_True ); + GraphicFilter( bool bUseConfig = true ); ~GraphicFilter(); void SetFilterPath( const OUString& rFilterPath ) { aFilterPath = rFilterPath; }; @@ -260,7 +260,7 @@ public: OUString GetImportFormatShortName( sal_uInt16 nFormat ); OUString GetImportOSFileType( sal_uInt16 nFormat ); OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); - sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); + bool IsImportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount(); sal_uInt16 GetExportFormatNumber( const OUString& rFormatName ); @@ -274,7 +274,7 @@ public: OUString GetExportFormatShortName( sal_uInt16 nFormat ); OUString GetExportOSFileType( sal_uInt16 nFormat ); OUString GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); - sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); + bool IsExportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, @@ -309,7 +309,7 @@ public: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, WMF_EXTERNALHEADER *pExtHeader = NULL ); - void Abort() { bAbort = sal_True; } + void Abort() { bAbort = true; } const FilterErrorEx& GetLastError() const; void ResetLastError(); diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 1da4aa461173..6deb4978d913 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -35,7 +35,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 7ba89eb46598..3b9b578b92d0 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -65,9 +65,9 @@ public: ~Hatch(); Hatch& operator=( const Hatch& rHatch ); - sal_Bool operator==( const Hatch& rHatch ) const; - sal_Bool operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); } - sal_Bool IsSameInstance( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch ); } + bool operator==( const Hatch& rHatch ) const; + bool operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); } + bool IsSameInstance( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch ); } HatchStyle GetStyle() const { return mpImplHatch->meStyle; } diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index 10ebd520fbe3..fee319685088 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -62,40 +62,40 @@ public: Help(); virtual ~Help(); - virtual sal_Bool Start( const OUString& rHelpId, const Window* pWindow ); - virtual sal_Bool SearchKeyword( const OUString& rKeyWord ); + virtual bool Start( const OUString& rHelpId, const Window* pWindow ); + virtual bool SearchKeyword( const OUString& rKeyWord ); virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); - static sal_Bool IsContextHelpEnabled(); + static bool IsContextHelpEnabled(); static void EnableExtHelp(); static void DisableExtHelp(); - static sal_Bool IsExtHelpEnabled(); - static sal_Bool StartExtHelp(); - static sal_Bool EndExtHelp(); + static bool IsExtHelpEnabled(); + static bool StartExtHelp(); + static bool EndExtHelp(); static void EnableBalloonHelp(); static void DisableBalloonHelp(); - static sal_Bool IsBalloonHelpEnabled(); - static sal_Bool ShowBalloon( Window* pParent, + static bool IsBalloonHelpEnabled(); + static bool ShowBalloon( Window* pParent, const Point& rScreenPos, const OUString& rHelpText ); - static sal_Bool ShowBalloon( Window* pParent, + static bool ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle&, const OUString& rHelpText ); static void EnableQuickHelp(); static void DisableQuickHelp(); - static sal_Bool IsQuickHelpEnabled(); - static sal_Bool ShowQuickHelp( Window* pParent, + static bool IsQuickHelpEnabled(); + static bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, sal_uInt16 nStyle = 0 ); - static sal_Bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, sal_uInt16 nStyle = 0 ) diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index 4263fa481291..71ca315544ce 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -55,7 +55,7 @@ private: LocaleDataWrapper* mpLocaleDataWrapper; utl::TransliterationWrapper* mpTransliterationWrapper; - sal_Bool mbTransliterateIgnoreCase; + bool mbTransliterateIgnoreCase; SAL_DLLPRIVATE void ImplDestroyWrappers(); @@ -72,10 +72,10 @@ public: sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const; - sal_Bool MatchString( const OUString& rStr1, const OUString& rStr2 ) const; - sal_Bool MatchMnemonic( const OUString& rString, sal_Unicode cMnemonicChar ) const; + bool MatchString( const OUString& rStr1, const OUString& rStr2 ) const; + bool MatchMnemonic( const OUString& rString, sal_Unicode cMnemonicChar ) const; - OUString GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const; + OUString GetNum( long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep = true, bool bTrailingZeros = true ) const; static OUString filterFormattingChars( const OUString& ); }; diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index c0853f255b9d..fb618d1a21d7 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -68,10 +68,10 @@ public: Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const; - sal_Bool operator!() const { return( !mpImplData ? true : false ); } + bool operator!() const { return( !mpImplData ? true : false ); } Image& operator=( const Image& rImage ); - sal_Bool operator==( const Image& rImage ) const; - sal_Bool operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } + bool operator==( const Image& rImage ) const; + bool operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } private: @@ -122,8 +122,8 @@ public: void GetImageNames( ::std::vector< OUString >& rNames ) const; ImageList& operator=( const ImageList& rImageList ); - sal_Bool operator==( const ImageList& rImageList ) const; - sal_Bool operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } + bool operator==( const ImageList& rImageList ) const; + bool operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } private: diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index 71b565fa8f43..76a35480f4d4 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -59,8 +59,8 @@ public: sal_uLong GetOptions() const { return mnOptions; } InputContext& operator=( const InputContext& rInputContext ); - sal_Bool operator==( const InputContext& rInputContext ) const; - sal_Bool operator!=( const InputContext& rInputContext ) const + bool operator==( const InputContext& rInputContext ) const; + bool operator!=( const InputContext& rInputContext ) const { return !(InputContext::operator==( rInputContext )); } }; @@ -71,7 +71,7 @@ inline InputContext& InputContext::operator=( const InputContext& rInputContext return *this; } -inline sal_Bool InputContext::operator==( const InputContext& rInputContext ) const +inline bool InputContext::operator==( const InputContext& rInputContext ) const { return ((mnOptions == rInputContext.mnOptions) && (maFont == rInputContext.maFont)); diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx index 180b4ba369f2..75f48ca36d55 100644 --- a/include/vcl/jobset.hxx +++ b/include/vcl/jobset.hxx @@ -55,8 +55,8 @@ public: JobSetup& operator=( const JobSetup& rJob ); - sal_Bool operator==( const JobSetup& rJobSetup ) const; - sal_Bool operator!=( const JobSetup& rJobSetup ) const + bool operator==( const JobSetup& rJobSetup ) const; + bool operator!=( const JobSetup& rJobSetup ) const { return !(JobSetup::operator==( rJobSetup )); } friend VCL_DLLPUBLIC SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ); diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 7b547ae811c3..4e8cf1f5111b 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -39,12 +39,12 @@ public: KeyCode( const ResId& rResId ); KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier = 0 ) { nCode = nKey | nModifier; eFunc = KEYFUNC_DONTKNOW; } - KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_Bool bMod2, sal_Bool bMod3 ); + KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 ); KeyCode( KeyFuncType eFunction ); sal_uInt16 GetFullCode() const { return nCode; } KeyFuncType GetFullFunction() const { return eFunc; } - sal_Bool IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; + bool IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; sal_uInt16 GetCode() const { return (nCode & KEY_CODE); } @@ -53,30 +53,30 @@ public: { return (nCode & KEY_MODTYPE); } sal_uInt16 GetAllModifier() const { return (nCode & KEY_ALLMODTYPE); } - sal_Bool IsShift() const + bool IsShift() const { return ((nCode & KEY_SHIFT) != 0); } - sal_Bool IsMod1() const + bool IsMod1() const { return ((nCode & KEY_MOD1) != 0); } - sal_Bool IsMod2() const + bool IsMod2() const { return ((nCode & KEY_MOD2) != 0); } - sal_Bool IsMod3() const + bool IsMod3() const { return ((nCode & KEY_MOD3) != 0); } sal_uInt16 GetGroup() const { return (nCode & KEYGROUP_TYPE); } OUString GetName( Window* pWindow = NULL ) const; - sal_Bool IsFunction() const + bool IsFunction() const { return ((eFunc != KEYFUNC_DONTKNOW) ? sal_True : sal_False); } KeyFuncType GetFunction() const; KeyCode& operator = ( const KeyCode& rKeyCode ); - sal_Bool operator ==( const KeyCode& rKeyCode ) const; - sal_Bool operator !=( const KeyCode& rKeyCode ) const; + bool operator ==( const KeyCode& rKeyCode ) const; + bool operator !=( const KeyCode& rKeyCode ) const; }; -inline KeyCode::KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_Bool bMod2, sal_Bool bMod3 ) +inline KeyCode::KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 ) { nCode = nKey; if( bShift ) @@ -90,7 +90,7 @@ inline KeyCode::KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_B eFunc = KEYFUNC_DONTKNOW; } -inline sal_Bool KeyCode::operator ==( const KeyCode& rKeyCode ) const +inline bool KeyCode::operator ==( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) return (nCode == rKeyCode.nCode); @@ -98,7 +98,7 @@ inline sal_Bool KeyCode::operator ==( const KeyCode& rKeyCode ) const return (GetFunction() == rKeyCode.GetFunction()); } -inline sal_Bool KeyCode::operator !=( const KeyCode& rKeyCode ) const +inline bool KeyCode::operator !=( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) return (nCode != rKeyCode.nCode); @@ -106,7 +106,7 @@ inline sal_Bool KeyCode::operator !=( const KeyCode& rKeyCode ) const return (GetFunction() != rKeyCode.GetFunction()); } -inline sal_Bool KeyCode::IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const +inline bool KeyCode::IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) return (GetFullCode() == rKeyCode.GetFullCode()); diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 9f72675786e3..d6a9028320f2 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -75,9 +75,9 @@ public: ~LineInfo(); LineInfo& operator=( const LineInfo& rLineInfo ); - sal_Bool operator==( const LineInfo& rLineInfo ) const; - sal_Bool operator!=( const LineInfo& rLineInfo ) const { return !(LineInfo::operator==( rLineInfo ) ); } - sal_Bool IsSameInstance( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo ); } + bool operator==( const LineInfo& rLineInfo ) const; + bool operator!=( const LineInfo& rLineInfo ) const { return !(LineInfo::operator==( rLineInfo ) ); } + bool IsSameInstance( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo ); } void SetStyle( LineStyle eStyle ); LineStyle GetStyle() const { return mpImplLineInfo->meStyle; } @@ -106,7 +106,7 @@ public: void SetLineCap(com::sun::star::drawing::LineCap eLineCap); com::sun::star::drawing::LineCap GetLineCap() const { return mpImplLineInfo->meLineCap; } - sal_Bool IsDefault() const; + bool IsDefault() const; friend VCL_DLLPUBLIC SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ); friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ); diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index cc08b9518a1d..f837d5d4d341 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -45,7 +45,7 @@ protected: OUString maCurrencySymbol; sal_uInt16 mnType; sal_uInt16 mnDecimalDigits; - sal_Bool mbThousandSep; + bool mbThousandSep; LongCurrencyFormatter(); public: @@ -54,8 +54,8 @@ public: virtual void Reformat(); virtual void ReformatAll(); - void SetUseThousandSep( sal_Bool b ); - sal_Bool IsUseThousandSep() const { return mbThousandSep; } + void SetUseThousandSep( bool b ); + bool IsUseThousandSep() const { return mbThousandSep; } void SetCurrencySymbol( const OUString& rStr ); OUString GetCurrencySymbol() const; @@ -70,7 +70,7 @@ public: void SetValue( BigInt nNewValue ); void SetUserValue( BigInt nNewValue ); BigInt GetValue() const; - sal_Bool IsEmptyValue() const { return GetField()->GetText().isEmpty(); } + bool IsEmptyValue() const { return GetField()->GetText().isEmpty(); } BigInt GetCorrectedValue() const { return mnCorrectedValue; } }; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index c918d1e598ae..8f986fcbc63b 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -70,7 +70,7 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } + bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } protected: explicit ListBox( WindowType nType ); @@ -113,7 +113,7 @@ public: void EnableAutoSize( bool bAuto ); bool IsAutoSizeEnabled() const { return mbDDAutoSize; } - void EnableDDAutoWidth( sal_Bool b ); + void EnableDDAutoWidth( bool b ); sal_uInt16 InsertEntry( const OUString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); sal_uInt16 InsertEntry( const OUString& rStr, const Image& rImage, sal_uInt16 nPos = LISTBOX_APPEND ); @@ -128,15 +128,15 @@ public: OUString GetEntry( sal_uInt16 nPos ) const; sal_uInt16 GetEntryCount() const; - void SelectEntry( const OUString& rStr, sal_Bool bSelect = sal_True ); - void SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ); + void SelectEntry( const OUString& rStr, bool bSelect = true ); + void SelectEntryPos( sal_uInt16 nPos, bool bSelect = true ); sal_uInt16 GetSelectEntryCount() const; OUString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const; sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const; bool IsEntrySelected(const OUString& rStr) const; - sal_Bool IsEntryPosSelected( sal_uInt16 nPos ) const; + bool IsEntryPosSelected( sal_uInt16 nPos ) const; void SetNoSelection(); void SetEntryData( sal_uInt16 nPos, void* pNewData ); @@ -168,24 +168,24 @@ public: void SetSeparatorPos( sal_uInt16 n = LISTBOX_ENTRY_NOTFOUND ); sal_uInt16 GetSeparatorPos() const; - sal_Bool IsTravelSelect() const; - sal_Bool IsInDropDown() const; + bool IsTravelSelect() const; + bool IsInDropDown() const; void ToggleDropDown(); - void EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackSelection ); - void EnableMultiSelection( sal_Bool bMulti ); - sal_Bool IsMultiSelectionEnabled() const; + void EnableMultiSelection( bool bMulti, bool bStackSelection ); + void EnableMultiSelection( bool bMulti ); + bool IsMultiSelectionEnabled() const; - void SetReadOnly( sal_Bool bReadOnly = sal_True ); - sal_Bool IsReadOnly() const; + void SetReadOnly( bool bReadOnly = true ); + bool IsReadOnly() const; Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const; void SetUserItemSize( const Size& rSz ); - void EnableUserDraw( sal_Bool bUserDraw ); + void EnableUserDraw( bool bUserDraw ); - void DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False ); + void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } const Link& GetSelectHdl() const { return maSelectHdl; } diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index bfdc284fb35e..c95a11f22f82 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -46,7 +46,7 @@ private: Point maOrigin; Fraction maScaleX; Fraction maScaleY; - sal_Bool mbSimple; + bool mbSimple; friend SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rMapMode ); friend SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rMapMode ); @@ -94,11 +94,11 @@ public: { return mpImplMapMode->maScaleY; } MapMode& operator=( const MapMode& rMapMode ); - sal_Bool operator==( const MapMode& rMapMode ) const; - sal_Bool operator!=( const MapMode& rMapMode ) const + bool operator==( const MapMode& rMapMode ) const; + bool operator!=( const MapMode& rMapMode ) const { return !(MapMode::operator==( rMapMode )); } - sal_Bool IsDefault() const; - sal_Bool IsSameInstance( const MapMode& rMapMode ) const + bool IsDefault() const; + bool IsSameInstance( const MapMode& rMapMode ) const { return (mpImplMapMode == rMapMode.mpImplMapMode); } friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 513187233039..7e0774668965 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -140,7 +140,7 @@ private: sal_uInt16 nImgOrChkPos; sal_uInt16 nTextPos; - sal_Bool bIsMenuBar : 1, // Is this a menubar? + bool bIsMenuBar : 1, // Is this a menubar? bCanceled : 1, // Terminated during a callback bInCallback : 1, // In Activate/Deactivate bKilled : 1; // Killed... @@ -156,13 +156,13 @@ protected: SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId ); SAL_DLLPRIVATE Size ImplCalcSize( const Window* pWin ); - SAL_DLLPRIVATE sal_Bool ImplIsVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE sal_Bool ImplIsSelectable( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE bool ImplIsVisible( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE bool ImplIsSelectable( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, sal_Bool bHighlighted = sal_False, bool bLayout = false, bool bRollover = false ) const; + SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); @@ -179,7 +179,7 @@ protected: // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE sal_Bool ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; + SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); @@ -188,7 +188,7 @@ public: SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; } Menu(); - explicit Menu( sal_Bool bMenuBar ); + explicit Menu( bool bMenuBar ); SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } void ImplSelectWithStart( Menu* pStartMenu = NULL ); @@ -241,7 +241,7 @@ public: OUString GetItemAccKeyStrFromPos(sal_uInt16 nPos) const; - sal_Bool IsTemporaryItemFromPos(sal_uInt16 nPos) const; + bool IsTemporaryItemFromPos(sal_uInt16 nPos) const; void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } sal_uInt16 GetDefaultItem() const { return nDefaultItem; } @@ -258,28 +258,28 @@ public: void SetAccelKey( sal_uInt16 nItemId, const KeyCode& rKeyCode ); KeyCode GetAccelKey( sal_uInt16 nItemId ) const; - void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck = sal_True ); - sal_Bool IsItemChecked( sal_uInt16 nItemId ) const; + void CheckItem( sal_uInt16 nItemId, bool bCheck = true ); + bool IsItemChecked( sal_uInt16 nItemId ) const; void SelectItem( sal_uInt16 nItemId ); void DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID - void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable = sal_True ); + void EnableItem( sal_uInt16 nItemId, bool bEnable = true ); void EnableItem(const OString &rIdent, bool bEnable = true) { EnableItem(GetItemId(rIdent), bEnable); } - sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const; + bool IsItemEnabled( sal_uInt16 nItemId ) const; - void ShowItem( sal_uInt16 nItemId, sal_Bool bVisible = sal_True ); - void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, sal_False ); } + void ShowItem( sal_uInt16 nItemId, bool bVisible = true ); + void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, false ); } - sal_Bool IsItemPosVisible( sal_uInt16 nItemPos ) const; - sal_Bool IsMenuVisible() const; - sal_Bool IsMenuBar() const { return bIsMenuBar; } + bool IsItemPosVisible( sal_uInt16 nItemPos ) const; + bool IsMenuVisible() const; + bool IsMenuBar() const { return bIsMenuBar; } - void RemoveDisabledEntries( sal_Bool bCheckPopups = sal_True, sal_Bool bRemoveEmptyPopups = sal_False ); - sal_Bool HasValidEntries( sal_Bool bCheckPopups = sal_True ); + void RemoveDisabledEntries( bool bCheckPopups = true, bool bRemoveEmptyPopups = false ); + bool HasValidEntries( bool bCheckPopups = true ); void SetItemText( sal_uInt16 nItemId, const OUString& rStr ); OUString GetItemText( sal_uInt16 nItemId ) const; @@ -287,7 +287,7 @@ public: void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); Image GetItemImage( sal_uInt16 nItemId ) const; void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ); - void SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ); + void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ); OUString GetItemCommand( sal_uInt16 nItemId ) const; @@ -316,7 +316,7 @@ public: void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } const Link& GetSelectHdl() const { return aSelectHdl; } - sal_Bool HasLogo() const { return pLogo ? sal_True : sal_False; } + bool HasLogo() const { return pLogo ? sal_True : sal_False; } void AddEventListener( const Link& rEventListener ); void RemoveEventListener( const Link& rEventListener ); @@ -330,7 +330,7 @@ public: // returns the system's menu handle if native menus are supported // pData must point to a SystemMenuData structure - sal_Bool GetSystemMenuData( SystemMenuData* pData ) const; + bool GetSystemMenuData( SystemMenuData* pData ) const; // accessibility helpers @@ -371,10 +371,10 @@ class VCL_DLLPUBLIC MenuBar : public Menu Link maCloserHdl; Link maFloatHdl; Link maHideHdl; - sal_Bool mbCloserVisible; - sal_Bool mbFloatBtnVisible; - sal_Bool mbHideBtnVisible; - sal_Bool mbDisplayable; + bool mbCloserVisible; + bool mbFloatBtnVisible; + bool mbHideBtnVisible; + bool mbDisplayable; friend class Application; friend class Menu; @@ -383,8 +383,8 @@ class VCL_DLLPUBLIC MenuBar : public Menu friend class SystemWindow; SAL_DLLPRIVATE static Window* ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu ); - SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, sal_Bool bDelete ); - SAL_DLLPRIVATE sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMenu = sal_True ); + SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); + SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); public: MenuBar(); @@ -393,18 +393,18 @@ public: MenuBar& operator =( const MenuBar& rMenu ); - void ShowCloser( sal_Bool bShow = sal_True ); - sal_Bool HasCloser() const { return mbCloserVisible; } - sal_Bool HasFloatButton() const { return mbFloatBtnVisible; } - sal_Bool HasHideButton() const { return mbHideBtnVisible; } - void ShowButtons( sal_Bool bClose, sal_Bool bFloat, sal_Bool bHide ); + void ShowCloser( bool bShow = true ); + bool HasCloser() const { return mbCloserVisible; } + bool HasFloatButton() const { return mbFloatBtnVisible; } + bool HasHideButton() const { return mbHideBtnVisible; } + void ShowButtons( bool bClose, bool bFloat, bool bHide ); void SelectEntry( sal_uInt16 nId ); - sal_Bool HandleMenuActivateEvent( Menu *pMenu ) const; - sal_Bool HandleMenuDeActivateEvent( Menu *pMenu ) const; - sal_Bool HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nEventId ) const; - sal_Bool HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nEventId ) const; - sal_Bool HandleMenuButtonEvent( Menu *pMenu, sal_uInt16 nEventId ) const; + bool HandleMenuActivateEvent( Menu *pMenu ) const; + bool HandleMenuDeActivateEvent( Menu *pMenu ) const; + bool HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nEventId ) const; + bool HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nEventId ) const; + bool HandleMenuButtonEvent( Menu *pMenu, sal_uInt16 nEventId ) const; void SetCloserHdl( const Link& rLink ) { maCloserHdl = rLink; } const Link& GetCloserHdl() const { return maCloserHdl; } @@ -417,8 +417,8 @@ public: // - if a menubar is not displayable, its MenuBarWindow will never be shown // and it will be hidden if it was visible before // - note: if a menubar is diplayable, this does not necessarily mean that it is currently visible - void SetDisplayable( sal_Bool bDisplayable ); - sal_Bool IsDisplayable() const { return mbDisplayable; } + void SetDisplayable( bool bDisplayable ); + bool IsDisplayable() const { return mbDisplayable; } struct MenuBarButtonCallbackArg { @@ -465,7 +465,7 @@ private: SAL_DLLPRIVATE MenuFloatingWindow* ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); } protected: - SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, sal_Bool bPreSelectFirst ); + SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; @@ -486,7 +486,7 @@ public: void SelectEntry( sal_uInt16 nId ); void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only - static sal_Bool IsInExecute(); + static bool IsInExecute(); static PopupMenu* GetActivePopupMenu(); PopupMenu& operator =( const PopupMenu& rMenu ); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index b331100e100a..1720b4148d27 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -134,7 +134,7 @@ private: sal_uLong mnRefCount; sal_uInt16 mnType; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; protected: virtual ~MetaAction(); @@ -169,7 +169,7 @@ private: Point maPt; Color maColor; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Pixel, META_PIXEL_ACTION ) @@ -188,7 +188,7 @@ class VCL_DLLPUBLIC MetaPointAction : public MetaAction private: Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Point, META_POINT_ACTION ) @@ -209,7 +209,7 @@ private: Point maStartPt; Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Line, META_LINE_ACTION ) @@ -232,7 +232,7 @@ private: Rectangle maRect; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Rect, META_RECT_ACTION ) @@ -252,7 +252,7 @@ private: sal_uInt32 mnHorzRound; sal_uInt32 mnVertRound; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) @@ -274,7 +274,7 @@ private: Rectangle maRect; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) @@ -295,7 +295,7 @@ private: Point maStartPt; Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Arc, META_ARC_ACTION ) @@ -319,7 +319,7 @@ private: Point maStartPt; Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Pie, META_PIE_ACTION ) @@ -343,7 +343,7 @@ private: Point maStartPt; Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Chord, META_CHORD_ACTION ) @@ -366,7 +366,7 @@ private: LineInfo maLineInfo; Polygon maPoly; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) @@ -387,7 +387,7 @@ private: Polygon maPoly; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Polygon, META_POLYGON_ACTION ) @@ -406,7 +406,7 @@ private: PolyPolygon maPolyPoly; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) @@ -428,7 +428,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Text, META_TEXT_ACTION ) @@ -455,7 +455,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; protected: virtual ~MetaTextArrayAction(); @@ -494,7 +494,7 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) @@ -521,7 +521,7 @@ private: OUString maStr; sal_uInt16 mnStyle; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) @@ -547,7 +547,7 @@ private: FontUnderline meUnderline; FontUnderline meOverline; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) @@ -573,7 +573,7 @@ private: Bitmap maBmp; Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Bmp, META_BMP_ACTION ) @@ -595,7 +595,7 @@ private: Point maPt; Size maSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) @@ -621,7 +621,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) @@ -647,7 +647,7 @@ private: BitmapEx maBmpEx; Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpEx, META_BMPEX_ACTION ) @@ -669,7 +669,7 @@ private: Point maPt; Size maSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) @@ -695,7 +695,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) @@ -722,7 +722,7 @@ private: Color maColor; Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Mask, META_MASK_ACTION ) @@ -748,7 +748,7 @@ private: Point maPt; Size maSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) @@ -777,7 +777,7 @@ private: Point maSrcPt; Size maSrcSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) @@ -805,7 +805,7 @@ private: Rectangle maRect; Gradient maGradient; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Gradient, META_GRADIENT_ACTION ) @@ -826,7 +826,7 @@ private: PolyPolygon maPolyPoly; Gradient maGradient; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( GradientEx, META_GRADIENTEX_ACTION ) @@ -847,7 +847,7 @@ private: PolyPolygon maPolyPoly; Hatch maHatch; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Hatch, META_HATCH_ACTION ) @@ -868,7 +868,7 @@ private: Rectangle maRect; Wallpaper maWallpaper; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) @@ -888,20 +888,20 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction private: Region maRegion; - sal_Bool mbClip; + bool mbClip; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) - MetaClipRegionAction( const Region& rRegion, sal_Bool bClip ); + MetaClipRegionAction( const Region& rRegion, bool bClip ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Region& GetRegion() const { return maRegion; } - sal_Bool IsClipping() const { return mbClip; } + bool IsClipping() const { return mbClip; } }; class VCL_DLLPUBLIC MetaISectRectClipRegionAction : public MetaAction @@ -910,7 +910,7 @@ private: Rectangle maRect; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) @@ -929,7 +929,7 @@ private: Region maRegion; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) @@ -949,7 +949,7 @@ private: long mnHorzMove; long mnVertMove; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) @@ -967,17 +967,17 @@ class VCL_DLLPUBLIC MetaLineColorAction : public MetaAction private: Color maColor; - sal_Bool mbSet; + bool mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) - MetaLineColorAction( const Color& rColor, sal_Bool bSet ); + MetaLineColorAction( const Color& rColor, bool bSet ); const Color& GetColor() const { return maColor; } - sal_Bool IsSetting() const { return mbSet; } + bool IsSetting() const { return mbSet; } }; class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction @@ -985,17 +985,17 @@ class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction private: Color maColor; - sal_Bool mbSet; + bool mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) - MetaFillColorAction( const Color& rColor, sal_Bool bSet ); + MetaFillColorAction( const Color& rColor, bool bSet ); const Color& GetColor() const { return maColor; } - sal_Bool IsSetting() const { return mbSet; } + bool IsSetting() const { return mbSet; } }; class VCL_DLLPUBLIC MetaTextColorAction : public MetaAction @@ -1004,7 +1004,7 @@ private: Color maColor; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) @@ -1019,17 +1019,17 @@ class VCL_DLLPUBLIC MetaTextFillColorAction : public MetaAction private: Color maColor; - sal_Bool mbSet; + bool mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) - MetaTextFillColorAction( const Color& rColor, sal_Bool bSet ); + MetaTextFillColorAction( const Color& rColor, bool bSet ); const Color& GetColor() const { return maColor; } - sal_Bool IsSetting() const { return mbSet; } + bool IsSetting() const { return mbSet; } }; class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction @@ -1037,17 +1037,17 @@ class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction private: Color maColor; - sal_Bool mbSet; + bool mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) - MetaTextLineColorAction( const Color& rColor, sal_Bool bSet ); + MetaTextLineColorAction( const Color& rColor, bool bSet ); const Color& GetColor() const { return maColor; } - sal_Bool IsSetting() const { return mbSet; } + bool IsSetting() const { return mbSet; } }; class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction @@ -1055,17 +1055,17 @@ class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction private: Color maColor; - sal_Bool mbSet; + bool mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) - MetaOverlineColorAction( const Color& rColor, sal_Bool bSet ); + MetaOverlineColorAction( const Color& rColor, bool bSet ); const Color& GetColor() const { return maColor; } - sal_Bool IsSetting() const { return mbSet; } + bool IsSetting() const { return mbSet; } }; class VCL_DLLPUBLIC MetaTextAlignAction : public MetaAction @@ -1074,7 +1074,7 @@ private: TextAlign maAlign; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) @@ -1090,7 +1090,7 @@ private: MapMode maMapMode; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MapMode, META_MAPMODE_ACTION ) @@ -1108,7 +1108,7 @@ private: Font maFont; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Font, META_FONT_ACTION ) @@ -1126,7 +1126,7 @@ private: sal_uInt16 mnFlags; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Push, META_PUSH_ACTION ) @@ -1149,7 +1149,7 @@ private: RasterOp meRasterOp; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) @@ -1166,7 +1166,7 @@ private: PolyPolygon maPolyPoly; sal_uInt16 mnTransPercent; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) @@ -1189,7 +1189,7 @@ private: Size maSize; Gradient maGradient; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) @@ -1215,7 +1215,7 @@ private: Point maPoint; Size maSize; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( EPS, META_EPS_ACTION ) @@ -1237,17 +1237,17 @@ class VCL_DLLPUBLIC MetaRefPointAction : public MetaAction private: Point maRefPoint; - sal_Bool mbSet; + bool mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) - MetaRefPointAction( const Point& rRefPoint, sal_Bool bSet ); + MetaRefPointAction( const Point& rRefPoint, bool bSet ); const Point& GetRefPoint() const { return maRefPoint; } - sal_Bool IsSetting() const { return mbSet; } + bool IsSetting() const { return mbSet; } }; class VCL_DLLPUBLIC MetaCommentAction : public MetaAction @@ -1260,7 +1260,7 @@ private: sal_uInt8* mpData; SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ); - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; protected: virtual ~MetaCommentAction(); @@ -1289,7 +1289,7 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction private: sal_uInt32 mnLayoutMode; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) @@ -1304,7 +1304,7 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction private: LanguageType meTextLanguage; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index b557c2518929..244171f9786e 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -47,8 +47,8 @@ public: FontType GetType() const; FontInfo& operator=( const FontInfo& ); - sal_Bool operator==( const FontInfo& ) const; - sal_Bool operator!=( const FontInfo& rInfo ) const + bool operator==( const FontInfo& ) const; + bool operator!=( const FontInfo& rInfo ) const { return !operator==( rInfo ); } }; @@ -71,8 +71,8 @@ public: long GetSlant() const; FontMetric& operator=( const FontMetric& rMetric ); - sal_Bool operator==( const FontMetric& rMetric ) const; - sal_Bool operator!=( const FontMetric& rMetric ) const + bool operator==( const FontMetric& rMetric ) const; + bool operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } }; @@ -123,20 +123,20 @@ class VCL_DLLPUBLIC TextRectInfo private: long mnMaxWidth; sal_uInt16 mnLineCount; - sal_Bool mbEllipsis; + bool mbEllipsis; public: TextRectInfo(); sal_uInt16 GetLineCount() const { return mnLineCount; } long GetMaxLineWidth() const { return mnMaxWidth; } - sal_Bool IsEllipses() const { return mbEllipsis; } + bool IsEllipses() const { return mbEllipsis; } - sal_Bool operator ==( const TextRectInfo& rInfo ) const + bool operator ==( const TextRectInfo& rInfo ) const { return ((mnMaxWidth == rInfo.mnMaxWidth) && (mnLineCount == rInfo.mnLineCount) && (mbEllipsis == rInfo.mbEllipsis)); } - sal_Bool operator !=( const TextRectInfo& rInfo ) const + bool operator !=( const TextRectInfo& rInfo ) const { return !(TextRectInfo::operator==( rInfo )); } }; @@ -144,7 +144,7 @@ inline TextRectInfo::TextRectInfo() { mnMaxWidth = 0; mnLineCount = 0; - mbEllipsis = sal_False; + mbEllipsis = false; } #endif // INCLUDED_VCL_METRIC_HXX diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 2408caa92122..99b54a6090b2 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -37,7 +37,7 @@ private: ImplMoreButtonData* mpMBData; sal_uLong mnDelta; MapUnit meUnit; - sal_Bool mbState; + bool mbState; // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE MoreButton( const MoreButton & ); @@ -65,8 +65,8 @@ public: MapUnit GetMapUnit() const { return meUnit; } using PushButton::SetState; - void SetState( sal_Bool bNewState = sal_True ); - sal_Bool GetState() const { return mbState; } + void SetState( bool bNewState = true ); + bool GetState() const { return mbState; } void SetText( const OUString& rNewText ); OUString GetText() const; @@ -75,7 +75,7 @@ public: void SetLessText( const OUString& rNewText ); }; -inline void MoreButton::SetState( sal_Bool bNewState ) +inline void MoreButton::SetState( bool bNewState ) { if ( mbState != bNewState ) Click(); diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 081141b56cbc..93a296494452 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -36,10 +36,10 @@ protected: FixedImage* mpFixedImage; OUString maMessText; Image maImage; - sal_Bool mbHelpBtn; + bool mbHelpBtn; CheckBox* mpCheckBox; OUString maCheckBoxText; - sal_Bool mbCheck; + bool mbCheck; SAL_DLLPRIVATE void ImplInitMessBoxData(); SAL_DLLPRIVATE void ImplInitButtons(); @@ -64,8 +64,8 @@ public: void SetCheckBoxText( const OUString& rText ) { maCheckBoxText = rText;} const OUString& GetCheckBoxText() const { return maCheckBoxText;} - void SetCheckBoxState( sal_Bool bCheck ); - sal_Bool GetCheckBoxState() const; + void SetCheckBoxState( bool bCheck ); + bool GetCheckBoxState() const; virtual Size GetOptimalSize() const; }; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 52eb6b52edd2..1e5659a0a35a 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -374,7 +374,7 @@ public: @param bRelease Determines whether to release the fonts of the physically released graphics device. */ - SAL_DLLPRIVATE void ImplReleaseGraphics( sal_Bool bRelease = sal_True ); + SAL_DLLPRIVATE void ImplReleaseGraphics( bool bRelease = true ); /** Initialize the graphics device's data structures. */ @@ -600,9 +600,9 @@ public: const OUString& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplDrawTextBackground( const SalLayout& ); - SAL_DLLPRIVATE void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, sal_Bool bWordLine, sal_Bool bUnderlineAbove ); + SAL_DLLPRIVATE void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bWordLine, bool bUnderlineAbove ); SAL_DLLPRIVATE bool ImplDrawRotateText( SalLayout& ); - SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, sal_Bool bTextLines ); + SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, bool bTextLines ); SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawText( SalLayout& ); SAL_DLLPRIVATE Rectangle ImplGetTextBoundRect( const SalLayout& ); @@ -616,17 +616,17 @@ public: SAL_DLLPRIVATE void ImplInitTextLineSize(); SAL_DLLPRIVATE void ImplInitAboveTextLineSize(); SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor ); - SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, sal_Bool bIsAbove ); - SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, sal_Bool bIsAbove ); + SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); + SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, bool bIsAbove ); SAL_DLLPRIVATE void ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor ); SAL_DLLPRIVATE void ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor ); - SAL_DLLPRIVATE void ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, sal_Bool bUnderlineAbove ); + SAL_DLLPRIVATE void ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bUnderlineAbove ); SAL_DLLPRIVATE void ImplDrawMnemonicLine( long nX, long nY, long nWidth ); - SAL_DLLPRIVATE static sal_Bool ImplIsUnderlineAbove( const Font& ); + SAL_DLLPRIVATE static bool ImplIsUnderlineAbove( const Font& ); SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont ); - SAL_DLLPRIVATE void ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); - SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, sal_Bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + SAL_DLLPRIVATE void ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); + SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); static SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplInitFontList() const; @@ -675,16 +675,16 @@ public: /** @name Gradient functions */ ///@{ - SAL_DLLPRIVATE void ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ); - SAL_DLLPRIVATE void ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, bool bMtf, const PolyPolygon* pClipPolyPoly ); ///@} /** @name Hatch functions */ ///@{ - SAL_DLLPRIVATE void ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, sal_Bool bMtf ); + SAL_DLLPRIVATE void ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ); SAL_DLLPRIVATE void ImplCalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); - SAL_DLLPRIVATE void ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, sal_Bool bMtf ); + SAL_DLLPRIVATE void ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, bool bMtf ); ///@} /** @name Wallpaper functions @@ -757,7 +757,7 @@ public: /** @name Layout functions */ ///@{ - SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const; + SAL_DLLPRIVATE bool ImplIsRecordLayout() const; virtual bool HasMirroredGraphics() const; SAL_DLLPRIVATE void ReMirror( Point &rPoint ) const; SAL_DLLPRIVATE void ReMirror( Rectangle &rRect ) const; @@ -812,7 +812,7 @@ public: FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - sal_Bool bUnderlineAbove = sal_False ); + bool bUnderlineAbove = false ); void DrawText( const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, @@ -830,7 +830,7 @@ public: bool GetCaretPositions( const OUString&, sal_Int32* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, sal_Int32* pDXAry = NULL, long nWidth = 0, - sal_Bool bCellBreaking = sal_True ) const; + bool bCellBreaking = true ) const; void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ); @@ -873,26 +873,26 @@ public: static OUString GetNonMnemonicString( const OUString& rStr ) { sal_Int32 nDummy; return GetNonMnemonicString( rStr, nDummy ); } - sal_Bool GetTextBoundRect( Rectangle& rRect, + bool GetTextBoundRect( Rectangle& rRect, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - sal_Bool GetTextOutline( PolyPolygon&, + bool GetTextOutline( PolyPolygon&, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, - sal_Int32 nLen = -1, sal_Bool bOptimize = sal_True, + sal_Int32 nLen = -1, bool bOptimize = true, sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - sal_Bool GetTextOutlines( PolyPolyVector&, + bool GetTextOutlines( PolyPolyVector&, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, - sal_Int32 nLen = -1, sal_Bool bOptimize = sal_True, + sal_Int32 nLen = -1, bool bOptimize = true, sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - sal_Bool GetTextOutlines( ::basegfx::B2DPolyPolygonVector &rVector, + bool GetTextOutlines( ::basegfx::B2DPolyPolygonVector &rVector, const OUString& rStr, sal_Int32 nBase = 0, sal_Int32 nIndex = 0, - sal_Int32 nLen = -1, sal_Bool bOptimize = sal_True, + sal_Int32 nLen = -1, bool bOptimize = true, sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - sal_Bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, + bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); void DrawPixel( const Point& rPt ); @@ -1078,26 +1078,26 @@ public: */ BitmapEx GetBitmapEx( const Point& rSrcPt, const Size& rSize ) const; - void EnableMapMode( sal_Bool bEnable = sal_True ); - sal_Bool IsMapModeEnabled() const { return mbMap; } + void EnableMapMode( bool bEnable = true ); + bool IsMapModeEnabled() const { return mbMap; } // Enabling/disabling RTL only makes sense for OutputDevices that use a mirroring SalGraphisLayout - void EnableRTL( sal_Bool bEnable = sal_True); - sal_Bool IsRTLEnabled() const { return mbEnableRTL; } + void EnableRTL( bool bEnable = true); + bool IsRTLEnabled() const { return mbEnableRTL; } void SetConnectMetaFile( GDIMetaFile* pMtf ); GDIMetaFile* GetConnectMetaFile() const { return mpMetaFile; } - void EnableOutput( sal_Bool bEnable = sal_True ); - sal_Bool IsOutputEnabled() const { return mbOutput; } - sal_Bool IsDeviceOutput() const { return mbDevOutput; } - sal_Bool IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); } - sal_Bool IsOutputNecessary() const { return ((mbOutput && mbDevOutput) || (mpMetaFile != NULL)); } + void EnableOutput( bool bEnable = true ); + bool IsOutputEnabled() const { return mbOutput; } + bool IsDeviceOutput() const { return mbDevOutput; } + bool IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); } + bool IsOutputNecessary() const { return ((mbOutput && mbDevOutput) || (mpMetaFile != NULL)); } void SetClipRegion(); void SetClipRegion( const Region& rRegion ); Region GetClipRegion() const; - sal_Bool IsClipRegion() const { return mbClipRegion; } + bool IsClipRegion() const { return mbClipRegion; } Region GetActiveClipRegion() const; void MoveClipRegion( long nHorzMove, long nVertMove ); @@ -1132,18 +1132,18 @@ public: void SetLineColor(); void SetLineColor( const Color& rColor ); const Color& GetLineColor() const { return maLineColor; } - sal_Bool IsLineColor() const { return mbLineColor; } + bool IsLineColor() const { return mbLineColor; } void SetFillColor(); void SetFillColor( const Color& rColor ); const Color& GetFillColor() const { return maFillColor; } - sal_Bool IsFillColor() const { return mbFillColor; } + bool IsFillColor() const { return mbFillColor; } void SetBackground(); void SetBackground( const Wallpaper& rBackground ); const Wallpaper& GetBackground() const { return maBackground; } - sal_Bool IsBackground() const { return mbBackground; } + bool IsBackground() const { return mbBackground; } void SetFont( const Font& rNewFont ); const Font& GetFont() const { return maFont; } @@ -1159,15 +1159,15 @@ public: void SetTextFillColor( const Color& rColor ); Color GetTextFillColor() const; - sal_Bool IsTextFillColor() const { return !maFont.IsTransparent(); } + bool IsTextFillColor() const { return !maFont.IsTransparent(); } void SetTextLineColor(); void SetTextLineColor( const Color& rColor ); const Color& GetTextLineColor() const { return maTextLineColor; } - sal_Bool IsTextLineColor() const { return (maTextLineColor.GetTransparency() == 0); } + bool IsTextLineColor() const { return (maTextLineColor.GetTransparency() == 0); } void SetOverlineColor(); void SetOverlineColor( const Color& rColor ); const Color& GetOverlineColor() const { return maOverlineColor; } - sal_Bool IsOverlineColor() const { return (maOverlineColor.GetTransparency() == 0); } + bool IsOverlineColor() const { return (maOverlineColor.GetTransparency() == 0); } void SetTextAlign( TextAlign eAlign ); TextAlign GetTextAlign() const { return maFont.GetAlign(); } @@ -1181,12 +1181,12 @@ public: virtual void SetMapMode( const MapMode& rNewMapMode ); virtual void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } - sal_Bool IsMapMode() const { return mbMap; } + bool IsMapMode() const { return mbMap; } void SetRefPoint(); void SetRefPoint( const Point& rRefPoint ); const Point& GetRefPoint() const { return maRefPoint; } - sal_Bool IsRefPoint() const { return mbRefPoint; } + bool IsRefPoint() const { return mbRefPoint; } // #i75163# basegfx::B2DHomMatrix GetViewTransformation() const; @@ -1321,16 +1321,16 @@ public: void Erase(); void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } - sal_Bool AddTempDevFont( const OUString& rFileURL, const OUString& rFontName ); + bool AddTempDevFont( const OUString& rFileURL, const OUString& rFontName ); int GetDevFontCount() const; FontInfo GetDevFont( int nDevFontIndex ) const; int GetDevFontSizeCount( const Font& ) const; Size GetDevFontSize( const Font& rFont, int nSizeIndex ) const; - sal_Bool IsFontAvailable( const OUString& rFontName ) const; + bool IsFontAvailable( const OUString& rFontName ) const; FontMetric GetFontMetric() const; FontMetric GetFontMetric( const Font& rFont ) const; - sal_Bool GetFontCharMap( FontCharMap& rFontCharMap ) const; + bool GetFontCharMap( FontCharMap& rFontCharMap ) const; bool GetFontCapabilities( vcl::FontCapabilities& rFontCapabilities ) const; sal_Int32 HasGlyphs( const Font& rFont, const OUString& rStr, @@ -1349,7 +1349,7 @@ public: sal_uInt16 GetBitCount() const; - sal_Bool GetTextIsRTL( const OUString&, sal_Int32 nIndex, sal_Int32 nLen ) const; + bool GetTextIsRTL( const OUString&, sal_Int32 nIndex, sal_Int32 nLen ) const; /** Query the existence and depth of the alpha channel @@ -1370,7 +1370,7 @@ public: @return sal_True, if this device has an alpha channel. */ - sal_Bool HasAlpha(); + bool HasAlpha(); /// request XCanvas render interface for this OutputDevice css::uno::Reference< css::rendering::XCanvas > @@ -1429,17 +1429,17 @@ public: // These all just call through to the private mpGraphics functions of the same name. // Query the platform layer for control support - sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) const; + bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) const; // Query the native control to determine if it was acted upon - sal_Bool HitTestNativeControl( ControlType nType, + bool HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) const; // Request rendering of a particular control and/or part - sal_Bool DrawNativeControl( ControlType nType, + bool DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -1447,7 +1447,7 @@ public: OUString aCaption ); // Query the native control's actual drawing region (including adornment) - sal_Bool GetNativeControlRegion( ControlType nType, + bool GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index b6314edc7495..2ebdfdd4b59c 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -75,16 +75,16 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData const OutputDevice& mrOutDev; - sal_Bool mbTaggedPDF; - sal_Bool mbExportNotes; - sal_Bool mbExportNotesPages; - sal_Bool mbTransitionEffects; - sal_Bool mbUseLosslessCompression; - sal_Bool mbReduceImageResolution; - sal_Bool mbExportFormFields; - sal_Bool mbExportBookmarks; - sal_Bool mbExportHiddenSlides; - sal_Bool mbExportNDests; //i56629 + bool mbTaggedPDF; + bool mbExportNotes; + bool mbExportNotesPages; + bool mbTransitionEffects; + bool mbUseLosslessCompression; + bool mbReduceImageResolution; + bool mbExportFormFields; + bool mbExportBookmarks; + bool mbExportHiddenSlides; + bool mbExportNDests; //i56629 sal_Int32 mnFormsFormat; sal_Int32 mnPage; com::sun::star::lang::Locale maDocLocale; @@ -100,48 +100,48 @@ public : PDFExtOutDevData( const OutputDevice& rOutDev ); virtual ~PDFExtOutDevData(); - sal_Bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction ); + bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction ); void ResetSyncData(); void PlayGlobalActions( PDFWriter& rWriter ); - sal_Bool GetIsExportNotes() const; - void SetIsExportNotes( const sal_Bool bExportNotes ); + bool GetIsExportNotes() const; + void SetIsExportNotes( const bool bExportNotes ); - sal_Bool GetIsExportNotesPages() const; - void SetIsExportNotesPages( const sal_Bool bExportNotesPages ); + bool GetIsExportNotesPages() const; + void SetIsExportNotesPages( const bool bExportNotesPages ); - sal_Bool GetIsExportTaggedPDF() const; - void SetIsExportTaggedPDF( const sal_Bool bTaggedPDF ); + bool GetIsExportTaggedPDF() const; + void SetIsExportTaggedPDF( const bool bTaggedPDF ); - sal_Bool GetIsExportTransitionEffects() const; - void SetIsExportTransitionEffects( const sal_Bool bTransitionalEffects ); + bool GetIsExportTransitionEffects() const; + void SetIsExportTransitionEffects( const bool bTransitionalEffects ); - sal_Bool GetIsExportFormFields() const; - void SetIsExportFormFields( const sal_Bool bExportFormFields ); + bool GetIsExportFormFields() const; + void SetIsExportFormFields( const bool bExportFormFields ); void SetFormsFormat( const sal_Int32 nFormsFormat ); - sal_Bool GetIsExportBookmarks() const; - void SetIsExportBookmarks( const sal_Bool bExportBookmarks ); + bool GetIsExportBookmarks() const; + void SetIsExportBookmarks( const bool bExportBookmarks ); - sal_Bool GetIsExportHiddenSlides() const; - void SetIsExportHiddenSlides( const sal_Bool bExportHiddenSlides ); + bool GetIsExportHiddenSlides() const; + void SetIsExportHiddenSlides( const bool bExportHiddenSlides ); - sal_Bool GetIsExportNamedDestinations() const; //i56629 - void SetIsExportNamedDestinations( const sal_Bool bExportNDests ); //i56629 + bool GetIsExportNamedDestinations() const; //i56629 + void SetIsExportNamedDestinations( const bool bExportNDests ); //i56629 // PageNumber, Compression is being set by the PDFExport sal_Int32 GetCurrentPageNumber() const; void SetCurrentPageNumber( const sal_Int32 nPage ); - sal_Bool GetIsLosslessCompression() const; - void SetIsLosslessCompression( const sal_Bool bLosslessCompression ); + bool GetIsLosslessCompression() const; + void SetIsLosslessCompression( const bool bLosslessCompression ); - sal_Bool GetIsReduceImageResolution() const; - void SetIsReduceImageResolution( const sal_Bool bReduceImageResolution ); + bool GetIsReduceImageResolution() const; + void SetIsReduceImageResolution( const bool bReduceImageResolution ); const com::sun::star::lang::Locale& GetDocumentLocale() const; void SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ); diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index d7f61fb5ae34..81e5be62ac33 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -767,7 +767,7 @@ The following structure describes the permissions used in PDF security FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - sal_Bool bUnderlineAbove = sal_False ); + bool bUnderlineAbove = false ); void DrawTextArray( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, sal_Int32 nIndex, diff --git a/include/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx index a6140676cdec..89b218b75725 100644 --- a/include/vcl/pngwrite.hxx +++ b/include/vcl/pngwrite.hxx @@ -44,7 +44,7 @@ namespace vcl const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData = NULL ); ~PNGWriter(); - sal_Bool Write( SvStream& rStm ); + bool Write( SvStream& rStm ); // additional method to be able to modify all chunk before they are stored struct ChunkData diff --git a/include/vcl/pointr.hxx b/include/vcl/pointr.hxx index 44f7430b44a7..751739714dad 100644 --- a/include/vcl/pointr.hxx +++ b/include/vcl/pointr.hxx @@ -37,9 +37,9 @@ public: PointerStyle GetStyle() const { return meStyle; } - sal_Bool operator==( const Pointer& rPointer ) const + bool operator==( const Pointer& rPointer ) const { return (meStyle == rPointer.meStyle); } - sal_Bool operator!=( const Pointer& rPointer ) const + bool operator!=( const Pointer& rPointer ) const { return !(Pointer::operator==( rPointer )); } }; diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 03b1790e2048..f1c189930a66 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -63,11 +63,11 @@ private: long mnPrgsHeight; sal_uInt16 mnPercent; sal_uInt16 mnPercentCount; - sal_Bool mbCalcNew; + bool mbCalcNew; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit(); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); public: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 672b1fd62ae2..386f43fc4a0c 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -69,18 +69,18 @@ class VCL_DLLPUBLIC PrinterPage { GDIMetaFile* mpMtf; JobSetup maJobSetup; - sal_uInt16 mbNewJobSetup; + bool mbNewJobSetup; public: PrinterPage() : mpMtf( new GDIMetaFile() ) {} - PrinterPage( GDIMetaFile* pMtf, sal_Bool bNewJobSetup, const JobSetup& rSetup ) : + PrinterPage( GDIMetaFile* pMtf, bool bNewJobSetup, const JobSetup& rSetup ) : mpMtf( pMtf ), maJobSetup( rSetup ), mbNewJobSetup( bNewJobSetup ) {} ~PrinterPage() { delete mpMtf; } GDIMetaFile* GetGDIMetaFile() const { return mpMtf; } const JobSetup& GetJobSetup() const { return maJobSetup; } - sal_Bool IsNewJobSetup() const { return (mbNewJobSetup != 0); } + bool IsNewJobSetup() const { return mbNewJobSetup; } }; @@ -151,31 +151,31 @@ class VCL_DLLPUBLIC PrinterOptions { private: - sal_Bool mbReduceTransparency; + bool mbReduceTransparency; PrinterTransparencyMode meReducedTransparencyMode; - sal_Bool mbReduceGradients; + bool mbReduceGradients; PrinterGradientMode meReducedGradientsMode; sal_uInt16 mnReducedGradientStepCount; - sal_Bool mbReduceBitmaps; + bool mbReduceBitmaps; PrinterBitmapMode meReducedBitmapMode; sal_uInt16 mnReducedBitmapResolution; - sal_Bool mbReducedBitmapsIncludeTransparency; - sal_Bool mbConvertToGreyscales; - sal_Bool mbPDFAsStandardPrintJobFormat; + bool mbReducedBitmapsIncludeTransparency; + bool mbConvertToGreyscales; + bool mbPDFAsStandardPrintJobFormat; public: PrinterOptions(); ~PrinterOptions(); - sal_Bool IsReduceTransparency() const { return mbReduceTransparency; } - void SetReduceTransparency( sal_Bool bSet ) { mbReduceTransparency = bSet; } + bool IsReduceTransparency() const { return mbReduceTransparency; } + void SetReduceTransparency( bool bSet ) { mbReduceTransparency = bSet; } PrinterTransparencyMode GetReducedTransparencyMode() const { return meReducedTransparencyMode; } void SetReducedTransparencyMode( PrinterTransparencyMode eMode ) { meReducedTransparencyMode = eMode; } - sal_Bool IsReduceGradients() const { return mbReduceGradients; } - void SetReduceGradients( sal_Bool bSet ) { mbReduceGradients = bSet; } + bool IsReduceGradients() const { return mbReduceGradients; } + void SetReduceGradients( bool bSet ) { mbReduceGradients = bSet; } PrinterGradientMode GetReducedGradientMode() const { return meReducedGradientsMode; } void SetReducedGradientMode( PrinterGradientMode eMode ) { meReducedGradientsMode = eMode; } @@ -183,8 +183,8 @@ public: sal_uInt16 GetReducedGradientStepCount() const { return mnReducedGradientStepCount; } void SetReducedGradientStepCount( sal_uInt16 nStepCount ) { mnReducedGradientStepCount = nStepCount; } - sal_Bool IsReduceBitmaps() const { return mbReduceBitmaps; } - void SetReduceBitmaps( sal_Bool bSet ) { mbReduceBitmaps = bSet; } + bool IsReduceBitmaps() const { return mbReduceBitmaps; } + void SetReduceBitmaps( bool bSet ) { mbReduceBitmaps = bSet; } PrinterBitmapMode GetReducedBitmapMode() const { return meReducedBitmapMode; } void SetReducedBitmapMode( PrinterBitmapMode eMode ) { meReducedBitmapMode = eMode; } @@ -192,14 +192,14 @@ public: sal_uInt16 GetReducedBitmapResolution() const { return mnReducedBitmapResolution; } void SetReducedBitmapResolution( sal_uInt16 nResolution ) { mnReducedBitmapResolution = nResolution; } - sal_Bool IsReducedBitmapIncludesTransparency() const { return mbReducedBitmapsIncludeTransparency; } - void SetReducedBitmapIncludesTransparency( sal_Bool bSet ) { mbReducedBitmapsIncludeTransparency = bSet; } + bool IsReducedBitmapIncludesTransparency() const { return mbReducedBitmapsIncludeTransparency; } + void SetReducedBitmapIncludesTransparency( bool bSet ) { mbReducedBitmapsIncludeTransparency = bSet; } - sal_Bool IsConvertToGreyscales() const { return mbConvertToGreyscales; } - void SetConvertToGreyscales( sal_Bool bSet ) { mbConvertToGreyscales = bSet; } + bool IsConvertToGreyscales() const { return mbConvertToGreyscales; } + void SetConvertToGreyscales( bool bSet ) { mbConvertToGreyscales = bSet; } - sal_Bool IsPDFAsStandardPrintJobFormat() const { return mbPDFAsStandardPrintJobFormat; } - void SetPDFAsStandardPrintJobFormat( sal_Bool bSet ) { mbPDFAsStandardPrintJobFormat = bSet; } + bool IsPDFAsStandardPrintJobFormat() const { return mbPDFAsStandardPrintJobFormat; } + void SetPDFAsStandardPrintJobFormat( bool bSet ) { mbPDFAsStandardPrintJobFormat = bSet; } // read printer options from configuration, parameter decides whether the set for // print "to printer" or "to file" should be read. @@ -235,16 +235,16 @@ private: sal_uInt16 mnCurPrintPage; sal_uInt16 mnPageQueueSize; sal_uInt16 mnCopyCount; - sal_Bool mbDefPrinter; - sal_Bool mbPrinting; - sal_Bool mbJobActive; - sal_Bool mbCollateCopy; - sal_Bool mbPrintFile; - sal_Bool mbInPrintPage; - sal_Bool mbNewJobSetup; - sal_Bool mbIsQueuePrinter; - sal_Bool mbUserSetupCompleted; - sal_Bool mbUserSetupResult; + bool mbDefPrinter; + bool mbPrinting; + bool mbJobActive; + bool mbCollateCopy; + bool mbPrintFile; + bool mbInPrintPage; + bool mbNewJobSetup; + bool mbIsQueuePrinter; + bool mbUserSetupCompleted; + bool mbUserSetupResult; Link maErrorHdl; SAL_DLLPRIVATE void ImplInitData(); @@ -261,7 +261,7 @@ private: static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError ); private: - SAL_DLLPRIVATE sal_Bool EndJob(); + SAL_DLLPRIVATE bool EndJob(); SAL_DLLPRIVATE Printer( const Printer& rPrinter ); SAL_DLLPRIVATE Printer& operator =( const Printer& rPrinter ); public: @@ -272,8 +272,8 @@ public: protected: - void SetSelfAsQueuePrinter( sal_Bool bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; } - sal_Bool IsQueuePrinter() const { return mbIsQueuePrinter; } + void SetSelfAsQueuePrinter( bool bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; } + bool IsQueuePrinter() const { return mbIsQueuePrinter; } public: Printer(); @@ -290,19 +290,19 @@ public: const OUString& GetName() const { return maPrinterName; } const OUString& GetDriverName() const { return maDriver; } - sal_Bool IsDefPrinter() const { return mbDefPrinter; } - sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; } - sal_Bool IsValid() const { return !IsDisplayPrinter(); } + bool IsDefPrinter() const { return mbDefPrinter; } + bool IsDisplayPrinter() const { return mpDisplayDev != NULL; } + bool IsValid() const { return !IsDisplayPrinter(); } sal_uLong GetCapabilities( sal_uInt16 nType ) const; - sal_Bool HasSupport( PrinterSupport eFeature ) const; + bool HasSupport( PrinterSupport eFeature ) const; - sal_Bool SetJobSetup( const JobSetup& rSetup ); + bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } void SetJobValue( const OUString& rKey, const OUString& rValue ) { maJobSetup.SetValue( rKey, rValue ); } - sal_Bool Setup( Window* pWindow = NULL ); - sal_Bool SetPrinterProps( const Printer* pPrinter ); + bool Setup( Window* pWindow = NULL ); + bool SetPrinterProps( const Printer* pPrinter ); // SetPrinterOptions is used internally only now // in earlier times it was used only to set the options loaded directly from the configuration @@ -312,18 +312,18 @@ public: SAL_DLLPRIVATE void SetPrinterOptions( const PrinterOptions& rOptions ); const PrinterOptions& GetPrinterOptions() const { return( *mpPrinterOptions ); } - sal_Bool SetOrientation( Orientation eOrient ); + bool SetOrientation( Orientation eOrient ); Orientation GetOrientation() const; - sal_Bool SetDuplexMode( DuplexMode ); + bool SetDuplexMode( DuplexMode ); // returns the angle that a landscape page will be turned counterclockwise // wrt to portrait. The return value may be only valid for // the current paper int GetLandscapeAngle() const; - sal_Bool SetPaperBin( sal_uInt16 nPaperBin ); + bool SetPaperBin( sal_uInt16 nPaperBin ); sal_uInt16 GetPaperBin() const; - sal_Bool SetPaper( Paper ePaper ); - sal_Bool SetPaperSizeUser( const Size& rSize ); - sal_Bool SetPaperSizeUser( const Size& rSize, bool bMatchNearest ); + bool SetPaper( Paper ePaper ); + bool SetPaperSizeUser( const Size& rSize ); + bool SetPaperSizeUser( const Size& rSize, bool bMatchNearest ); Paper GetPaper() const; static OUString GetPaperName( Paper ePaper ); // return a UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER @@ -341,15 +341,15 @@ public: const Point& GetPageOffsetPixel() const { return maPageOffset; } Point GetPageOffset() const { return PixelToLogic( maPageOffset ); } - sal_Bool SetCopyCount( sal_uInt16 nCopy, sal_Bool bCollate = sal_False ); + bool SetCopyCount( sal_uInt16 nCopy, bool bCollate = false ); sal_uInt16 GetCopyCount() const { return mnCopyCount; } - sal_Bool IsCollateCopy() const { return mbCollateCopy; } + bool IsCollateCopy() const { return mbCollateCopy; } - sal_Bool IsPrinting() const { return mbPrinting; } + bool IsPrinting() const { return mbPrinting; } const OUString& GetCurJobName() const { return maJobName; } sal_uInt16 GetCurPage() const { return mnCurPage; } - sal_Bool IsJobActive() const { return mbJobActive; } + bool IsJobActive() const { return mbJobActive; } sal_uLong GetError() const { return ERRCODE_TOERROR(mnError); } sal_uLong GetErrorCode() const { return mnError; } @@ -450,7 +450,7 @@ public: /* get a bool property in case the property is unknown or not convertible to bool, i_bFallback is returned */ - sal_Bool getBoolProperty( const OUString& i_rPropertyName, sal_Bool i_bFallback ) const; + bool getBoolProperty( const OUString& i_rPropertyName, bool i_bFallback ) const; /* get an int property in case the property is unknown or not convertible to bool, i_nFallback is returned */ @@ -520,10 +520,10 @@ public: VCL_PLUGIN_PUBLIC bool isProgressCanceled() const; SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const; - VCL_PLUGIN_PUBLIC void setLastPage( sal_Bool i_bLastPage ); - SAL_DLLPRIVATE void setReversePrint( sal_Bool i_bReverse ); + VCL_PLUGIN_PUBLIC void setLastPage( bool i_bLastPage ); + SAL_DLLPRIVATE void setReversePrint( bool i_bReverse ); SAL_DLLPRIVATE bool getReversePrint() const; - SAL_DLLPRIVATE void setPapersizeFromSetup( sal_Bool i_bPapersizeFromSetup ); + SAL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup ); SAL_DLLPRIVATE bool getPapersizeFromSetup() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); @@ -566,9 +566,9 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // returns an empty Any for not existing properties css::uno::Any getValue( const OUString& i_rPropertyName ) const; - sal_Bool getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const; + bool getBoolValue( const OUString& i_rPropertyName, bool i_bDefault = false ) const; // convenience for fixed strings - sal_Bool getBoolValue( const char* i_pPropName, sal_Bool i_bDefault = sal_False ) const + bool getBoolValue( const char* i_pPropName, bool i_bDefault = false ) const { return getBoolValue( OUString::createFromAscii( i_pPropName ), i_bDefault ); } sal_Int64 getIntValue( const OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const; @@ -586,18 +586,18 @@ class VCL_DLLPUBLIC PrinterOptionsHelper { OUString maDependsOnName; sal_Int32 mnDependsOnEntry; - sal_Bool mbAttachToDependency; + bool mbAttachToDependency; OUString maGroupHint; - sal_Bool mbInternalOnly; - sal_Bool mbEnabled; + bool mbInternalOnly; + bool mbEnabled; css::uno::Sequence< css::beans::PropertyValue > maAddProps; UIControlOptions( const OUString& i_rDependsOnName = OUString(), sal_Int32 i_nDependsOnEntry = -1, - sal_Bool i_bAttachToDependency = sal_False, + bool i_bAttachToDependency = false, const OUString& i_rGroupHint = OUString(), - sal_Bool i_bInternalOnly = sal_False, - sal_Bool i_bEnabled = sal_True + bool i_bInternalOnly = false, + bool i_bEnabled = true ) : maDependsOnName( i_rDependsOnName ) , mnDependsOnEntry( i_nDependsOnEntry ) @@ -638,7 +638,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper const OUString& i_rTitle, const OUString& i_rHelpId, const OUString& i_rProperty, - sal_Bool i_bValue, + bool i_bValue, const UIControlOptions& i_rControlOptions = UIControlOptions()); // Show a set of choices in a list box diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index bdf9543263ac..6e92484f4827 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -121,11 +121,11 @@ public: inline ~BitmapColor() {}; - inline sal_Bool operator==( const BitmapColor& rBitmapColor ) const; - inline sal_Bool operator!=( const BitmapColor& rBitmapColor ) const; + inline bool operator==( const BitmapColor& rBitmapColor ) const; + inline bool operator!=( const BitmapColor& rBitmapColor ) const; inline BitmapColor& operator=( const BitmapColor& rBitmapColor ); - inline sal_Bool IsIndex() const; + inline bool IsIndex() const; inline sal_uInt8 GetRed() const; inline void SetRed( sal_uInt8 cRed ); @@ -184,9 +184,9 @@ public: inline ~BitmapPalette(); inline BitmapPalette& operator=( const BitmapPalette& rBitmapPalette ); - inline sal_Bool operator==( const BitmapPalette& rBitmapPalette ) const; - inline sal_Bool operator!=( const BitmapPalette& rBitmapPalette ) const; - inline sal_Bool operator!(); + inline bool operator==( const BitmapPalette& rBitmapPalette ) const; + inline bool operator!=( const BitmapPalette& rBitmapPalette ) const; + inline bool operator!(); inline sal_uInt16 GetEntryCount() const; inline void SetEntryCount( sal_uInt16 nCount ); @@ -323,7 +323,7 @@ inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) : // ------------------------------------------------------------------ -inline sal_Bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const +inline bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const { return( ( mcBlueOrIndex == rBitmapColor.mcBlueOrIndex ) && ( mbIndex ? rBitmapColor.mbIndex : @@ -332,7 +332,7 @@ inline sal_Bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const // ------------------------------------------------------------------ -inline sal_Bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const +inline bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const { return !( *this == rBitmapColor ); } @@ -351,7 +351,7 @@ inline BitmapColor& BitmapColor::operator=( const BitmapColor& rBitmapColor ) // ------------------------------------------------------------------ -inline sal_Bool BitmapColor::IsIndex() const +inline bool BitmapColor::IsIndex() const { return mbIndex; } @@ -580,19 +580,19 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale // ------------------------------------------------------------------ -inline sal_Bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) const +inline bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( rBitmapPalette.mnCount == mnCount ) { - bRet = sal_True; + bRet = true; for( sal_uInt16 i = 0; i < mnCount; i++ ) { if( mpBitmapColor[ i ] != rBitmapPalette.mpBitmapColor[ i ] ) { - bRet = sal_False; + bRet = false; break; } } @@ -603,14 +603,14 @@ inline sal_Bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) // ------------------------------------------------------------------ -inline sal_Bool BitmapPalette::operator!=( const BitmapPalette& rBitmapPalette ) const +inline bool BitmapPalette::operator!=( const BitmapPalette& rBitmapPalette ) const { return !( *this == rBitmapPalette ); } // ------------------------------------------------------------------ -inline sal_Bool BitmapPalette::operator!() +inline bool BitmapPalette::operator!() { return( !mnCount || !mpBitmapColor ); } @@ -678,11 +678,11 @@ inline sal_uInt16 BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const if( mpBitmapColor && mnCount ) { - sal_Bool bFound = sal_False; + bool bFound = false; for( long j = 0L; ( j < mnCount ) && !bFound; j++ ) if( rCol == mpBitmapColor[ j ] ) - nRetIndex = ( (sal_uInt16) j ), bFound = sal_True; + nRetIndex = ( (sal_uInt16) j ), bFound = true; if( !bFound ) { diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index ba568f9cd91e..6f540c74f31e 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -371,12 +371,12 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue virtual ~TabitemValue(); virtual TabitemValue* clone() const; - sal_Bool isLeftAligned() const { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; } - sal_Bool isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; } - sal_Bool isBothAligned() const { return isLeftAligned() && isRightAligned(); } - sal_Bool isNotAligned() const { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; } - sal_Bool isFirst() const { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; } - sal_Bool isLast() const { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; } + bool isLeftAligned() const { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; } + bool isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; } + bool isBothAligned() const { return isLeftAligned() && isRightAligned(); } + bool isNotAligned() const { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; } + bool isFirst() const { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; } + bool isLast() const { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; } }; /* SpinbuttonValue: @@ -412,11 +412,11 @@ class VCL_DLLPUBLIC ToolbarValue : public ImplControlValue { public: ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 ) - { mbIsTopDockingArea = sal_False; } + { mbIsTopDockingArea = false; } virtual ~ToolbarValue(); virtual ToolbarValue* clone() const; Rectangle maGripRect; - sal_Bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea + bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar }; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index e17042cd2210..28c891c15cde 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -63,8 +63,8 @@ private: sal_uInt16 mnStateFlags; ScrollType meScrollType; ScrollType meDDScrollType; - sal_Bool mbCalcSize; - sal_Bool mbFullDrag; + bool mbCalcSize; + bool mbFullDrag; Link maScrollHdl; Link maEndScrollHdl; @@ -73,17 +73,17 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplUpdateRects( sal_Bool bUpdate = sal_True ); + SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos ); - SAL_DLLPRIVATE void ImplCalc( sal_Bool bUpdate = sal_True ); + SAL_DLLPRIVATE void ImplCalc( bool bUpdate = true ); SAL_DLLPRIVATE void ImplDraw( sal_uInt16 nDrawFlags, OutputDevice* pOutDev ); using Window::ImplScroll; - SAL_DLLPRIVATE long ImplScroll( long nNewPos, sal_Bool bCallEndScroll ); - SAL_DLLPRIVATE long ImplDoAction( sal_Bool bCallEndScroll ); - SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, sal_Bool bCallAction = sal_True ); + SAL_DLLPRIVATE long ImplScroll( long nNewPos, bool bCallEndScroll ); + SAL_DLLPRIVATE long ImplDoAction( bool bCallEndScroll ); + SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true ); SAL_DLLPRIVATE void ImplInvert(); - SAL_DLLPRIVATE sal_Bool ImplDrawNative( sal_uInt16 nDrawFlags ); + SAL_DLLPRIVATE bool ImplDrawNative( sal_uInt16 nDrawFlags ); SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos ); SAL_DLLPRIVATE Size getCurrentCalcSize() const; DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); @@ -113,9 +113,9 @@ public: long DoScroll( long nNewPos ); long DoScrollAction( ScrollType eScrollType ); - void EnableDrag( sal_Bool bEnable = sal_True ) + void EnableDrag( bool bEnable = true ) { mbFullDrag = bEnable; } - sal_Bool IsDragEnabled() const { return mbFullDrag; } + bool IsDragEnabled() const { return mbFullDrag; } void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 0b3d6975b75f..d6bb2d3cd955 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -51,10 +51,10 @@ public: // move cursor, at the same time match cursor position to the selection // starting at anchor. sal_True == Ok - virtual sal_Bool SetCursorAtPoint( const Point& rPointPixel, + virtual bool SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False ) = 0; - virtual sal_Bool IsSelectionAtPoint( const Point& rPointPixel ) = 0; + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) = 0; virtual void DeselectAtPoint( const Point& rPointPixel ) = 0; // delete anchor & deselect all virtual void DeselectAll() = 0; @@ -87,7 +87,7 @@ private: sal_uInt16 nFlags; DECL_DLLPRIVATE_LINK( ImpWatchDog, void* ); - inline sal_Bool ShouldDeselect( sal_Bool bModifierKey1 ) const; + inline bool ShouldDeselect( bool bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: @@ -97,12 +97,12 @@ public: ~SelectionEngine(); // sal_True: Event was processed by Selection Engine - sal_Bool SelMouseButtonDown( const MouseEvent& rMEvt ); - sal_Bool SelMouseButtonUp( const MouseEvent& rMEvt ); - sal_Bool SelMouseMove( const MouseEvent& rMEvt ); + bool SelMouseButtonDown( const MouseEvent& rMEvt ); + bool SelMouseButtonUp( const MouseEvent& rMEvt ); + bool SelMouseMove( const MouseEvent& rMEvt ); // Keyboard - void CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 ); + void CursorPosChanging( bool bShift, bool bMod1 ); // is needed to generate a Move event via a Timer // when the mouse is outside the area @@ -110,13 +110,13 @@ public: { aArea = rNewArea; } const Rectangle& GetVisibleArea() const { return aArea; } - void SetAddMode( sal_Bool); - sal_Bool IsAddMode() const; + void SetAddMode( bool); + bool IsAddMode() const; - void AddAlways( sal_Bool bOn ); - sal_Bool IsAlwaysAdding() const; + void AddAlways( bool bOn ); + bool IsAlwaysAdding() const; - void EnableDrag( sal_Bool bOn ); + void EnableDrag( bool bOn ); void SetSelectionMode( SelectionMode eMode ); SelectionMode GetSelectionMode() const { return eSelMode; } @@ -136,18 +136,18 @@ public: { nLockedMods = nModifiers; } sal_uInt16 GetLockedModifiers() const { return nLockedMods; } - sal_Bool IsInSelection() const; + bool IsInSelection() const; void Reset(); void Command( const CommandEvent& rCEvt ); - sal_Bool HasAnchor() const; - void SetAnchor( sal_Bool bAnchor ); + bool HasAnchor() const; + void SetAnchor( bool bAnchor ); void SetUpdateInterval( sal_uLong nInterval ); // wird im Ctor eingeschaltet - void ExpandSelectionOnMouseMove( sal_Bool bExpand = sal_True ) + void ExpandSelectionOnMouseMove( bool bExpand = true ) { if( bExpand ) nFlags |= SELENG_EXPANDONMOVE; @@ -156,15 +156,15 @@ public: } }; -inline sal_Bool SelectionEngine::IsAddMode() const +inline bool SelectionEngine::IsAddMode() const { if ( nFlags & (SELENG_IN_ADD | SELENG_ADD_ALW) ) - return sal_True; + return true; else - return sal_False; + return false; } -inline void SelectionEngine::SetAddMode( sal_Bool bNewMode ) +inline void SelectionEngine::SetAddMode( bool bNewMode ) { if ( bNewMode ) nFlags |= SELENG_IN_ADD; @@ -172,7 +172,7 @@ inline void SelectionEngine::SetAddMode( sal_Bool bNewMode ) nFlags &= (~SELENG_IN_ADD); } -inline void SelectionEngine::EnableDrag( sal_Bool bOn ) +inline void SelectionEngine::EnableDrag( bool bOn ) { if ( bOn ) nFlags |= SELENG_DRG_ENAB; @@ -180,7 +180,7 @@ inline void SelectionEngine::EnableDrag( sal_Bool bOn ) nFlags &= (~SELENG_DRG_ENAB); } -inline void SelectionEngine::AddAlways( sal_Bool bOn ) +inline void SelectionEngine::AddAlways( bool bOn ) { if( bOn ) nFlags |= SELENG_ADD_ALW; @@ -188,31 +188,31 @@ inline void SelectionEngine::AddAlways( sal_Bool bOn ) nFlags &= (~SELENG_ADD_ALW); } -inline sal_Bool SelectionEngine::IsAlwaysAdding() const +inline bool SelectionEngine::IsAlwaysAdding() const { if ( nFlags & SELENG_ADD_ALW ) - return sal_True; + return true; else - return sal_False; + return false; } -inline sal_Bool SelectionEngine::IsInSelection() const +inline bool SelectionEngine::IsInSelection() const { if ( nFlags & SELENG_IN_SEL ) - return sal_True; + return true; else - return sal_False; + return false; } -inline sal_Bool SelectionEngine::HasAnchor() const +inline bool SelectionEngine::HasAnchor() const { if ( nFlags & SELENG_HAS_ANCH ) - return sal_True; + return true; else - return sal_False; + return false; } -inline void SelectionEngine::SetAnchor( sal_Bool bAnchor ) +inline void SelectionEngine::SetAnchor( bool bAnchor ) { if ( bAnchor ) nFlags |= SELENG_HAS_ANCH; diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index d9711de3eb15..0173b31ca240 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -62,7 +62,7 @@ private: sal_uInt16 mnDragLinkCode; sal_uInt16 mnContextMenuCode; sal_uInt16 mnContextMenuClicks; - sal_Bool mbContextMenuDown; + bool mbContextMenuDown; sal_uLong mnScrollRepeat; sal_uLong mnButtonStartRepeat; sal_uLong mnButtonRepeat; @@ -155,9 +155,9 @@ public: { CopyData(); mpData->mnContextMenuClicks = nClicks; } sal_uInt16 GetContextMenuClicks() const { return mpData->mnContextMenuClicks; } - void SetContextMenuDown( sal_Bool bDown ) + void SetContextMenuDown( bool bDown ) { CopyData(); mpData->mbContextMenuDown = bDown; } - sal_Bool GetContextMenuDown() const + bool GetContextMenuDown() const { return mpData->mbContextMenuDown; } void SetScrollRepeat( sal_uLong nRepeat ) @@ -198,8 +198,8 @@ public: const MouseSettings& operator =( const MouseSettings& rSet ); - sal_Bool operator ==( const MouseSettings& rSet ) const; - sal_Bool operator !=( const MouseSettings& rSet ) const + bool operator ==( const MouseSettings& rSet ) const; + bool operator !=( const MouseSettings& rSet ) const { return !(*this == rSet); } }; @@ -231,6 +231,8 @@ struct FrameStyle {} }; +enum AutoState { AUTO_STATE_OFF, AUTO_STATE_ON, AUTO_STATE_AUTO }; + // ----------------- // - ImplStyleData - // ----------------- @@ -327,25 +329,25 @@ private: sal_uLong mnLogoDisplayTime; sal_uLong mnDisplayOptions; sal_uLong mnToolbarIconSize; - sal_uLong mnUseFlatMenus; + bool mnUseFlatMenus; sal_uLong mnOptions; sal_uInt16 mnScreenZoom; sal_uInt16 mnScreenFontZoom; - sal_uInt16 mnHighContrast; - sal_uInt16 mnUseSystemUIFonts; + bool mnHighContrast; + bool mnUseSystemUIFonts; sal_uInt16 mnAutoMnemonic; - sal_uInt16 mnUseImagesInMenus; - sal_uLong mnUseFlatBorders; - sal_Bool mbPreferredUseImagesInMenus; + AutoState mnUseImagesInMenus; + bool mnUseFlatBorders; + bool mbPreferredUseImagesInMenus; long mnMinThumbSize; sal_uLong mnSymbolsStyle; sal_uLong mnPreferredSymbolsStyle; - sal_uInt16 mnSkipDisabledInMenus; - sal_Bool mbHideDisabledMenuItems; - sal_Bool mbAcceleratorsInContextMenus; + bool mnSkipDisabledInMenus; + bool mbHideDisabledMenuItems; + bool mbAcceleratorsInContextMenus; //mbPrimaryButtonWarpsSlider == true for "jump to here" behavior for primary button, otherwise //primary means scroll by single page. Secondary button takes the alternative behaviour - sal_Bool mbPrimaryButtonWarpsSlider; + bool mbPrimaryButtonWarpsSlider; Wallpaper maWorkspaceGradient; DialogStyle maDialogStyle; FrameStyle maFrameStyle; @@ -360,7 +362,7 @@ private: Size maListBoxPreviewDefaultLogicSize; Size maListBoxPreviewDefaultPixelSize; sal_uInt16 mnListBoxPreviewDefaultLineWidth; - sal_Bool mbPreviewUsesCheckeredBackground; + bool mbPreviewUsesCheckeredBackground; OUString maPersonaHeaderFooter; ///< Cache the settings to detect changes. @@ -425,10 +427,6 @@ private: #define STYLE_SYMBOLS_TANGO_TESTING ((sal_uLong)10) #define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)11) -#define STYLE_MENUIMAGES_OFF ((sal_uInt16)0) -#define STYLE_MENUIMAGES_ON ((sal_uInt16)1) -#define STYLE_MENUIMAGES_AUTO ((sal_uInt16)2) - #define STYLE_CURSOR_NOBLINKTIME ((sal_uLong)0xFFFFFFFF) class VCL_DLLPUBLIC StyleSettings @@ -642,44 +640,44 @@ public: const Color& GetInactiveTabColor() const { return mpData->maInactiveTabColor; } - void SetHighContrastMode( sal_Bool bHighContrast ) + void SetHighContrastMode( bool bHighContrast ) { CopyData(); mpData->mnHighContrast = bHighContrast; } - sal_Bool GetHighContrastMode() const - { return (sal_Bool) mpData->mnHighContrast; } - void SetUseSystemUIFonts( sal_Bool bUseSystemUIFonts ) + bool GetHighContrastMode() const + { return mpData->mnHighContrast; } + void SetUseSystemUIFonts( bool bUseSystemUIFonts ) { CopyData(); mpData->mnUseSystemUIFonts = bUseSystemUIFonts; } - sal_Bool GetUseSystemUIFonts() const - { return (sal_Bool) mpData->mnUseSystemUIFonts; } - void SetUseFlatBorders( sal_Bool bUseFlatBorders ) + bool GetUseSystemUIFonts() const + { return mpData->mnUseSystemUIFonts; } + void SetUseFlatBorders( bool bUseFlatBorders ) { CopyData(); mpData->mnUseFlatBorders = bUseFlatBorders; } - sal_Bool GetUseFlatBorders() const - { return (sal_Bool) mpData->mnUseFlatBorders; } - void SetUseFlatMenus( sal_Bool bUseFlatMenus ) + bool GetUseFlatBorders() const + { return mpData->mnUseFlatBorders; } + void SetUseFlatMenus( bool bUseFlatMenus ) { CopyData(); mpData->mnUseFlatMenus = bUseFlatMenus; } - sal_Bool GetUseFlatMenus() const - { return (sal_Bool) mpData->mnUseFlatMenus; } - void SetUseImagesInMenus( sal_Bool bUseImagesInMenus ) - { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus; } - sal_Bool GetUseImagesInMenus() const; - void SetPreferredUseImagesInMenus( sal_Bool bPreferredUseImagesInMenus ) + bool GetUseFlatMenus() const + { return mpData->mnUseFlatMenus; } + void SetUseImagesInMenus( bool bUseImagesInMenus ) + { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus ? AUTO_STATE_ON : AUTO_STATE_OFF; } + bool GetUseImagesInMenus() const; + void SetPreferredUseImagesInMenus( bool bPreferredUseImagesInMenus ) { CopyData(); mpData->mbPreferredUseImagesInMenus = bPreferredUseImagesInMenus; } - sal_Bool GetPreferredUseImagesInMenus() const + bool GetPreferredUseImagesInMenus() const { return mpData->mbPreferredUseImagesInMenus; } - void SetSkipDisabledInMenus( sal_Bool bSkipDisabledInMenus ) + void SetSkipDisabledInMenus( bool bSkipDisabledInMenus ) { CopyData(); mpData->mnSkipDisabledInMenus = bSkipDisabledInMenus; } - sal_Bool GetSkipDisabledInMenus() const - { return (sal_Bool) mpData->mnSkipDisabledInMenus; } - void SetHideDisabledMenuItems( sal_Bool bHideDisabledMenuItems ) + bool GetSkipDisabledInMenus() const + { return mpData->mnSkipDisabledInMenus; } + void SetHideDisabledMenuItems( bool bHideDisabledMenuItems ) { CopyData(); mpData->mbHideDisabledMenuItems = bHideDisabledMenuItems; } - sal_Bool GetHideDisabledMenuItems() const + bool GetHideDisabledMenuItems() const { return mpData->mbHideDisabledMenuItems; } - void SetAcceleratorsInContextMenus( sal_Bool bAcceleratorsInContextMenus ) + void SetAcceleratorsInContextMenus( bool bAcceleratorsInContextMenus ) { CopyData(); mpData->mbAcceleratorsInContextMenus = bAcceleratorsInContextMenus; } - sal_Bool GetAcceleratorsInContextMenus() const + bool GetAcceleratorsInContextMenus() const { return mpData->mbAcceleratorsInContextMenus; } - void SetPrimaryButtonWarpsSlider( sal_Bool bPrimaryButtonWarpsSlider ) + void SetPrimaryButtonWarpsSlider( bool bPrimaryButtonWarpsSlider ) { CopyData(); mpData->mbPrimaryButtonWarpsSlider = bPrimaryButtonWarpsSlider; } - sal_Bool GetPrimaryButtonWarpsSlider() const + bool GetPrimaryButtonWarpsSlider() const { return mpData->mbPrimaryButtonWarpsSlider; } void SetCairoFontOptions( const void *pOptions ) @@ -837,9 +835,9 @@ public: { CopyData(); mpData->mnOptions = nOptions; } sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetAutoMnemonic( sal_Bool bAutoMnemonic ) + void SetAutoMnemonic( bool bAutoMnemonic ) { CopyData(); mpData->mnAutoMnemonic = (sal_uInt16)bAutoMnemonic; } - sal_Bool GetAutoMnemonic() const + bool GetAutoMnemonic() const { return mpData->mnAutoMnemonic ? sal_True : sal_False; } void SetFontColor( const Color& rColor ) @@ -944,8 +942,8 @@ public: const StyleSettings& operator =( const StyleSettings& rSet ); - sal_Bool operator ==( const StyleSettings& rSet ) const; - sal_Bool operator !=( const StyleSettings& rSet ) const + bool operator ==( const StyleSettings& rSet ) const; + bool operator !=( const StyleSettings& rSet ) const { return !(*this == rSet); } protected: @@ -966,9 +964,9 @@ class ImplMiscData private: sal_uLong mnRefCount; - sal_uInt16 mnEnableATT; - sal_Bool mbEnableLocalizedDecimalSep; - sal_uInt16 mnDisablePrinting; + AutoState mnEnableATT; + bool mbEnableLocalizedDecimalSep; + AutoState mnDisablePrinting; }; // ---------------- @@ -990,14 +988,14 @@ public: #ifdef WNT void SetEnableATToolSupport( sal_Bool bEnable ); #endif - sal_Bool GetEnableATToolSupport() const; - sal_Bool GetDisablePrinting() const; - void SetEnableLocalizedDecimalSep( sal_Bool bEnable ); - sal_Bool GetEnableLocalizedDecimalSep() const; + bool GetEnableATToolSupport() const; + bool GetDisablePrinting() const; + void SetEnableLocalizedDecimalSep( bool bEnable ); + bool GetEnableLocalizedDecimalSep() const; const MiscSettings& operator =( const MiscSettings& rSet ); - sal_Bool operator ==( const MiscSettings& rSet ) const; - sal_Bool operator !=( const MiscSettings& rSet ) const + bool operator ==( const MiscSettings& rSet ) const; + bool operator !=( const MiscSettings& rSet ) const { return !(*this == rSet); } }; @@ -1055,8 +1053,8 @@ public: const HelpSettings& operator =( const HelpSettings& rSet ); - sal_Bool operator ==( const HelpSettings& rSet ) const; - sal_Bool operator !=( const HelpSettings& rSet ) const + bool operator ==( const HelpSettings& rSet ) const; + bool operator !=( const HelpSettings& rSet ) const { return !(*this == rSet); } }; @@ -1165,8 +1163,8 @@ public: const AllSettings& operator =( const AllSettings& rSet ); - sal_Bool operator ==( const AllSettings& rSet ) const; - sal_Bool operator !=( const AllSettings& rSet ) const + bool operator ==( const AllSettings& rSet ) const; + bool operator !=( const AllSettings& rSet ) const { return !(*this == rSet); } static void LocaleSettingsChanged( sal_uInt32 nHint ); SvtSysLocale& GetSysLocale() { return mpData->maSysLocale; } diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index ef24221db227..ca11facf2b1e 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -49,8 +49,8 @@ private: sal_uInt16 mnDragDraw; sal_uInt16 mnStateFlags; ScrollType meScrollType; - sal_Bool mbCalcSize; - sal_Bool mbFullDrag; + bool mbCalcSize; + bool mbFullDrag; Link maSlideHdl; Link maEndSlideHdl; @@ -58,16 +58,16 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplUpdateRects( sal_Bool bUpdate = sal_True ); + SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos ); - SAL_DLLPRIVATE void ImplCalc( sal_Bool bUpdate = sal_True ); + SAL_DLLPRIVATE void ImplCalc( bool bUpdate = true ); SAL_DLLPRIVATE void ImplDraw( sal_uInt16 nDrawFlags ); - SAL_DLLPRIVATE sal_Bool ImplIsPageUp( const Point& rPos ); - SAL_DLLPRIVATE sal_Bool ImplIsPageDown( const Point& rPos ); - SAL_DLLPRIVATE long ImplSlide( long nNewPos, sal_Bool bCallEndSlide ); - SAL_DLLPRIVATE long ImplDoAction( sal_Bool bCallEndSlide ); - SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, sal_Bool bCallAction = sal_True ); + SAL_DLLPRIVATE bool ImplIsPageUp( const Point& rPos ); + SAL_DLLPRIVATE bool ImplIsPageDown( const Point& rPos ); + SAL_DLLPRIVATE long ImplSlide( long nNewPos, bool bCallEndSlide ); + SAL_DLLPRIVATE long ImplDoAction( bool bCallEndSlide ); + SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true ); SAL_DLLPRIVATE long ImplDoSlide( long nNewPos ); SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); @@ -87,9 +87,9 @@ public: virtual void Slide(); virtual void EndSlide(); - void EnableDrag( sal_Bool bEnable = sal_True ) + void EnableDrag( bool bEnable = true ) { mbFullDrag = bEnable; } - sal_Bool IsDragEnabled() const { return mbFullDrag; } + bool IsDragEnabled() const { return mbFullDrag; } long GetRangeMin() const { return mnMinRange; } long GetRangeMax() const { return mnMaxRange; } diff --git a/include/vcl/spin.h b/include/vcl/spin.h index a53e04b54d37..98ac18b2fd6c 100644 --- a/include/vcl/spin.h +++ b/include/vcl/spin.h @@ -26,10 +26,10 @@ class OutputDevice; void ImplDrawSpinButton( OutputDevice* pOutDev, const Rectangle& rUpperRect, const Rectangle& rLowerRect, - sal_Bool bUpperIn, sal_Bool bLowerIn, - sal_Bool bUpperEnabled = sal_True, - sal_Bool bLowerEnabled = sal_True, - sal_Bool bHorz = sal_False, sal_Bool bMirrorHorz = sal_False ); + bool bUpperIn, bool bLowerIn, + bool bUpperEnabled = sal_True, + bool bLowerEnabled = sal_True, + bool bHorz = sal_False, bool bMirrorHorz = sal_False ); #endif // INCLUDED_VCL_SPIN_H diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index dedff1495a0b..a48ae89d4b7d 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -36,13 +36,13 @@ private: Rectangle maUpperRect; Rectangle maLowerRect; Rectangle maFocusRect; - sal_Bool mbRepeat : 1; - sal_Bool mbUpperIn : 1; - sal_Bool mbLowerIn : 1; - sal_Bool mbInitialUp : 1; - sal_Bool mbInitialDown : 1; - sal_Bool mbHorz : 1; - sal_Bool mbUpperIsFocused : 1; + bool mbRepeat : 1; + bool mbUpperIn : 1; + bool mbLowerIn : 1; + bool mbInitialUp : 1; + bool mbInitialDown : 1; + bool mbHorz : 1; + bool mbUpperIsFocused : 1; Link maUpHdlLink; Link maDownHdlLink; long mnMinRange; @@ -92,14 +92,14 @@ public: private: // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. - SAL_DLLPRIVATE sal_Bool ImplMoveFocus( sal_Bool _bUpper ); - SAL_DLLPRIVATE void ImplCalcFocusRect( sal_Bool _bUpper ); + SAL_DLLPRIVATE bool ImplMoveFocus( bool _bUpper ); + SAL_DLLPRIVATE void ImplCalcFocusRect( bool _bUpper ); - SAL_DLLPRIVATE inline sal_Bool ImplIsUpperEnabled( ) const + SAL_DLLPRIVATE inline bool ImplIsUpperEnabled( ) const { return mnValue + mnValueStep <= mnMaxRange; } - SAL_DLLPRIVATE inline sal_Bool ImplIsLowerEnabled( ) const + SAL_DLLPRIVATE inline bool ImplIsLowerEnabled( ) const { return mnValue >= mnMinRange + mnValueStep; } diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 06e31e4c446d..bfb69b6431e1 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -41,7 +41,7 @@ protected: Link maDownHdlLink; Link maFirstHdlLink; Link maLastHdlLink; - sal_Bool mbRepeat:1, + bool mbRepeat:1, mbSpin:1, mbInitialUp:1, mbInitialDown:1, @@ -74,7 +74,7 @@ public: explicit SpinField( Window* pParent, const ResId& ); virtual ~SpinField(); - virtual sal_Bool ShowDropDown( sal_Bool bShow ); + virtual bool ShowDropDown( sal_Bool bShow ); virtual void Up(); virtual void Down(); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 3e868828f402..ab60906564bd 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -34,9 +34,9 @@ private: long mnStartSplitPos; Point maDragPos; Rectangle maDragRect; - sal_Bool mbHorzSplit; - sal_Bool mbDragFull; - sal_Bool mbKbdSplitting; + bool mbHorzSplit; + bool mbDragFull; + bool mbKbdSplitting; long mbInKeyEvent; long mnKeyboardStepSize; Link maStartSplitHdl; @@ -48,7 +48,7 @@ private: SAL_DLLPRIVATE void ImplSplitMousePos( Point& rPos ); SAL_DLLPRIVATE void ImplStartKbdSplitting(); SAL_DLLPRIVATE void ImplKbdTracking( KeyCode aKeyCode ); - SAL_DLLPRIVATE sal_Bool ImplSplitterActive(); + SAL_DLLPRIVATE bool ImplSplitterActive(); SAL_DLLPRIVATE Splitter* ImplFindSibling(); SAL_DLLPRIVATE void ImplRestoreSplitter(); SAL_DLLPRIVATE void ImplInitHorVer(bool bNew); @@ -93,7 +93,7 @@ public: virtual void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } - sal_Bool IsHorizontal() const { return mbHorzSplit; } + bool IsHorizontal() const { return mbHorzSplit; } void SetHorizontal(bool bNew); // set the stepsize of the splitter for cursor movement diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 07f3407f46ce..a2d715006c16 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -60,7 +60,7 @@ private: sal_uInt16 mnSplitTest; sal_uInt16 mnSplitPos; sal_uInt16 mnMouseModifier; - sal_Bool mbDragFull:1, + bool mbDragFull:1, mbHorz:1, mbBottomRight:1, mbCalc:1, @@ -94,29 +94,29 @@ private: SAL_DLLPRIVATE void ImplUpdate(); SAL_DLLPRIVATE void ImplSetWindowSize( long nDelta ); SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos ); - SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool bTest ) const; - SAL_DLLPRIVATE void ImplGetAutoHideRect( Rectangle& rRect, sal_Bool bTest = sal_False ) const; - SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, sal_Bool bTest = sal_False ) const; - SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, sal_Bool bTest = sal_False ) const; + SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) const; + SAL_DLLPRIVATE void ImplGetAutoHideRect( Rectangle& rRect, bool bTest = false ) const; + SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, bool bTest = false ) const; + SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, bool bTest = false ) const; SAL_DLLPRIVATE void ImplDrawButtonRect( const Rectangle& rRect, long nSize ); - SAL_DLLPRIVATE void ImplDrawAutoHide( sal_Bool bInPaint ); - SAL_DLLPRIVATE void ImplDrawFadeIn( sal_Bool bInPaint ); - SAL_DLLPRIVATE void ImplDrawFadeOut( sal_Bool bInPaint ); + SAL_DLLPRIVATE void ImplDrawAutoHide( bool bInPaint ); + SAL_DLLPRIVATE void ImplDrawFadeIn( bool bInPaint ); + SAL_DLLPRIVATE void ImplDrawFadeOut( bool bInPaint ); SAL_DLLPRIVATE void ImplNewAlign(); - SAL_DLLPRIVATE void ImplDrawGrip( const Rectangle& rRect, sal_Bool bHorz, sal_Bool bLeft ); - SAL_DLLPRIVATE void ImplDrawFadeArrow( const Point& rPt, sal_Bool bHorz, sal_Bool bLeft ); + SAL_DLLPRIVATE void ImplDrawGrip( const Rectangle& rRect, bool bHorz, bool bLeft ); + SAL_DLLPRIVATE void ImplDrawFadeArrow( const Point& rPt, bool bHorz, bool bLeft ); SAL_DLLPRIVATE void ImplStartSplit( const MouseEvent& rMEvt ); static SAL_DLLPRIVATE void ImplDrawBorder( SplitWindow* pWin ); static SAL_DLLPRIVATE void ImplDrawBorderLine( SplitWindow* pWin ); - static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, sal_Bool bHide, - sal_Bool bRows, sal_Bool bDown = sal_True ); + static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, bool bHide, + bool bRows, bool bDown = true ); static SAL_DLLPRIVATE void ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet ); static SAL_DLLPRIVATE void ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect, const Wallpaper* pWall, const Bitmap* pBitmap ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, - sal_Bool bRows, sal_Bool bDown = sal_True ); + bool bRows, bool bDown = true ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( SplitWindow* pWindow, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos ); static SAL_DLLPRIVATE void ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos ); @@ -152,12 +152,12 @@ public: void InsertItem( sal_uInt16 nId, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); - void RemoveItem( sal_uInt16 nId, sal_Bool bHide = sal_True ); + void RemoveItem( sal_uInt16 nId, bool bHide = true ); void Clear(); void SplitItem( sal_uInt16 nId, long nNewSize, - sal_Bool bPropSmall = sal_False, - sal_Bool bPropGreat = sal_False ); + bool bPropSmall = false, + bool bPropGreat = false ); void SetItemSize( sal_uInt16 nId, long nNewSize ); long GetItemSize( sal_uInt16 nId ) const; /** Set a range that limits the (variable part of the) size with an @@ -178,32 +178,32 @@ public: sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; sal_uInt16 GetItemCount( sal_uInt16 nSetId = 0 ) const; - sal_Bool IsItemValid( sal_uInt16 nId ) const; + bool IsItemValid( sal_uInt16 nId ) const; - sal_Bool IsNoAlign() const { return mbNoAlign; } + bool IsNoAlign() const { return mbNoAlign; } void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); WindowAlign GetAlign() const { return meAlign; } - sal_Bool IsHorizontal() const { return mbHorz; } + bool IsHorizontal() const { return mbHorz; } - sal_Bool IsSplitting() const { return IsTracking(); } + bool IsSplitting() const { return IsTracking(); } void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } long GetMaxSizePixel() const { return mnMaxSize; } Size CalcLayoutSizePixel( const Size& aNewSize ); - void ShowAutoHideButton( sal_Bool bShow = sal_True ); - sal_Bool IsAutoHideButtonVisible() const { return mbAutoHide; } - void ShowFadeInHideButton( sal_Bool bShow = sal_True ); - void ShowFadeInButton( sal_Bool bShow = sal_True ) { ShowFadeInHideButton( bShow ); } - sal_Bool IsFadeInButtonVisible() const { return mbFadeIn; } - void ShowFadeOutButton( sal_Bool bShow = sal_True ); - sal_Bool IsFadeOutButtonVisible() const { return mbFadeOut; } + void ShowAutoHideButton( bool bShow = true ); + bool IsAutoHideButtonVisible() const { return mbAutoHide; } + void ShowFadeInHideButton( bool bShow = true ); + void ShowFadeInButton( bool bShow = true ) { ShowFadeInHideButton( bShow ); } + bool IsFadeInButtonVisible() const { return mbFadeIn; } + void ShowFadeOutButton( bool bShow = true ); + bool IsFadeOutButtonVisible() const { return mbFadeOut; } long GetFadeInSize() const; - sal_Bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } + bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } - void SetAutoHideState( sal_Bool bAutoHide ); - sal_Bool GetAutoHideState() const { return mbAutoHideIn; } + void SetAutoHideState( bool bAutoHide ); + bool GetAutoHideState() const { return mbAutoHideIn; } void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } const Link& GetStartSplitHdl() const { return maStartSplitHdl; } diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 3f424e69ac6b..1d9271645092 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -88,22 +88,22 @@ private: sal_uInt16 mnCurItemId; sal_uInt16 mnPercent; sal_uInt16 mnPercentCount; - sal_Bool mbVisibleItems; - sal_Bool mbFormat; - sal_Bool mbProgressMode; - sal_Bool mbInUserDraw; + bool mbVisibleItems; + bool mbFormat; + bool mbProgressMode; + bool mbInUserDraw; Link maClickHdl; Link maDoubleClickHdl; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplFormat(); - SAL_DLLPRIVATE sal_Bool ImplIsItemUpdate(); + SAL_DLLPRIVATE bool ImplIsItemUpdate(); using OutputDevice::ImplDrawText; - SAL_DLLPRIVATE void ImplDrawText( sal_Bool bOffScreen, long nOldTextWidth ); - SAL_DLLPRIVATE void ImplDrawItem( sal_Bool bOffScreen, sal_uInt16 nPos, sal_Bool bDrawText, sal_Bool bDrawFrame ); - SAL_DLLPRIVATE void ImplDrawProgress( sal_Bool bPaint, + SAL_DLLPRIVATE void ImplDrawText( bool bOffScreen, long nOldTextWidth ); + SAL_DLLPRIVATE void ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame ); + SAL_DLLPRIVATE void ImplDrawProgress( bool bPaint, sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); SAL_DLLPRIVATE void ImplCalcProgressRect(); SAL_DLLPRIVATE Rectangle ImplGetItemRectPos( sal_uInt16 nPos ) const; @@ -134,9 +134,9 @@ public: void ShowItem( sal_uInt16 nItemId ); void HideItem( sal_uInt16 nItemId ); - sal_Bool IsItemVisible( sal_uInt16 nItemId ) const; + bool IsItemVisible( sal_uInt16 nItemId ) const; - sal_Bool AreItemsVisible() const { return mbVisibleItems; } + bool AreItemsVisible() const { return mbVisibleItems; } void RedrawItem( sal_uInt16 nItemId ); @@ -178,7 +178,7 @@ public: void StartProgressMode( const OUString& rText ); void SetProgressValue( sal_uInt16 nPercent ); void EndProgressMode(); - sal_Bool IsProgressMode() const { return mbProgressMode; } + bool IsProgressMode() const { return mbProgressMode; } void SetText( const OUString& rText ); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 3f86d1c54f3e..1b8f6e1deab0 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -348,7 +348,7 @@ public: @returns true if exited successfully, false if not able to fully exit */ - virtual sal_Bool QueryExit(); + virtual bool QueryExit(); /** Send user event. @@ -626,7 +626,7 @@ public: @see IsInExecute, IsInModalMode */ - static sal_Bool IsInMain(); + static bool IsInMain(); /** Queries whether the application is in the event loop @@ -634,7 +634,7 @@ public: @see IsInMain, IsInModalMode */ - static sal_Bool IsInExecute(); + static bool IsInExecute(); /** Queries whether application has a modal dialog active. @@ -642,7 +642,7 @@ public: @see IsInMain, IsInExecute */ - static sal_Bool IsInModalMode(); + static bool IsInModalMode(); /** Return how many events are being dispatched. @@ -679,7 +679,7 @@ public: @returns true if UI is captured, false if not */ - static sal_Bool IsUICaptured(); + static bool IsUICaptured(); /** @name Settings @@ -836,7 +836,7 @@ public: @see PostKeyEvent */ - static sal_Bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -902,7 +902,7 @@ public: @return true if there is a default window and the event could be posted to it successfully. */ - static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); + static bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); /** Remove user event based on event ID @@ -920,7 +920,7 @@ public: @return true if the handler was inserted successfully, false if it couldn't be inserted. */ - static sal_Bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); + static bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); /** Remove an idle handler from the application. @@ -1173,7 +1173,7 @@ public: @see RemoveAccel */ - static sal_Bool InsertAccel( Accelerator* pAccel ); + static bool InsertAccel( Accelerator* pAccel ); /** Remove accelerator @@ -1189,7 +1189,7 @@ public: @see IsAutoMnemonicEnabled */ - static void EnableAutoMnemonic( sal_Bool bEnabled = sal_True ); + static void EnableAutoMnemonic( bool bEnabled = true ); /** Determines if auto-mnemonics are enabled. @@ -1197,7 +1197,7 @@ public: @see EnableAutoMnemonic */ - static sal_Bool IsAutoMnemonicEnabled(); + static bool IsAutoMnemonicEnabled(); /** Get the number of reserved key codes used by the application. @@ -1250,7 +1250,7 @@ public: @see EnableAutoHelpId */ - static void EnableAutoHelpId( sal_Bool bEnabled = sal_True ); + static void EnableAutoHelpId( bool bEnabled = true ); /** Determines if auto-help is enabled or disabled. @@ -1258,7 +1258,7 @@ public: @see EnableAutoHelpId */ - static sal_Bool IsAutoHelpIdEnabled(); + static bool IsAutoHelpIdEnabled(); ///@} @@ -1316,7 +1316,7 @@ public: @see GetDialogCancelMode, SetDialogCancelMode */ - static sal_Bool IsDialogCancelEnabled(); + static bool IsDialogCancelEnabled(); /** Make a dialog box a system window or not. @@ -1371,7 +1371,7 @@ public: @return UNO wrapper object. */ - static UnoWrapperBase* GetUnoWrapper( sal_Bool bCreateIfNotExists = sal_True ); + static UnoWrapperBase* GetUnoWrapper( bool bCreateIfNotExists = true ); /** Sets the application's UNO Wrapper object. @@ -1419,7 +1419,7 @@ public: @see EnableHeadlessMode, IsHeadlessModeRequested */ - static sal_Bool IsHeadlessModeEnabled(); + static bool IsHeadlessModeEnabled(); /** Check command line arguments for \code --headless \endcode diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 0238da24333b..1fe833eda532 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -30,7 +30,7 @@ class VCL_DLLPUBLIC SystemChildWindow : public Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_False ); + SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv ); // Copy assignment is forbidden and not implemented. @@ -40,19 +40,19 @@ private: public: explicit SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData - explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True ); + explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); virtual ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; // per default systemchildwindows erase their background for better plugin support // however, this might not always be required - void EnableEraseBackground( sal_Bool bEnable = sal_True ); - void SetForwardKey( sal_Bool bEnable ); + void EnableEraseBackground( bool bEnable = true ); + void SetForwardKey( bool bEnable ); // return the platform specific handle/id of this window; // in case the flag bUseJava is set, a java compatible overlay window // is created on which other java windows can be created (plugin interface) - sal_IntPtr GetParentWindowHandle( sal_Bool bUseJava = sal_False ); + sal_IntPtr GetParentWindowHandle( bool bUseJava = false ); }; #endif // INCLUDED_VCL_SYSCHILD_HXX diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 8223483cbac3..9b25c950a522 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -143,19 +143,19 @@ private: Size maOrgSize; Size maRollUpOutSize; Size maMinOutSize; - sal_Bool mbPined; - sal_Bool mbRollUp; - sal_Bool mbRollFunc; - sal_Bool mbDockBtn; - sal_Bool mbHideBtn; - sal_Bool mbSysChild; + bool mbPined; + bool mbRollUp; + bool mbRollFunc; + bool mbDockBtn; + bool mbHideBtn; + bool mbSysChild; sal_uInt16 mnMenuBarMode; sal_uInt16 mnIcon; ImplData* mpImplData; public: using Window::ImplIsInTaskPaneList; - SAL_DLLPRIVATE sal_Bool ImplIsInTaskPaneList( Window* pWin ); + SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin ); private: // Default construction is forbidden and not implemented. @@ -178,7 +178,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual sal_Bool Close(); + virtual bool Close(); virtual void TitleButtonClick( sal_uInt16 nButton ); virtual void Pin(); virtual void Roll(); @@ -190,18 +190,18 @@ public: // separately from the window title void SetRepresentedURL( const OUString& ); - void EnableSaveBackground( sal_Bool bSave = sal_True ); - sal_Bool IsSaveBackgroundEnabled() const; + void EnableSaveBackground( bool bSave = true ); + bool IsSaveBackgroundEnabled() const; - void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); - sal_Bool IsTitleButtonVisible( sal_uInt16 nButton ) const; + void ShowTitleButton( sal_uInt16 nButton, bool bVisible = true ); + bool IsTitleButtonVisible( sal_uInt16 nButton ) const; - void SetPin( sal_Bool bPin ); - sal_Bool IsPined() const { return mbPined; } + void SetPin( bool bPin ); + bool IsPined() const { return mbPined; } void RollUp(); void RollDown(); - sal_Bool IsRollUp() const { return mbRollUp; } + bool IsRollUp() const { return mbRollUp; } void SetRollUpOutputSizePixel( const Size& rSize ) { maRollUpOutSize = rSize; } Size GetRollUpOutputSizePixel() const { return maRollUpOutSize; } diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 663c746018f2..ba483b82e622 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -44,22 +44,22 @@ private: long mnMaxPageWidth; sal_uInt16 mnActPageId; sal_uInt16 mnCurPageId; - sal_Bool mbFormat; - sal_Bool mbRestoreHelpId; - sal_Bool mbRestoreUnqId; - sal_Bool mbSmallInvalidate; + bool mbFormat; + bool mbRestoreHelpId; + bool mbRestoreUnqId; + bool mbSmallInvalidate; bool mbLayoutDirty; Link maActivateHdl; Link maDeactivateHdl; using Control::ImplInitSettings; - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE ImplTabItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE Size ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ); SAL_DLLPRIVATE Rectangle ImplGetTabRect( sal_uInt16 nPos, long nWidth = -1, long nHeight = -1 ); SAL_DLLPRIVATE void ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ); - SAL_DLLPRIVATE sal_Bool ImplPosCurTabPage(); - SAL_DLLPRIVATE void ImplActivateTabPage( sal_Bool bNext ); + SAL_DLLPRIVATE bool ImplPosCurTabPage(); + SAL_DLLPRIVATE void ImplActivateTabPage( bool bNext ); SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false ); SAL_DLLPRIVATE void ImplPaint( const Rectangle& rRect, bool bLayout = false ); @@ -134,7 +134,7 @@ public: void SetMaxPageWidth( long nMaxWidth ) { mnMaxPageWidth = nMaxWidth; } long GetMaxPageWidth() const { return mnMaxPageWidth; } void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - sal_Bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } + bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } void SetTabPage( sal_uInt16 nPageId, TabPage* pPage ); TabPage* GetTabPage( sal_uInt16 nPageId ) const; diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 27651d8209dc..096d5053e66b 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -32,7 +32,7 @@ private: FixedLine* mpFixedLine; Window* mpViewWindow; WindowAlign meViewAlign; - sal_Bool mbPosControls; + bool mbPosControls; SAL_DLLPRIVATE void ImplInitTabDialogData(); SAL_DLLPRIVATE void ImplPosControls(); diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx index 5e4fb2dd48b0..8910ca2873c3 100644 --- a/include/vcl/taskpanelist.hxx +++ b/include/vcl/taskpanelist.hxx @@ -28,11 +28,11 @@ class VCL_DLLPUBLIC TaskPaneList { ::std::vector<Window *> mTaskPanes; - Window *FindNextFloat( Window *pWindow, sal_Bool bForward = sal_True ); - Window *FindNextSplitter( Window *pWindow, sal_Bool bForward = sal_True ); + Window *FindNextFloat( Window *pWindow, bool bForward = true ); + Window *FindNextSplitter( Window *pWindow, bool bForward = true ); public: - sal_Bool IsInList( Window *pWindow ); + bool IsInList( Window *pWindow ); public: TaskPaneList(); @@ -40,7 +40,7 @@ public: void AddWindow( Window *pWindow ); void RemoveWindow( Window *pWindow ); - sal_Bool HandleKeyEvent( KeyEvent aKeyEvent ); + bool HandleKeyEvent( KeyEvent aKeyEvent ); }; #endif diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx index d05f2f7170b6..f4bf40815e19 100644 --- a/include/vcl/textdata.hxx +++ b/include/vcl/textdata.hxx @@ -44,29 +44,29 @@ public: sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16& GetIndex() { return mnIndex; } - inline sal_Bool operator == ( const TextPaM& rPaM ) const; - inline sal_Bool operator != ( const TextPaM& rPaM ) const; - inline sal_Bool operator < ( const TextPaM& rPaM ) const; - inline sal_Bool operator > ( const TextPaM& rPaM ) const; + inline bool operator == ( const TextPaM& rPaM ) const; + inline bool operator != ( const TextPaM& rPaM ) const; + inline bool operator < ( const TextPaM& rPaM ) const; + inline bool operator > ( const TextPaM& rPaM ) const; }; -inline sal_Bool TextPaM::operator == ( const TextPaM& rPaM ) const +inline bool TextPaM::operator == ( const TextPaM& rPaM ) const { return ( ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ) ) ? sal_True : sal_False; } -inline sal_Bool TextPaM::operator != ( const TextPaM& rPaM ) const +inline bool TextPaM::operator != ( const TextPaM& rPaM ) const { return !( *this == rPaM ); } -inline sal_Bool TextPaM::operator < ( const TextPaM& rPaM ) const +inline bool TextPaM::operator < ( const TextPaM& rPaM ) const { return ( ( mnPara < rPaM.mnPara ) || ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ) ) ? sal_True : sal_False; } -inline sal_Bool TextPaM::operator > ( const TextPaM& rPaM ) const +inline bool TextPaM::operator > ( const TextPaM& rPaM ) const { return ( ( mnPara > rPaM.mnPara ) || ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ) ) ? sal_True : sal_False; @@ -91,18 +91,18 @@ public: void Justify(); - sal_Bool HasRange() const { return maStartPaM != maEndPaM; } + bool HasRange() const { return maStartPaM != maEndPaM; } - inline sal_Bool operator == ( const TextSelection& rSel ) const; - inline sal_Bool operator != ( const TextSelection& rSel ) const; + inline bool operator == ( const TextSelection& rSel ) const; + inline bool operator != ( const TextSelection& rSel ) const; }; -inline sal_Bool TextSelection::operator == ( const TextSelection& rSel ) const +inline bool TextSelection::operator == ( const TextSelection& rSel ) const { return ( ( maStartPaM == rSel.maStartPaM ) && ( maEndPaM == rSel.maEndPaM ) ); } -inline sal_Bool TextSelection::operator != ( const TextSelection& rSel ) const +inline bool TextSelection::operator != ( const TextSelection& rSel ) const { return !( *this == rSel ); } diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index fd6afcf13cb6..700def50dbda 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -124,15 +124,15 @@ private: TxtAlign meAlign; - sal_Bool mbIsFormatting : 1; // semaphore for the Hook's - sal_Bool mbFormatted : 1; - sal_Bool mbUpdate : 1; - sal_Bool mbModified : 1; - sal_Bool mbUndoEnabled : 1; - sal_Bool mbIsInUndo : 1; - sal_Bool mbDowning : 1; - sal_Bool mbRightToLeft : 1; - sal_Bool mbHasMultiLineParas : 1; + bool mbIsFormatting : 1; // semaphore for the Hook's + bool mbFormatted : 1; + bool mbUpdate : 1; + bool mbModified : 1; + bool mbUndoEnabled : 1; + bool mbIsInUndo : 1; + bool mbDowning : 1; + bool mbRightToLeft : 1; + bool mbHasMultiLineParas : 1; TextEngine( const TextEngine& ) : SfxBroadcaster() {} TextEngine& operator=( const TextEngine& ) { return *this; } @@ -145,10 +145,10 @@ protected: void ImpInitDoc(); void ImpRemoveText(); TextPaM ImpDeleteText( const TextSelection& rSel ); - TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, sal_Bool bOverwrite = sal_False ); + TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, bool bOverwrite = false ); TextPaM ImpInsertText( const TextSelection& rSel, const OUString& rText ); - TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, sal_Bool bKeepEndingAttribs = sal_True ); - TextPaM ImpInsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs = sal_True ); + TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, bool bKeepEndingAttribs = true ); + TextPaM ImpInsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs = true ); void ImpRemoveChars( const TextPaM& rPaM, sal_uInt16 nChars, SfxUndoAction* pCurUndo = 0 ); TextPaM ImpConnectParagraphs( sal_uLong nLeft, sal_uLong nRight ); void ImpRemoveParagraph( sal_uLong nPara ); @@ -158,10 +158,10 @@ protected: // to remain compatible in the minor release we copy the above ImpInsertText // function and add the extra parameter we need but make sure this function // gets not exported. First and seconf parameter swapped to have a different signatur. - SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, sal_Bool bOverwrite = sal_False, sal_Bool bIsUserInput = sal_False ); + SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, bool bOverwrite = false, bool bIsUserInput = false ); // some other new functions needed that must not be exported to remain compatible SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); - SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; + SAL_DLLPRIVATE bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // broadcast or adjust selections void ImpParagraphInserted( sal_uLong nPara ); @@ -176,7 +176,7 @@ protected: void CheckIdleFormatter(); void IdleFormatAndUpdate( TextView* pCurView = 0, sal_uInt16 nMaxTimerRestarts = 5 ); - sal_Bool CreateLines( sal_uLong nPara ); + bool CreateLines( sal_uLong nPara ); void CreateAndInsertEmptyLine( sal_uLong nPara ); void ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth ); sal_uInt16 SplitTextPortion( sal_uLong nPara, sal_uInt16 nPos ); @@ -187,23 +187,23 @@ protected: void FormatDoc(); void FormatFullDoc(); void FormatAndUpdate( TextView* pCurView = 0 ); - sal_Bool IsFormatting() const { return mbIsFormatting; } + bool IsFormatting() const { return mbIsFormatting; } void UpdateViews( TextView* pCurView = 0 ); void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); void UpdateSelections(); - sal_Bool IsFormatted() const { return mbFormatted; } + bool IsFormatted() const { return mbFormatted; } - sal_uInt16 GetCharPos( sal_uLong nPara, sal_uInt16 nLine, long nDocPosX, sal_Bool bSmart = sal_False ); - Rectangle GetEditCursor( const TextPaM& rPaM, sal_Bool bSpecial, sal_Bool bPreferPortionStart = sal_False ); - sal_uInt16 ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, sal_Bool bSmart ); + sal_uInt16 GetCharPos( sal_uLong nPara, sal_uInt16 nLine, long nDocPosX, bool bSmart = false ); + Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false ); + sal_uInt16 ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, bool bSmart ); long ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nTextPortion ); - long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart = sal_False ); + long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, bool bPreferPortionStart = false ); long ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 ); sal_uInt8 ImpGetRightToLeft( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL ); - void ImpInitLayoutMode( OutputDevice* pOutDev, sal_Bool bDrawingR2LPortion = sal_False ); + void ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion = false ); TxtAlign ImpGetAlign() const; sal_uLong CalcTextHeight(); @@ -242,8 +242,8 @@ public: void SetLeftMargin( sal_uInt16 n ); sal_uInt16 GetLeftMargin() const; - void SetUpdateMode( sal_Bool bUpdate ); - sal_Bool GetUpdateMode() const { return mbUpdate; } + void SetUpdateMode( bool bUpdate ); + bool GetUpdateMode() const { return mbUpdate; } sal_uInt16 GetViewCount() const; TextView* GetView( sal_uInt16 nView ) const; @@ -270,41 +270,41 @@ public: sal_uInt16 GetLineCount( sal_uLong nParagraph ) const; sal_uInt16 GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const; - void SetRightToLeft( sal_Bool bR2L ); - sal_Bool IsRightToLeft() const { return mbRightToLeft; } + void SetRightToLeft( bool bR2L ); + bool IsRightToLeft() const { return mbRightToLeft; } - sal_Bool HasUndoManager() const { return mpUndoManager ? sal_True : sal_False; } + bool HasUndoManager() const { return mpUndoManager ? sal_True : sal_False; } ::svl::IUndoManager& GetUndoManager(); void UndoActionStart( sal_uInt16 nId = 0 ); void UndoActionEnd(); - void InsertUndo( TextUndo* pUndo, sal_Bool bTryMerge = sal_False ); - sal_Bool IsInUndo() { return mbIsInUndo; } - void SetIsInUndo( sal_Bool bInUndo ) { mbIsInUndo = bInUndo; } + void InsertUndo( TextUndo* pUndo, bool bTryMerge = false ); + bool IsInUndo() { return mbIsInUndo; } + void SetIsInUndo( bool bInUndo ) { mbIsInUndo = bInUndo; } void ResetUndo(); - void EnableUndo( sal_Bool bEnable ); - sal_Bool IsUndoEnabled() { return mbUndoEnabled; } + void EnableUndo( bool bEnable ); + bool IsUndoEnabled() { return mbUndoEnabled; } - void SetModified( sal_Bool bModified ) { mbModified = bModified; } - sal_Bool IsModified() const { return mbModified; } + void SetModified( bool bModified ) { mbModified = bModified; } + bool IsModified() const { return mbModified; } - sal_Bool Read( SvStream& rInput, const TextSelection* pSel = NULL ); + bool Read( SvStream& rInput, const TextSelection* pSel = NULL ); - sal_Bool Write( SvStream& rOutput, const TextSelection* pSel = NULL, sal_Bool bHTML = sal_False ); + bool Write( SvStream& rOutput, const TextSelection* pSel = NULL, bool bHTML = false ); - TextPaM GetPaM( const Point& rDocPos, sal_Bool bSmart = sal_True ); - Rectangle PaMtoEditCursor( const TextPaM& rPaM, sal_Bool bSpecial = sal_False ); + TextPaM GetPaM( const Point& rDocPos, bool bSmart = true ); + Rectangle PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial = false ); OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = 0 ); - sal_Bool HasAttrib( sal_uInt16 nWhich ) const; + bool HasAttrib( sal_uInt16 nWhich ) const; const TextAttrib* FindAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; - void RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ); + void RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, bool bIdleFormatAndUpdate ); void RemoveAttrib( sal_uLong nPara, const TextCharAttrib& rAttrib ); - void RemoveAttribs( sal_uLong nPara, sal_Bool bIdleFormatAndUpdate = sal_True ); - void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate = sal_True ); + void RemoveAttribs( sal_uLong nPara, bool bIdleFormatAndUpdate = true ); + void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, bool bIdleFormatAndUpdate = true ); TxtAlign GetTextAlign() const { return meAlign; } void SetTextAlign( TxtAlign eAlign ); @@ -315,8 +315,8 @@ public: ::com::sun::star::lang::Locale GetLocale(); ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > GetBreakIterator(); - static sal_Bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); - static sal_Bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); + static bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); + static bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); Color GetTextColor() const { return maTextColor; } }; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 63835ad9e963..f7dea8126093 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -66,16 +66,16 @@ protected: void ShowSelection(); void HideSelection(); void ShowSelection( const TextSelection& rSel ); - void ImpShowHideSelection( sal_Bool bShow, const TextSelection* pRange = NULL ); + void ImpShowHideSelection( bool bShow, const TextSelection* pRange = NULL ); TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent ); TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); - void ImpSetSelection( const TextSelection& rNewSel, sal_Bool bUI ); - sal_Bool IsInSelection( const TextPaM& rPaM ); + void ImpSetSelection( const TextSelection& rNewSel, bool bUI ); + bool IsInSelection( const TextPaM& rPaM ); void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); - void ImpPaint( const Rectangle& rRect, sal_Bool bUseVirtDev ); - void ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_Bool bEndKey ); + void ImpPaint( const Rectangle& rRect, bool bUseVirtDev ); + void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey ); void ImpHighlight( const TextSelection& rSel ); void ImpSetSelection( const TextSelection& rSelection ); Point ImpGetOutputStartPos( const Point& rStartDocPos ) const; @@ -84,7 +84,7 @@ protected: void ImpShowDDCursor(); bool ImplTruncateNewText( OUString& rNewText ) const; - sal_Bool ImplCheckTextLen( const OUString& rNewText ); + bool ImplCheckTextLen( const OUString& rNewText ); VirtualDevice* GetVirtualDevice(); @@ -110,25 +110,25 @@ public: void Invalidate(); void Scroll( long nHorzScroll, long nVertScroll ); - void ShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool bForceVisCursor = sal_True ); + void ShowCursor( bool bGotoCursor = true, bool bForceVisCursor = true ); void HideCursor(); - void EnableCursor( sal_Bool bEnable ); - sal_Bool IsCursorEnabled() const; + void EnableCursor( bool bEnable ); + bool IsCursorEnabled() const; const TextSelection& GetSelection() const; TextSelection& GetSelection(); void SetSelection( const TextSelection& rNewSel ); - void SetSelection( const TextSelection& rNewSel, sal_Bool bGotoCursor ); - sal_Bool HasSelection() const; + void SetSelection( const TextSelection& rNewSel, bool bGotoCursor ); + bool HasSelection() const; OUString GetSelected(); OUString GetSelected( LineEnd aSeparator ); void DeleteSelected(); - void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False ); + void InsertText( const OUString& rNew, bool bSelect = false ); - sal_Bool KeyInput( const KeyEvent& rKeyEvent ); + bool KeyInput( const KeyEvent& rKeyEvent ); void Paint( const Rectangle& rRect ); void MouseButtonUp( const MouseEvent& rMouseEvent ); void MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -145,7 +145,7 @@ public: void Undo(); void Redo(); - sal_Bool Read( SvStream& rInput ); + bool Read( SvStream& rInput ); void SetStartDocPos( const Point& rPos ); const Point& GetStartDocPos() const; @@ -153,21 +153,21 @@ public: Point GetDocPos( const Point& rWindowPos ) const; Point GetWindowPos( const Point& rDocPos ) const; - void SetInsertMode( sal_Bool bInsert ); - sal_Bool IsInsertMode() const; + void SetInsertMode( bool bInsert ); + bool IsInsertMode() const; - void SetAutoIndentMode( sal_Bool bAutoIndent ); + void SetAutoIndentMode( bool bAutoIndent ); - void SetReadOnly( sal_Bool bReadOnly ); - sal_Bool IsReadOnly() const; + void SetReadOnly( bool bReadOnly ); + bool IsReadOnly() const; - void SetAutoScroll( sal_Bool bAutoScroll ); - sal_Bool IsAutoScroll() const; + void SetAutoScroll( bool bAutoScroll ); + bool IsAutoScroll() const; - sal_Bool SetCursorAtPoint( const Point& rPointPixel ); - sal_Bool IsSelectionAtPoint( const Point& rPointPixel ); + bool SetCursorAtPoint( const Point& rPointPixel ); + bool IsSelectionAtPoint( const Point& rPointPixel ); - void SetPaintSelection( sal_Bool bPaint); + void SetPaintSelection( bool bPaint); void EraseVirtualDevice(); @@ -193,7 +193,7 @@ public: TEXTATTR_PROTECTED set as one entitity. Drag and dropped text is automatically attibuted as protected. */ - void SupportProtectAttribute(sal_Bool bSupport); + void SupportProtectAttribute(bool bSupport); /** Returns the number in paragraph of the line in which the cursor is blinking diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index 78bcbf98862b..80c9d7dd764a 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -54,8 +54,8 @@ public: void setStepTime( sal_Int32 nStepTime ) { mnStepTime = nStepTime; } sal_Int32 getStepTime() const { return mnStepTime; } - void setRepeat( sal_Bool bRepeat ) { mbRepeat = bRepeat; } - sal_Bool getRepeat() const { return mbRepeat; } + void setRepeat( bool bRepeat ) { mbRepeat = bRepeat; } + bool getRepeat() const { return mbRepeat; } // animation control void start(); @@ -79,7 +79,7 @@ private: private: ::std::vector< Image > maImageList; - sal_Bool mbRepeat; + bool mbRepeat; sal_Int32 mnStepTime; sal_Int32 mnCurStep; sal_Int32 mnStepCount; diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index a5b1c95b21fa..474036b1aab2 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -49,7 +49,7 @@ public: /// set the timeout in milliseconds void SetTimeout( sal_uLong nTimeoutMs ); sal_uLong GetTimeout() const { return mnTimeout; } - sal_Bool IsActive() const { return mbActive ? sal_True : sal_False; } + bool IsActive() const { return mbActive ? sal_True : sal_False; } void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } const Link& GetTimeoutHdl() const { return maTimeoutHdl; } diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 8d421bbd8c62..d595191c9d32 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -61,7 +61,7 @@ public: sal_uInt16 GetTargetPos() const { return mnPosTo; } sal_uInt16 GetSourceId() const { return mnIdFrom; } void* GetData() const { return mpData; } - sal_Bool IsResized() const; + bool IsResized() const; }; inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent() @@ -82,12 +82,12 @@ inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent( ToolBox* pDropBox, mpData = pUserData; } -inline sal_Bool ToolBoxCustomizeEvent::IsResized() const +inline bool ToolBoxCustomizeEvent::IsResized() const { if ( mnPosTo == TOOLBOX_CUSTOMIZE_RESIZE ) - return sal_True; + return true; else - return sal_False; + return false; } #define TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) @@ -204,39 +204,39 @@ private: private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); using DockingWindow::ImplInitSettings; - SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const; - SAL_DLLPRIVATE sal_Bool ImplCalcItem(); - SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool bCalcHorz ); - SAL_DLLPRIVATE void ImplFormat( sal_Bool bResize = sal_False ); - SAL_DLLPRIVATE void ImplDrawSpin( sal_Bool bUpperIn, sal_Bool bLowerIn ); + SAL_DLLPRIVATE bool ImplCalcItem(); + SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ); + SAL_DLLPRIVATE void ImplFormat( bool bResize = false ); + SAL_DLLPRIVATE void ImplDrawSpin( bool bUpperIn, bool bLowerIn ); SAL_DLLPRIVATE void ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ); - SAL_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight = 0, sal_Bool bPaint = sal_False, sal_Bool bLayout = sal_False ); + SAL_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight = 0, bool bPaint = false, bool bLayout = false ); using Window::ImplInvalidate; - SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False ); + SAL_DLLPRIVATE void ImplInvalidate( bool bNewCalc = false, bool bFullPaint = false ); SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); SAL_DLLPRIVATE const OUString ImplConvertMenuString( const OUString& rStr ); - SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False ); - SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False ); - SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False ); - SAL_DLLPRIVATE sal_Bool ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle = sal_False ); + SAL_DLLPRIVATE bool ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat = false ); + SAL_DLLPRIVATE bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel = false ); + SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus = false ); + SAL_DLLPRIVATE bool ImplChangeHighlightUpDn( bool bUp, bool bNoCycle = false ); SAL_DLLPRIVATE sal_uInt16 ImplGetItemLine( ImplToolItem* pCurrentItem ); SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( sal_uInt16 nLine ); - SAL_DLLPRIVATE sal_Bool ImplOpenItem( KeyCode aKeyCode ); - SAL_DLLPRIVATE sal_Bool ImplActivateItem( KeyCode aKeyCode ); + SAL_DLLPRIVATE bool ImplOpenItem( KeyCode aKeyCode ); + SAL_DLLPRIVATE bool ImplActivateItem( KeyCode aKeyCode ); SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplHideFocus(); SAL_DLLPRIVATE void ImplUpdateInputEnable(); SAL_DLLPRIVATE void ImplFillLayoutData() const; - SAL_DLLPRIVATE sal_Bool ImplHasClippedItems(); + SAL_DLLPRIVATE bool ImplHasClippedItems(); SAL_DLLPRIVATE Point ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const; SAL_DLLPRIVATE void ImplExecuteCustomMenu(); - SAL_DLLPRIVATE sal_Bool ImplIsFloatingMode() const; - SAL_DLLPRIVATE sal_Bool ImplIsInPopupMode() const; + SAL_DLLPRIVATE bool ImplIsFloatingMode() const; + SAL_DLLPRIVATE bool ImplIsInPopupMode() const; SAL_DLLPRIVATE const OUString& ImplGetHelpText( sal_uInt16 nItemId ) const; SAL_DLLPRIVATE Size ImplGetOptimalFloatingSize(); - SAL_DLLPRIVATE sal_Bool ImplHasExternalMenubutton(); + SAL_DLLPRIVATE bool ImplHasExternalMenubutton(); SAL_DLLPRIVATE void ImplDrawFloatwinBorder( ImplToolItem* pItem ); DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void* ); @@ -251,7 +251,7 @@ private: SAL_DLLPRIVATE void ImplUpdateImageList(); // called if StateChanged public: - SAL_DLLPRIVATE void ImplFloatControl( sal_Bool bStart, FloatingWindow* pWindow = NULL ); + SAL_DLLPRIVATE void ImplFloatControl( bool bStart, FloatingWindow* pWindow = NULL ); SAL_DLLPRIVATE void ImplDisableFlatButtons(); static SAL_DLLPRIVATE int ImplGetDragWidth( ToolBox* pThis ); @@ -260,11 +260,11 @@ public: long& rRight, long& rBottom, const ToolBox *pThis ); static SAL_DLLPRIVATE void ImplDrawGrip( ToolBox* pThis ); static SAL_DLLPRIVATE void ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapper *pWrapper ); - static SAL_DLLPRIVATE sal_Bool ImplDrawNativeBackground( ToolBox* pThis, const Region &rRegion ); + static SAL_DLLPRIVATE bool ImplDrawNativeBackground( ToolBox* pThis, const Region &rRegion ); static SAL_DLLPRIVATE void ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion ); - static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, sal_Bool bIsInPopupMode ); + static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, bool bIsInPopupMode ); static SAL_DLLPRIVATE void ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ); - static SAL_DLLPRIVATE void ImplErase( ToolBox* pThis, const Rectangle &rRect, sal_Bool bHighlight = sal_False, sal_Bool bHasOpenPopup = sal_False ); + static SAL_DLLPRIVATE void ImplErase( ToolBox* pThis, const Rectangle &rRect, bool bHighlight = false, bool bHasOpenPopup = false ); static SAL_DLLPRIVATE void ImplDrawBorder( ToolBox* pWin ); static SAL_DLLPRIVATE const ImplToolItem *ImplGetFirstClippedItem( const ToolBox* pThis ); static SAL_DLLPRIVATE Size ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode = 0 ); @@ -277,7 +277,7 @@ public: static SAL_DLLPRIVATE void ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ); static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( ToolBox* pBox, const Point& rPos ); static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ); - static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ); + static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ); static SAL_DLLPRIVATE sal_uInt16 ImplCountLineBreaks( const ToolBox *pThis ); SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } @@ -315,10 +315,10 @@ public: virtual void LoseFocus(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool PrepareToggleFloatingMode(); + virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); virtual void StartDocking(); - virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + virtual bool Docking( const Point& rPos, Rectangle& rRect ); virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); virtual void Resizing( Size& rSize ); virtual Size GetOptimalSize() const; @@ -365,15 +365,15 @@ public: void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); WindowAlign GetAlign() const { return meAlign; } - sal_Bool IsHorizontal() const { return mbHorz; } + bool IsHorizontal() const { return mbHorz; } void SetLineCount( sal_uInt16 nNewLines ); sal_uInt16 GetLineCount() const { return mnLines; } sal_uInt16 GetCurLine() const { return mnCurLine; } - void ShowLine( sal_Bool bNext ); + void ShowLine( bool bNext ); // Used to enable/disable scrolling one page at a time for toolbar - void SetPageScroll( sal_Bool b ); + void SetPageScroll( bool b ); sal_uInt16 GetItemCount() const; ToolBoxItemType GetItemType( sal_uInt16 nPos ) const; @@ -410,7 +410,7 @@ public: void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); Image GetItemImage( sal_uInt16 nItemId ) const; void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ); - void SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ); + void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; void SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ); @@ -420,18 +420,18 @@ public: void StartSelection(); void EndSelection(); - void SetItemDown( sal_uInt16 nItemId, sal_Bool bDown, sal_Bool bRelease = sal_True ); + void SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease = true ); void SetItemState( sal_uInt16 nItemId, TriState eState ); TriState GetItemState( sal_uInt16 nItemId ) const; - void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck = sal_True ); - sal_Bool IsItemChecked( sal_uInt16 nItemId ) const; + void CheckItem( sal_uInt16 nItemId, bool bCheck = true ); + bool IsItemChecked( sal_uInt16 nItemId ) const; void EnableItem( sal_uInt16 nItemId, bool bEnable = true ); - sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const; + bool IsItemEnabled( sal_uInt16 nItemId ) const; - void TriggerItem( sal_uInt16 nItemId, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False ); + void TriggerItem( sal_uInt16 nItemId, bool bShift = false, bool bCtrl = false ); /// Shows or hides items. void ShowItem(sal_uInt16 nItemId, bool bVisible = true); @@ -443,8 +443,8 @@ public: /// Overload to provide HideItem via command id. void HideItem(const OUString& rCommand) { ShowItem(rCommand, false); } - sal_Bool IsItemVisible( sal_uInt16 nItemId ) const; - sal_Bool IsItemReallyVisible( sal_uInt16 nItemId ) const; + bool IsItemVisible( sal_uInt16 nItemId ) const; + bool IsItemReallyVisible( sal_uInt16 nItemId ) const; void SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ); const OUString GetItemCommand( sal_uInt16 nItemId ) const; @@ -485,20 +485,20 @@ public: WinBits GetStyle() const { return mnWinStyle; } // enable/disable undocking - void Lock( sal_Bool bLock = sal_True ); + void Lock( bool bLock = true ); // read configuration to determine locking behaviour - static sal_Bool AlwaysLocked(); + static bool AlwaysLocked(); void EnableMenuStrings( bool bEnable = true ) { mbMenuStrings = bEnable; } - sal_Bool IsMenuStringsEnabled() const { return mbMenuStrings; } + bool IsMenuStringsEnabled() const { return mbMenuStrings; } void SetOutStyle( sal_uInt16 nNewStyle ); sal_uInt16 GetOutStyle() const { return mnOutStyle; } void EnableCustomize( bool bEnable = true ); - sal_Bool IsCustomize() { return mbCustomize; } - sal_Bool IsInCustomizeMode() const { return mbCustomizeMode; } + bool IsCustomize() { return mbCustomize; } + bool IsInCustomizeMode() const { return mbCustomizeMode; } void SetHelpText( const OUString& rText ) { DockingWindow::SetHelpText( rText ); } @@ -540,7 +540,7 @@ public: // when the menu button was clicked and before the menu is executed void SetMenuType( sal_uInt16 aType = TOOLBOX_MENUTYPE_CUSTOMIZE ); sal_uInt16 GetMenuType() const; - sal_Bool IsMenuEnabled() const; + bool IsMenuEnabled() const; PopupMenu* GetMenu() const; void UpdateCustomMenu(); void SetMenuButtonHdl( const Link& rLink ); @@ -551,11 +551,11 @@ public: // allow Click Handler to detect special key bool IsShift() const { return mbIsShift; } // allow Click Handler to distinguish between mouse and key input - sal_Bool IsKeyEvent() const { return mbIsKeyEvent; } + bool IsKeyEvent() const { return mbIsKeyEvent; } // allows framework to set/query the planned popupmode - sal_Bool WillUsePopupMode() const; - void WillUsePopupMode( sal_Bool b); + bool WillUsePopupMode() const; + void WillUsePopupMode( bool b); // accessibility helpers @@ -577,12 +577,12 @@ public: void SetToolbarLayoutMode( ToolBoxLayoutMode eLayout ); }; -inline void ToolBox::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) +inline void ToolBox::CheckItem( sal_uInt16 nItemId, bool bCheck ) { SetItemState( nItemId, (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } -inline sal_Bool ToolBox::IsItemChecked( sal_uInt16 nItemId ) const +inline bool ToolBox::IsItemChecked( sal_uInt16 nItemId ) const { return (GetItemState( nItemId ) == STATE_CHECK); } diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index e2bf0ec9c1f7..be0d3bd0024e 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -169,9 +169,9 @@ public: inline void Expand( sal_uInt16 nDiff ); inline void Collaps( sal_uInt16 nDiff ); - inline sal_Bool IsIn( sal_uInt16 nIndex ); - inline sal_Bool IsInside( sal_uInt16 nIndex ); - inline sal_Bool IsEmpty(); + inline bool IsIn( sal_uInt16 nIndex ); + inline bool IsInside( sal_uInt16 nIndex ); + inline bool IsEmpty(); }; @@ -207,17 +207,17 @@ inline void TextCharAttrib::Collaps( sal_uInt16 nDiff ) mnEnd = mnEnd - nDiff; } -inline sal_Bool TextCharAttrib::IsIn( sal_uInt16 nIndex ) +inline bool TextCharAttrib::IsIn( sal_uInt16 nIndex ) { return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); } -inline sal_Bool TextCharAttrib::IsInside( sal_uInt16 nIndex ) +inline bool TextCharAttrib::IsInside( sal_uInt16 nIndex ) { return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); } -inline sal_Bool TextCharAttrib::IsEmpty() +inline bool TextCharAttrib::IsEmpty() { return mnStart == mnEnd; } diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx index ab23d9477cba..3368856e651f 100644 --- a/include/vcl/unohelp.hxx +++ b/include/vcl/unohelp.hxx @@ -52,7 +52,7 @@ namespace unohelper { VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > CreateBreakIterator(); VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification(); -VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ); +VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, bool bSUPD ); VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ); }} // namespace vcl::unohelper diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index a4f4e29b0868..55ea3304b562 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -263,7 +263,7 @@ public: // stops notifying when any handler has processed the event // and returns sal_True in that case // a handler must return sal_True to signal that it has processed the event - sal_Bool Process( VclSimpleEvent* pEvent ) const; + bool Process( VclSimpleEvent* pEvent ) const; void addListener( const Link& rListener ); void removeListener( const Link& rListener ); private: diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 097d9e862680..b0bbf97000b5 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -50,7 +50,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); using Control::ImplInitSettings; - void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); WinBits ImplInitStyle( WinBits nStyle ); ExtTextEngine* GetTextEngine() const; @@ -76,9 +76,9 @@ public: virtual void DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } virtual void SetReadOnly( sal_Bool bReadOnly = sal_True ); - virtual sal_Bool IsReadOnly() const; + virtual bool IsReadOnly() const; - void EnableFocusSelectionHide( sal_Bool bHide ); + void EnableFocusSelectionHide( bool bHide ); virtual void SetMaxTextLen(sal_Int32 nMaxLen = 0); virtual sal_Int32 GetMaxTextLen() const; @@ -104,8 +104,8 @@ public: OUString GetText( LineEnd aSeparator ) const; OUString GetTextLines( LineEnd aSeparator ) const; - void SetRightToLeft( sal_Bool bRightToLeft ); - sal_Bool IsRightToLeft() const; + void SetRightToLeft( bool bRightToLeft ); + bool IsRightToLeft() const; void SaveValue() { aSaveValue = GetText(); } const OUString& GetSavedValue() const { return aSaveValue; } @@ -130,7 +130,7 @@ public: void DisableSelectionOnFocus(); void SetTextSelectable( bool bTextSelectable ); - void EnableCursor( sal_Bool bEnable ); + void EnableCursor( bool bEnable ); virtual bool set_property(const OString &rKey, const OString &rValue); }; diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index d668bcb01d23..3450509c96d8 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -37,13 +37,13 @@ private: VirtualDevice* mpPrev; VirtualDevice* mpNext; sal_uInt16 mnBitCount; - sal_Bool mbScreenComp; + bool mbScreenComp; sal_Int8 mnAlphaDepth; sal_uInt8 meRefDevMode; SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ); - SAL_DLLPRIVATE sal_Bool InnerImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase, const basebmp::RawMemorySharedArray &pBuffer ); - SAL_DLLPRIVATE sal_Bool ImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase, const basebmp::RawMemorySharedArray &pBuffer ); + SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ); + SAL_DLLPRIVATE bool ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ); // Copy assignment is forbidden and not implemented. VirtualDevice (const VirtualDevice &); @@ -108,9 +108,9 @@ public: virtual ~VirtualDevice(); - sal_Bool SetOutputSizePixel( const Size& rNewSize, sal_Bool bErase = sal_True ); - sal_Bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); - sal_Bool SetOutputSize( const Size& rNewSize, sal_Bool bErase = sal_True ) + bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); + bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); + bool SetOutputSize( const Size& rNewSize, bool bErase = true ) { return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); } // reference device modes for different compatibility levels diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index 4f4113f8a444..cc4a8366ba27 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -72,7 +72,7 @@ class VCL_DLLPUBLIC Wallpaper private: ImplWallpaper* mpImplWallpaper; - SAL_DLLPRIVATE void ImplMakeUnique( sal_Bool bReleaseCache = sal_True ); + SAL_DLLPRIVATE void ImplMakeUnique( bool bReleaseCache = true ); SAL_DLLPRIVATE Gradient ImplGetApplicationGradient() const; public: @@ -95,24 +95,24 @@ public: void SetBitmap( const BitmapEx& rBitmap ); BitmapEx GetBitmap() const; - sal_Bool IsBitmap() const; + bool IsBitmap() const; void SetGradient( const Gradient& rGradient ); Gradient GetGradient() const; - sal_Bool IsGradient() const; + bool IsGradient() const; void SetRect( const Rectangle& rRect ); Rectangle GetRect() const; - sal_Bool IsRect() const; + bool IsRect() const; - sal_Bool IsFixed() const; - sal_Bool IsScrollable() const; + bool IsFixed() const; + bool IsScrollable() const; Wallpaper& operator=( const Wallpaper& rWallpaper ); - sal_Bool operator==( const Wallpaper& rWallpaper ) const; - sal_Bool operator!=( const Wallpaper& rWallpaper ) const + bool operator==( const Wallpaper& rWallpaper ) const; + bool operator!=( const Wallpaper& rWallpaper ) const { return !(Wallpaper::operator==( rWallpaper )); } - sal_Bool IsSameInstance( const Wallpaper& rWallpaper ) const + bool IsSameInstance( const Wallpaper& rWallpaper ) const { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); } friend VCL_DLLPUBLIC SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 51cd179760ef..ac4154cc57e4 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -379,7 +379,7 @@ public: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); SAL_DLLPRIVATE void ImplInsertWindow( Window* pParent ); - SAL_DLLPRIVATE void ImplRemoveWindow( sal_Bool bRemoveFrameData ); + SAL_DLLPRIVATE void ImplRemoveWindow( bool bRemoveFrameData ); SAL_DLLPRIVATE Window* ImplGetWindow(); SAL_DLLPRIVATE ImplFrameData* ImplGetFrameData(); SalFrame* ImplGetFrame() const; @@ -394,15 +394,15 @@ public: SAL_DLLPRIVATE Window* ImplGetFirstOverlapWindow(); SAL_DLLPRIVATE const Window* ImplGetFirstOverlapWindow() const; SAL_DLLPRIVATE Window* ImplGetFrameWindow() const; - SAL_DLLPRIVATE sal_Bool ImplIsRealParentPath( const Window* pWindow ) const; - SAL_DLLPRIVATE sal_Bool ImplIsChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; - SAL_DLLPRIVATE sal_Bool ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; - SAL_DLLPRIVATE sal_Bool ImplIsDockingWindow() const; - SAL_DLLPRIVATE sal_Bool ImplIsFloatingWindow() const; - SAL_DLLPRIVATE sal_Bool ImplIsSplitter() const; - SAL_DLLPRIVATE sal_Bool ImplIsPushButton() const; - SAL_DLLPRIVATE sal_Bool ImplIsOverlapWindow() const; - SAL_DLLPRIVATE void ImplSetMouseTransparent( sal_Bool bTransparent ); + SAL_DLLPRIVATE bool ImplIsRealParentPath( const Window* pWindow ) const; + SAL_DLLPRIVATE bool ImplIsChild( const Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsDockingWindow() const; + SAL_DLLPRIVATE bool ImplIsFloatingWindow() const; + SAL_DLLPRIVATE bool ImplIsSplitter() const; + SAL_DLLPRIVATE bool ImplIsPushButton() const; + SAL_DLLPRIVATE bool ImplIsOverlapWindow() const; + SAL_DLLPRIVATE void ImplSetMouseTransparent( bool bTransparent ); SAL_DLLPRIVATE int ImplTestMousePointerSet(); SAL_DLLPRIVATE PointerStyle ImplGetMousePointer() const; SAL_DLLPRIVATE void ImplResetReallyVisible(); @@ -415,20 +415,20 @@ public: SAL_DLLPRIVATE void ImplLogicToPoint( Font& rFont ) const; SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos ); - SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion ); + SAL_DLLPRIVATE bool ImplSysObjClip( const Region* pOldRegion ); SAL_DLLPRIVATE void ImplUpdateSysObjChildrenClip(); SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip(); SAL_DLLPRIVATE void ImplUpdateSysObjClip(); - SAL_DLLPRIVATE sal_Bool ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller = sal_False ); - SAL_DLLPRIVATE sal_Bool ImplSetClipFlagOverlapWindows( sal_Bool bSysObjOnlySmaller = sal_False ); - SAL_DLLPRIVATE sal_Bool ImplSetClipFlag( sal_Bool bSysObjOnlySmaller = sal_False ); + SAL_DLLPRIVATE bool ImplSetClipFlagChildren( bool bSysObjOnlySmaller = false ); + SAL_DLLPRIVATE bool ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller = false ); + SAL_DLLPRIVATE bool ImplSetClipFlag( bool bSysObjOnlySmaller = false ); SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplIntersectWindowRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeWindowRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeOverlapWindows( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( Region& rRegion ); - SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, sal_Bool bThis, sal_Bool bOverlaps ); - SAL_DLLPRIVATE sal_Bool ImplClipChildren( Region& rRegion ); + SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ); + SAL_DLLPRIVATE bool ImplClipChildren( Region& rRegion ); SAL_DLLPRIVATE void ImplClipAllChildren( Region& rRegion ); SAL_DLLPRIVATE void ImplClipSiblings( Region& rRegion ); SAL_DLLPRIVATE void ImplInitWinClipRegion(); @@ -438,7 +438,7 @@ public: SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ); SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ); SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, - sal_Bool bChildren, sal_Bool bParent, sal_Bool bSiblings ); + bool bChildren, bool bParent, bool bSiblings ); SAL_DLLPRIVATE void ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ); SAL_DLLPRIVATE void ImplCallOverlapPaint(); SAL_DLLPRIVATE void ImplPostPaint(); @@ -448,14 +448,14 @@ public: SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplValidateFrameRegion( const Region* rRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplValidate( const Region* rRegion, sal_uInt16 nFlags ); - SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_Bool bChildren ); - SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_Bool bChildren ); + SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); + SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ); - SAL_DLLPRIVATE void ImplUpdateAll( sal_Bool bOverlapWindows = sal_True ); + SAL_DLLPRIVATE void ImplUpdateAll( bool bOverlapWindows = true ); SAL_DLLPRIVATE void ImplUpdateWindowPtr( Window* pWindow ); SAL_DLLPRIVATE void ImplUpdateWindowPtr(); - SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( sal_Bool bNewFrame ); - SAL_DLLPRIVATE sal_Bool ImplUpdatePos(); + SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( bool bNewFrame ); + SAL_DLLPRIVATE bool ImplUpdatePos(); SAL_DLLPRIVATE void ImplUpdateSysObjPos(); SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return mpWindowImpl; } @@ -473,34 +473,34 @@ public: False if the font is unsuitable as UI font */ SAL_DLLPRIVATE bool ImplCheckUIFont( const Font& rFont ); - SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl = sal_True ); + SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl = true ); SAL_DLLPRIVATE void ImplAlignChildren(); SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplToBottomChild(); SAL_DLLPRIVATE void ImplCalcToTop( ImplCalcToTopData* pPrevData ); SAL_DLLPRIVATE void ImplToTop( sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplStartToTop( sal_uInt16 nFlags ); - SAL_DLLPRIVATE void ImplFocusToTop( sal_uInt16 nFlags, sal_Bool bReallyVisible ); + SAL_DLLPRIVATE void ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ); SAL_DLLPRIVATE void ImplShowAllOverlaps(); SAL_DLLPRIVATE void ImplHideAllOverlaps(); SAL_DLLPRIVATE void ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ); - SAL_DLLPRIVATE void ImplCallMouseMove( sal_uInt16 nMouseCode, sal_Bool bModChanged = sal_False ); + SAL_DLLPRIVATE void ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged = false ); SAL_DLLPRIVATE void ImplGenerateMouseMove(); SAL_DLLPRIVATE void ImplGrabFocus( sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplGrabFocusToDocument( sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplInvertFocus( const Rectangle& rRect ); SAL_DLLPRIVATE void ImplControlFocus( sal_uInt16 nFlags = 0 ); SAL_DLLPRIVATE Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); - SAL_DLLPRIVATE sal_Bool ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ); - SAL_DLLPRIVATE sal_Bool ImplHasDlgCtrl(); + SAL_DLLPRIVATE bool ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ); + SAL_DLLPRIVATE bool ImplHasDlgCtrl(); SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); - SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, sal_Bool bGetFocus ); + SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ); SAL_DLLPRIVATE Window* ImplFindDlgCtrlWindow( Window* pWindow ); SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, MapUnit eUnit ); SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, MapUnit eUnit ); - SAL_DLLPRIVATE sal_Bool ImplIsWindowInFront( const Window* pTestWindow ) const; + SAL_DLLPRIVATE bool ImplIsWindowInFront( const Window* pTestWindow ) const; SAL_DLLPRIVATE void ImplSaveOverlapBackground(); - SAL_DLLPRIVATE sal_Bool ImplRestoreOverlapBackground( Region& rInvRegion ); + SAL_DLLPRIVATE bool ImplRestoreOverlapBackground( Region& rInvRegion ); SAL_DLLPRIVATE void ImplDeleteOverlapBackground(); SAL_DLLPRIVATE void ImplInvalidateAllOverlapBackgrounds(); SAL_DLLPRIVATE static void ImplNewInputContext(); @@ -515,11 +515,11 @@ public: SAL_DLLPRIVATE static void ImplCalcSymbolRect( Rectangle& rRect ); SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); - SAL_DLLPRIVATE sal_Bool ImplIsAccessibleCandidate() const; - SAL_DLLPRIVATE sal_Bool ImplIsAccessibleNativeFrame() const; + SAL_DLLPRIVATE bool ImplIsAccessibleCandidate() const; + SAL_DLLPRIVATE bool ImplIsAccessibleNativeFrame() const; SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const; - SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, sal_Bool bTopLevel = sal_True ) const; - SAL_DLLPRIVATE sal_Bool ImplRegisterAccessibleNativeFrame(); + SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; + SAL_DLLPRIVATE bool ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplCallResize(); SAL_DLLPRIVATE void ImplCallMove(); @@ -533,15 +533,15 @@ public: SAL_DLLPRIVATE ::std::vector<Window *>& ImplGetOwnerDrawList(); SAL_DLLPRIVATE Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, sal_Bool bClientOnly ) const; - SAL_DLLPRIVATE void ImplNotifyIconifiedState( sal_Bool bIconified ); + SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const; + SAL_DLLPRIVATE void ImplNotifyIconifiedState( bool bIconified ); SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow ); SAL_DLLPRIVATE void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos ); - SAL_DLLPRIVATE void ImplIsInTaskPaneList( sal_Bool mbIsInTaskList ); + SAL_DLLPRIVATE void ImplIsInTaskPaneList( bool mbIsInTaskList ); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; @@ -557,7 +557,7 @@ protected: // Single argument ctors shall be explicit. explicit Window( WindowType nType ); - void SetCompoundControl( sal_Bool bCompound ); + void SetCompoundControl( bool bCompound ); void ImplCallEventListeners( sal_uLong nEvent, void* pData = NULL ); void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); @@ -621,12 +621,12 @@ public: /*virtual*/ void RemoveChildEventListener( const Link& rEventListener ); sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); - sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); + bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); void RemoveUserEvent( sal_uLong nUserEvent ); void IncrementLockCount(); void DecrementLockCount(); - sal_Bool IsLocked( sal_Bool bChildren = sal_False ) const; + bool IsLocked( bool bChildren = false ) const; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS @@ -639,14 +639,14 @@ public: WinBits GetExtendedStyle() const; void SetType( WindowType nType ); WindowType GetType() const; - sal_Bool IsSystemWindow() const; - sal_Bool IsDialog() const; - sal_Bool IsMenuFloatingWindow() const; - sal_Bool IsToolbarFloatingWindow() const; - sal_Bool IsTopWindow() const; + bool IsSystemWindow() const; + bool IsDialog() const; + bool IsMenuFloatingWindow() const; + bool IsToolbarFloatingWindow() const; + bool IsTopWindow() const; SystemWindow* GetSystemWindow() const; - void EnableAllResize( sal_Bool bEnable = sal_True ); + void EnableAllResize( bool bEnable = true ); void SetBorderStyle( sal_uInt16 nBorderStyle ); sal_uInt16 GetBorderStyle() const; @@ -656,17 +656,17 @@ public: Size CalcOutputSize( const Size& rWinSz ) const; long CalcTitleWidth() const; - void EnableClipSiblings( sal_Bool bClipSiblings = sal_True ); + void EnableClipSiblings( bool bClipSiblings = true ); - void EnableChildTransparentMode( sal_Bool bEnable = sal_True ); - sal_Bool IsChildTransparentModeEnabled() const; + void EnableChildTransparentMode( bool bEnable = true ); + bool IsChildTransparentModeEnabled() const; - void SetMouseTransparent( sal_Bool bTransparent ); - sal_Bool IsMouseTransparent() const; - void SetPaintTransparent( sal_Bool bTransparent ); - sal_Bool IsPaintTransparent() const; - void SetDialogControlStart( sal_Bool bStart ); - sal_Bool IsDialogControlStart() const; + void SetMouseTransparent( bool bTransparent ); + bool IsMouseTransparent() const; + void SetPaintTransparent( bool bTransparent ); + bool IsPaintTransparent() const; + void SetDialogControlStart( bool bStart ); + bool IsDialogControlStart() const; void SetDialogControlFlags( sal_uInt16 nFlags ); sal_uInt16 GetDialogControlFlags() const; @@ -676,7 +676,7 @@ public: Point maPos; // mouse position in output coordinates }; PointerState GetPointerState(); - sal_Bool IsMouseOver(); + bool IsMouseOver(); sal_uLong GetCurrentModButtons(); @@ -687,12 +687,12 @@ public: const Rectangle* GetCursorRect() const; long GetCursorExtTextInputWidth() const; - void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, sal_Bool bVertical = sal_False ); + void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false ); using OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ); virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild ); - void UpdateSettings( const AllSettings& rSettings, sal_Bool bChild = sal_False ); + void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); void NotifyAllChildren( DataChangedEvent& rDCEvt ); void SetPointFont( const Font& rFont ); @@ -704,15 +704,15 @@ public: void SetControlFont(); void SetControlFont( const Font& rFont ); Font GetControlFont() const; - sal_Bool IsControlFont() const; + bool IsControlFont() const; void SetControlForeground(); void SetControlForeground( const Color& rColor ); Color GetControlForeground() const; - sal_Bool IsControlForeground() const; + bool IsControlForeground() const; void SetControlBackground(); void SetControlBackground( const Color& rColor ); Color GetControlBackground() const; - sal_Bool IsControlBackground() const; + bool IsControlBackground() const; void SetParentClipMode( sal_uInt16 nMode = 0 ); sal_uInt16 GetParentClipMode() const; @@ -720,10 +720,10 @@ public: void SetWindowRegionPixel(); void SetWindowRegionPixel( const Region& rRegion ); const Region& GetWindowRegionPixel() const; - sal_Bool IsWindowRegionPixel() const; + bool IsWindowRegionPixel() const; Region GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const; Region GetPaintRegion() const; - sal_Bool IsInPaint() const; + bool IsInPaint() const; // while IsInPaint returns true ExpandPaintClipRegion adds the // submitted region to the paint clip region so you can // paint additional parts of your window if necessary @@ -736,19 +736,19 @@ public: void Show( bool bVisible = true, sal_uInt16 nFlags = 0 ); void Hide() { Show( false ); } - sal_Bool IsVisible() const; - sal_Bool IsReallyVisible() const; - sal_Bool IsReallyShown() const; - sal_Bool IsInInitShow() const; + bool IsVisible() const; + bool IsReallyVisible() const; + bool IsReallyShown() const; + bool IsInInitShow() const; void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ) { Enable( false, bChild ); } - sal_Bool IsEnabled() const; + bool IsEnabled() const; - void EnableInput( bool bEnable = true, sal_Bool bChild = sal_True ); - void EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin, + void EnableInput( bool bEnable = true, bool bChild = true ); + void EnableInput( bool bEnable, bool bChild, bool bSysWin, const Window* pExcludeWindow = NULL ); - sal_Bool IsInputEnabled() const; + bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people using EnableInput for whole window hierarchies. @@ -762,12 +762,12 @@ public: @param bChild if true children are recursively set to AlwaysEnableInput */ - void AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild = sal_True ); + void AlwaysEnableInput( bool bAlways, bool bChild = true ); /** returns the current AlwaysEnableInput state @return true if window is in AlwaysEnableInput state */ - sal_Bool IsAlwaysEnableInput() const; + bool IsAlwaysEnableInput() const; /** Override <code>EnableInput</code>, counterpart to AlwaysEnableInput. Windows with AlwaysDisableInput will not get key events even if enabled and input enabled.This can be necessary due to other people using EnableInput @@ -782,7 +782,7 @@ public: @param bChild if true children are recursively set to AlwaysDisableInput */ - void AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild = sal_True ); + void AlwaysDisableInput( bool bAlways, bool bChild = true ); /** usually event handlers (see AddEventListener and AddChildEventListener) are not called on disabled, modal or input disabled windows. There are however rare cases @@ -811,7 +811,7 @@ public: @returns sal_True if a child or subchild is a running modal window */ - sal_Bool IsInModalMode() const; + bool IsInModalMode() const; /** * Necessary for calc ref input handling from modal dialogs @@ -823,8 +823,8 @@ public: void ToTop( sal_uInt16 nFlags = 0 ); void SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ); - void EnableAlwaysOnTop( sal_Bool bEnable = sal_True ); - sal_Bool IsAlwaysOnTopEnabled() const; + void EnableAlwaysOnTop( bool bEnable = true ); + bool IsAlwaysOnTopEnabled() const; virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, @@ -836,8 +836,8 @@ public: virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); virtual void SetOutputSizePixel( const Size& rNewSize ); - sal_Bool IsDefaultPos() const; - sal_Bool IsDefaultSize() const; + bool IsDefaultPos() const; + bool IsDefaultSize() const; // those conversion routines might deliver different results during UI mirroring Point OutputToScreenPixel( const Point& rPos ) const; @@ -853,7 +853,7 @@ public: // window extents of the client window, coordinates to be used in SetPosPixel Rectangle GetClientWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual sal_Bool IsScrollable() const; + virtual bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 ); virtual void Scroll( long nHorzScroll, long nVertScroll, @@ -862,27 +862,27 @@ public: virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ); void Validate( sal_uInt16 nFlags = 0 ); - sal_Bool HasPaintEvent() const; + bool HasPaintEvent() const; void Update(); void Flush(); void Sync(); // toggles new docking support, enabled via toolkit - void EnableDocking( sal_Bool bEnable = sal_True ); + void EnableDocking( bool bEnable = true ); // retrieves the single dockingmanager instance static DockingManager* GetDockingManager(); - void EnablePaint( sal_Bool bEnable ); - sal_Bool IsPaintEnabled() const; - void SetUpdateMode( sal_Bool bUpdate ); - sal_Bool IsUpdateMode() const; - void SetParentUpdateMode( sal_Bool bUpdate ); + void EnablePaint( bool bEnable ); + bool IsPaintEnabled() const; + void SetUpdateMode( bool bUpdate ); + bool IsUpdateMode() const; + void SetParentUpdateMode( bool bUpdate ); void GrabFocus(); - sal_Bool HasFocus() const; - sal_Bool HasChildPathFocus( sal_Bool bSystemWindow = sal_False ) const; - sal_Bool IsActive() const; - sal_Bool HasActiveChildFrame(); + bool HasFocus() const; + bool HasChildPathFocus( bool bSystemWindow = false ) const; + bool IsActive() const; + bool HasActiveChildFrame(); sal_uInt16 GetGetFocusFlags() const; void GrabFocusToDocument(); @@ -893,14 +893,14 @@ public: */ void SetFakeFocus( bool bFocus ); - sal_Bool IsCompoundControl() const; + bool IsCompoundControl() const; static sal_uIntPtr SaveFocus(); - static sal_Bool EndSaveFocus( sal_uIntPtr nSaveId, sal_Bool bRestore = sal_True ); + static bool EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore = true ); void CaptureMouse(); void ReleaseMouse(); - sal_Bool IsMouseCaptured() const; + bool IsMouseCaptured() const; void SetPointer( const Pointer& rPointer ); const Pointer& GetPointer() const; @@ -908,17 +908,17 @@ public: void SetPointerPosPixel( const Point& rPos ); Point GetPointerPosPixel(); Point GetLastPointerPosPixel(); - void ShowPointer( sal_Bool bVisible ); + void ShowPointer( bool bVisible ); void EnterWait(); void LeaveWait(); - sal_Bool IsWait() const; + bool IsWait() const; void SetCursor( Cursor* pCursor ); Cursor* GetCursor() const; void SetZoom( const Fraction& rZoom ); const Fraction& GetZoom() const; - sal_Bool IsZoom() const; + bool IsZoom() const; long CalcZoom( long n ) const; virtual void SetText( const OUString& rStr ); @@ -949,8 +949,8 @@ public: sal_uInt16 GetChildCount() const; Window* GetChild( sal_uInt16 nChild ) const; Window* GetWindow( sal_uInt16 nType ) const; - sal_Bool IsChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; - sal_Bool IsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; + bool IsChild( const Window* pWindow, bool bSystemWindow = false ) const; + bool IsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; void SetData( void* pNewData ); void* GetData() const; @@ -962,11 +962,11 @@ public: void Invert( const Polygon& rPoly, sal_uInt16 nFlags = 0 ); // transparent background for selected or checked items in toolboxes etc. - void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly ); + void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ); // the same, but fills a passed Color with a text color complementing the selection background - void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly, Color* pSelectionTextColor ); + void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, Color* pSelectionTextColor ); // support rounded edges in the selection rect - void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly, long nCornerRadius, Color* pSelectionTextColor, Color* pPaintColor ); + void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, long nCornerRadius, Color* pSelectionTextColor, Color* pPaintColor ); void ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags = SHOWTRACK_SMALL ); @@ -977,12 +977,12 @@ public: void StartTracking( sal_uInt16 nFlags = 0 ); void EndTracking( sal_uInt16 nFlags = 0 ); - sal_Bool IsTracking() const; + bool IsTracking() const; void StartAutoScroll( sal_uInt16 nFlags ); void EndAutoScroll(); - sal_Bool HandleScrollCommand( const CommandEvent& rCmd, + bool HandleScrollCommand( const CommandEvent& rCmd, ScrollBar* pHScrl = NULL, ScrollBar* pVScrl = NULL ); @@ -997,7 +997,7 @@ public: virtual void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); // Accessibility - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( bool bCreate = true ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); @@ -1026,8 +1026,8 @@ public: // to avoid sending accessibility events in cases like closing dialogs // by default checks complete parent path - sal_Bool IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath = sal_True ); - void SetAccessibilityEventsSuppressed(sal_Bool bSuppressed); + bool IsAccessibilityEventsSuppressed( bool bTraverseParentPath = true ); + void SetAccessibilityEventsSuppressed(bool bSuppressed); /// request XCanvas render interface for this window ::com::sun::star::uno::Reference< @@ -1046,8 +1046,8 @@ public: void SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ); // remember if it was generated by Toolkit - sal_Bool IsCreatedWithToolkit() const; - void SetCreatedWithToolkit( sal_Bool b ); + bool IsCreatedWithToolkit() const; + void SetCreatedWithToolkit( bool b ); // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys virtual Window* GetParentLabelFor( const Window* pLabel ) const; @@ -1259,8 +1259,8 @@ public: //------------------------------------- // form controls must never use native widgets, this can be toggled here - void EnableNativeWidget( sal_Bool bEnable = sal_True ); - sal_Bool IsNativeWidgetEnabled() const; + void EnableNativeWidget( bool bEnable = true ); + bool IsNativeWidgetEnabled() const; // a helper method for a Control's Draw method void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize ); diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx index fe50fe60e07d..cdadbbc2949f 100644 --- a/include/vcl/wmf.hxx +++ b/include/vcl/wmf.hxx @@ -55,13 +55,13 @@ struct WMF_EXTERNALHEADER } }; -sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_EXTERNALHEADER *pExtHeader = NULL ); +bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_EXTERNALHEADER *pExtHeader = NULL ); -VCL_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); +VCL_DLLPUBLIC bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, bool bPlaceable = true ); -sal_Bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL ); +bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL ); VCL_DLLPUBLIC bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 942ed10c9c76..be494afd49c1 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -44,7 +44,7 @@ class VCL_DLLPUBLIC WorkWindow : public SystemWindow { private: sal_uInt16 mnPresentationFlags; - sal_Bool mbPresentationMode:1, + bool mbPresentationMode:1, mbPresentationVisible:1, mbPresentationFull:1, mbFullScreenMode:1; @@ -67,37 +67,37 @@ public: explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); - virtual sal_Bool Close(); + virtual bool Close(); - void ShowFullScreenMode( sal_Bool bFullScreenMode, + void ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScreen ); /** @overload void ShowFullScreenMode(sal_Bool bFullScreenMode, sal_Int32 nDisplayScreen) */ - void ShowFullScreenMode( sal_Bool bFullScreenMode = sal_True ); - void EndFullScreenMode() { ShowFullScreenMode( sal_False ); } - sal_Bool IsFullScreenMode() const { return mbFullScreenMode; } + void ShowFullScreenMode( bool bFullScreenMode = true ); + void EndFullScreenMode() { ShowFullScreenMode( false ); } + bool IsFullScreenMode() const { return mbFullScreenMode; } - void StartPresentationMode( sal_Bool bPresentation, + void StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen ); /** @overload void StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_uInt32 nDisplayScreen) */ - void StartPresentationMode( sal_Bool bPresentation = sal_True, + void StartPresentationMode( bool bPresentation = true, sal_uInt16 nFlags = 0 ); - void EndPresentationMode() { StartPresentationMode( sal_False ); } - sal_Bool IsPresentationMode() const { return mbPresentationMode; } + void EndPresentationMode() { StartPresentationMode( false ); } + bool IsPresentationMode() const { return mbPresentationMode; } - sal_Bool IsMinimized() const; + bool IsMinimized() const; - sal_Bool SetPluginParent( SystemParentData* pParent ); + bool SetPluginParent( SystemParentData* pParent ); void Minimize(); void Restore(); - void Maximize( sal_Bool bMaximize = sal_True ); - sal_Bool IsMaximized() const; + void Maximize( bool bMaximize = true ); + bool IsMaximized() const; }; #endif // INCLUDED_VCL_WRKWIN_HXX diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index 812eb98bfa51..2f046138af52 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -43,25 +43,25 @@ public: void SetGroupChars( const OUString& r ) { maGroupChars = r; } TextSelection MatchGroup( const TextPaM& rCursor ) const; - sal_Bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, sal_Bool bForward = sal_True ); + bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward = true ); }; class VCL_DLLPUBLIC ExtTextView : public TextView { protected: - sal_Bool ImpIndentBlock( sal_Bool bRight ); + bool ImpIndentBlock( bool bRight ); public: ExtTextView( ExtTextEngine* pEng, Window* pWindow ); ~ExtTextView(); - sal_Bool MatchGroup(); + bool MatchGroup(); - sal_Bool Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, sal_Bool bForward ); - sal_uInt16 Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, sal_Bool bAll, sal_Bool bForward ); + bool Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward ); + sal_uInt16 Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bAll, bool bForward ); - sal_Bool IndentBlock(); - sal_Bool UnindentBlock(); + bool IndentBlock(); + bool UnindentBlock(); }; #endif // INCLUDED_VCL_XTEXTEDT_HXX |