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 /vcl/inc | |
| parent | 1c8402465cfd4df862409dc310f5f099d044c4d8 (diff) | |
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'vcl/inc')
45 files changed, 341 insertions, 341 deletions
diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h index d1ccb875baa0..e3e92c78a8a5 100644 --- a/vcl/inc/accel.h +++ b/vcl/inc/accel.h @@ -31,7 +31,7 @@ public: KeyCode maKeyCode; Accelerator* mpAccel; Accelerator* mpAutoAccel; - sal_Bool mbEnabled; + bool mbEnabled; }; void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ); diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx index 98dd74f9c6ed..4645cb27abc2 100644 --- a/vcl/inc/accmgr.hxx +++ b/vcl/inc/accmgr.hxx @@ -41,13 +41,13 @@ public: } ~ImplAccelManager(); - sal_Bool InsertAccel( Accelerator* pAccel ); + bool InsertAccel( Accelerator* pAccel ); void RemoveAccel( Accelerator* pAccel ); - void EndSequence( sal_Bool bCancel = sal_False ); - void FlushAccel() { EndSequence( sal_True ); } + void EndSequence( bool bCancel = false ); + void FlushAccel() { EndSequence( true ); } - sal_Bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); + bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); }; #endif // INCLUDED_VCL_INC_ACCMGR_HXX diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 051200458349..296b415f7b19 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -92,16 +92,16 @@ private: long mnOrgMenuHeight; sal_uInt16 mnTitleType; sal_uInt16 mnBorderStyle; - sal_Bool mbFloatWindow; - sal_Bool mbSmallOutBorder; - sal_Bool mbFrameBorder; - sal_Bool mbPined; - sal_Bool mbRollUp; - sal_Bool mbMenuHide; - sal_Bool mbDockBtn; - sal_Bool mbHideBtn; - sal_Bool mbMenuBtn; - sal_Bool mbDisplayActive; + bool mbFloatWindow; + bool mbSmallOutBorder; + bool mbFrameBorder; + bool mbPined; + bool mbRollUp; + bool mbMenuHide; + bool mbDockBtn; + bool mbHideBtn; + bool mbMenuBtn; + bool mbDisplayActive; using Window::ImplInit; void ImplInit( Window* pParent, @@ -136,27 +136,27 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); void InitView(); - void UpdateView( sal_Bool bNewView, const Size& rNewOutSize ); + void UpdateView( bool bNewView, const Size& rNewOutSize ); void InvalidateBorder(); using Window::Draw; void Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos ); - void SetDisplayActive( sal_Bool bActive ); - sal_Bool IsDisplayActive() const { return mbDisplayActive; } + void SetDisplayActive( bool bActive ); + bool IsDisplayActive() const { return mbDisplayActive; } void SetTitleType( sal_uInt16 nTitleType, const Size& rSize ); void SetBorderStyle( sal_uInt16 nStyle ); sal_uInt16 GetBorderStyle() const { return mnBorderStyle; } - void SetPin( sal_Bool bPin ); - void SetRollUp( sal_Bool bRollUp, const Size& rSize ); + void SetPin( bool bPin ); + void SetRollUp( bool bRollUp, const Size& rSize ); void SetCloser(); - void SetDockButton( sal_Bool bDockButton ); - void SetHideButton( sal_Bool bHideButton ); - void SetMenuButton( sal_Bool bMenuButton ); + void SetDockButton( bool bDockButton ); + void SetHideButton( bool bHideButton ); + void SetMenuButton( bool bMenuButton ); void UpdateMenuHeight(); void SetMenuBarWindow( Window* pWindow ); - void SetMenuBarMode( sal_Bool bHide ); + void SetMenuBarMode( bool bHide ); void SetMinOutputSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; mnMinHeight = nHeight; } @@ -208,9 +208,9 @@ struct ImplBorderFrameData sal_uInt16 mnHideState; sal_uInt16 mnHelpState; sal_uInt16 mnTitleType; - sal_Bool mbFloatWindow; - sal_Bool mbDragFull; - sal_Bool mbTitleClipped; + bool mbFloatWindow; + bool mbDragFull; + bool mbTitleClipped; }; class ImplBorderWindowView @@ -218,9 +218,9 @@ class ImplBorderWindowView public: virtual ~ImplBorderWindowView(); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool Tracking( const TrackingEvent& rTEvt ); + virtual bool MouseMove( const MouseEvent& rMEvt ); + virtual bool MouseButtonDown( const MouseEvent& rMEvt ); + virtual bool Tracking( const TrackingEvent& rTEvt ); virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0; @@ -232,9 +232,9 @@ public: void ImplInitTitle( ImplBorderFrameData* pData ); sal_uInt16 ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ); - sal_Bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); - sal_Bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); - sal_Bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ); + bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); + bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); + bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ); OUString ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ); long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const; }; @@ -283,9 +283,9 @@ public: ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ); ~ImplStdBorderWindowView(); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool Tracking( const TrackingEvent& rTEvt ); + virtual bool MouseMove( const MouseEvent& rMEvt ); + virtual bool MouseButtonDown( const MouseEvent& rMEvt ); + virtual bool Tracking( const TrackingEvent& rTEvt ); virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual Rectangle GetMenuRect() const; diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx index dd92f8edd699..5c5e006fdfa1 100644 --- a/vcl/inc/cvtsvm.hxx +++ b/vcl/inc/cvtsvm.hxx @@ -83,7 +83,7 @@ private: SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, - VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, + VirtualDevice& rSaveVDev, bool& rRop_0_1, Color& rLineCol, ::std::stack<Color*>& rLineColStack, rtl_TextEncoding& rActualCharSet ); diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index dcda3c5419d8..3d6c6b617c83 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -36,7 +36,7 @@ class DNDListenerContainer : public ::vcl::unohelper::MutexHelper, ::com::sun::star::datatransfer::dnd::XDropTargetDropContext, ::com::sun::star::datatransfer::dnd::XDropTarget > { - sal_Bool m_bActive; + bool m_bActive; sal_Int8 m_nDefaultActions; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext > m_xDropTargetDragContext; diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx index 285a9dc2e70a..4aa5f356e2cf 100644 --- a/vcl/inc/generic/gendisp.hxx +++ b/vcl/inc/generic/gendisp.hxx @@ -68,7 +68,7 @@ public: virtual bool DispatchInternalEvent(); bool HasUserEvents() const; - sal_Bool MouseCaptured( const SalFrame *pFrameData ) const + bool MouseCaptured( const SalFrame *pFrameData ) const { return m_pCapture == pFrameData; } SalFrame* GetCaptureFrame() const { return m_pCapture; } diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index b63f8b43f88c..539c2b4fadd0 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -40,9 +40,9 @@ public: // overload all pure virtual methods virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); - virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); - virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual bool SetPrinterData( ImplJobSetup* pSetupData ); + virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, @@ -76,22 +76,22 @@ public: virtual ~PspSalPrinter(); // overload all pure virtual methods - virtual sal_Bool StartJob( const OUString* pFileName, + virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); - virtual sal_Bool StartJob( const OUString*, + virtual bool StartJob( const OUString*, const OUString&, const OUString&, ImplJobSetup*, vcl::PrinterController& i_rController ); - virtual sal_Bool EndJob(); - virtual sal_Bool AbortJob(); + virtual bool EndJob(); + virtual bool AbortJob(); virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); - virtual sal_Bool EndPage(); + virtual bool EndPage(); virtual sal_uIntPtr GetErrorCode(); }; diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 044cb123fb21..9a2c8c559796 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -97,7 +97,7 @@ public: virtual void ClearDevFontCache(); virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -137,13 +137,13 @@ public: const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, com::sun::star::drawing::LineCap); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); @@ -172,7 +172,7 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); virtual bool drawAlphaBitmap( const SalTwoRect&, diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index 77ac4676b2fc..dee151c6541d 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -75,7 +75,7 @@ public: ~PrinterColor () {} - sal_Bool Is () const + bool Is () const { return meColorspace != eInvalid; } ColorSpace GetColorSpace () const @@ -86,14 +86,14 @@ public: { return mnGreen; } sal_uInt16 GetBlue () const { return mnBlue; } - sal_Bool operator== (const PrinterColor& aColor) const + bool operator== (const PrinterColor& aColor) const { return aColor.Is() && this->Is() && mnRed == aColor.mnRed && mnGreen == aColor.mnGreen && mnBlue == aColor.mnBlue; } - sal_Bool operator!= (const PrinterColor& aColor) const + bool operator!= (const PrinterColor& aColor) const { return ! (aColor==*this); } PrinterColor& operator= (const PrinterColor& aColor) { @@ -189,8 +189,8 @@ private: sal_uInt16 mnDepth; sal_uInt16 mnPSLevel; - sal_Bool mbColor; - sal_Bool mbUploadPS42Fonts; + bool mbColor; + bool mbUploadPS42Fonts; osl::File* mpPageHeader; osl::File* mpPageBody; @@ -219,7 +219,7 @@ private: /* bitmap drawing implementation */ - sal_Bool mbCompressBmp; + bool mbCompressBmp; void DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea); void writePS2ImageHeader (const Rectangle& rArea, psp::ImageType nType); @@ -232,7 +232,7 @@ private: /* clip region */ std::list< Rectangle > maClipRegion; - sal_Bool JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it, + bool JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it, Point& aOldPoint, sal_Int32& nColumn ); /* color settings */ @@ -247,7 +247,7 @@ private: /* font */ friend class Font2; - int getCharWidth (sal_Bool b_vert, sal_Unicode n_char, + int getCharWidth (bool b_vert, sal_Unicode n_char, CharacterMetric *p_bbox); fontID getCharMetric (const Font2 &rFont, sal_Unicode n_char, CharacterMetric *p_bbox); @@ -321,8 +321,8 @@ public: public: PrinterGfx(); ~PrinterGfx(); - sal_Bool Init (PrinterJob &rPrinterSpec); - sal_Bool Init (const JobData& rData); + bool Init (PrinterJob &rPrinterSpec); + bool Init (const JobData& rData); void Clear(); // query depth @@ -331,7 +331,7 @@ public: // clip region void ResetClipRegion (); void BeginSetClipRegion (sal_uInt32); - sal_Bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY, + bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY, sal_Int32 nDX, sal_Int32 nDY); void EndSetClipRegion (); @@ -364,7 +364,7 @@ public: const sal_uInt8* const* pFlgAry); // eps - sal_Bool DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize); + bool DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize); // image drawing void DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index 5c521bb37675..c9ea6b7b5d92 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -89,7 +89,7 @@ public: // for usage in PrinterGfx void GetScale (double &rXScale, double &rYScale) const; sal_uInt16 GetDepth () const; sal_uInt16 GetPostscriptLevel (const JobData *pJobData = NULL) const; - sal_Bool IsColorPrinter () const; + bool IsColorPrinter () const; osl::File* GetCurrentPageHeader (); osl::File* GetCurrentPageBody (); @@ -114,7 +114,7 @@ public: * the quick command for spooling should be used instead * of the normal command */ - sal_Bool StartJob (const OUString& rFileName, + bool StartJob (const OUString& rFileName, int nMode, const OUString& rJobName, const OUString& rAppName, @@ -122,12 +122,12 @@ public: PrinterGfx* pGraphics, bool bIsQuickJob ); - sal_Bool EndJob (); + bool EndJob (); - sal_Bool AbortJob (); + bool AbortJob (); - sal_Bool StartPage (const JobData& rJobSetup); - sal_Bool EndPage (); + bool StartPage (const JobData& rJobSetup); + bool EndPage (); }; } /* namespace psp */ diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 865fd280b1c5..c4e88c312fb2 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -79,7 +79,7 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -96,7 +96,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); virtual void StartPresentation( sal_Bool bStart ); virtual void SetAlwaysOnTop( sal_Bool bOnTop ); @@ -110,7 +110,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep(); diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 94a5c1ce4e52..9733e49bf18c 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -155,7 +155,7 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding, @@ -194,13 +194,13 @@ public: virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); @@ -230,7 +230,7 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx index d9ac08f8fb6c..2c404ee2b048 100644 --- a/vcl/inc/headless/svpprn.hxx +++ b/vcl/inc/headless/svpprn.hxx @@ -30,7 +30,7 @@ class SvpSalInfoPrinter : public PspSalInfoPrinter { public: - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); }; class SvpSalPrinter : public PspSalPrinter diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 6a0b031c132a..a896db8300d4 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -44,8 +44,8 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool SetSize( long nNewDX, long nNewDY ); - virtual sal_Bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ); + virtual bool SetSize( long nNewDX, long nNewDY ); + virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ); virtual void GetSize( long& rWidth, long& rHeight ); }; diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 432748f4a682..02fc85ec0985 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -36,7 +36,7 @@ public: ImplIdleMgr(); ~ImplIdleMgr(); - sal_Bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); + bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); void RemoveIdleHdl( const Link& rLink ); void RestartIdler() diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 58d6f9ccdbfd..cb90e5de30df 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -50,7 +50,7 @@ struct ImplEntryType OUString maStr; Image maImage; void* mpUserData; - sal_Bool mbIsSelected; + bool mbIsSelected; long mnFlags; long mnHeight; @@ -60,7 +60,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = sal_False; + mbIsSelected = false; mpUserData = NULL; } @@ -69,7 +69,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = sal_False; + mbIsSelected = false; mpUserData = NULL; } @@ -78,7 +78,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = sal_False; + mbIsSelected = false; mpUserData = NULL; } }; @@ -95,7 +95,7 @@ private: sal_uInt16 mnMaxMRUCount; Link maSelectionChangedHdl; - sal_Bool mbCallSelectionChangedHdl; + bool mbCallSelectionChangedHdl; boost::ptr_vector<ImplEntryType> maEntries; ImplEntryType* GetEntry( sal_uInt16 nPos ) const @@ -109,14 +109,14 @@ public: ImplEntryList( Window* pWindow ); ~ImplEntryList(); - sal_uInt16 InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, sal_Bool bSort ); + sal_uInt16 InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, bool bSort ); void RemoveEntry( sal_uInt16 nPos ); const ImplEntryType* GetEntryPtr( sal_uInt16 nPos ) const { return (const ImplEntryType*) GetEntry( nPos ); } ImplEntryType* GetMutableEntryPtr( sal_uInt16 nPos ) const { return GetEntry( nPos ); } void Clear(); - sal_uInt16 FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart = 0, sal_Bool bForward = sal_True, sal_Bool bLazy = sal_True ) const; - sal_uInt16 FindEntry( const OUString& rStr, sal_Bool bSearchMRUArea = sal_False ) const; + sal_uInt16 FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart = 0, bool bForward = true, bool bLazy = true ) const; + sal_uInt16 FindEntry( const OUString& rStr, bool bSearchMRUArea = false ) const; sal_uInt16 FindEntry( const void* pData ) const; /// helper: add up heights up to index nEndIndex. @@ -127,11 +127,11 @@ public: long GetEntryHeight( sal_uInt16 nPos ) const; sal_uInt16 GetEntryCount() const { return (sal_uInt16)maEntries.size(); } - sal_Bool HasImages() const { return mnImages ? sal_True : sal_False; } + bool HasImages() const { return mnImages ? sal_True : sal_False; } OUString GetEntryText( sal_uInt16 nPos ) const; - sal_Bool HasEntryImage( sal_uInt16 nPos ) const; + bool HasEntryImage( sal_uInt16 nPos ) const; Image GetEntryImage( sal_uInt16 nPos ) const; void SetEntryData( sal_uInt16 nPos, void* pNewData ); @@ -140,12 +140,12 @@ public: void SetEntryFlags( sal_uInt16 nPos, long nFlags ); long GetEntryFlags( sal_uInt16 nPos ) const; - void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); + void SelectEntry( sal_uInt16 nPos, bool bSelect ); sal_uInt16 GetSelectEntryCount() const; OUString GetSelectEntry( sal_uInt16 nIndex ) const; sal_uInt16 GetSelectEntryPos( sal_uInt16 nIndex ) const; - sal_Bool IsEntryPosSelected( sal_uInt16 nIndex ) const; + bool IsEntryPosSelected( sal_uInt16 nIndex ) const; void SetLastSelected( sal_uInt16 nPos ) { mnLastSelected = nPos; } sal_uInt16 GetLastSelected() const { return mnLastSelected; } @@ -155,7 +155,7 @@ public: void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } - void SetCallSelectionChangedHdl( sal_Bool bCall ) { mbCallSelectionChangedHdl = bCall; } + void SetCallSelectionChangedHdl( bool bCall ) { mbCallSelectionChangedHdl = bCall; } void SetMRUCount( sal_uInt16 n ) { mnMRUCount = n; } sal_uInt16 GetMRUCount() const { return mnMRUCount; } @@ -250,8 +250,8 @@ protected: virtual void GetFocus(); virtual void LoseFocus(); - sal_Bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False, sal_Bool bSelectPosChange = sal_False ); - void ImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false ); + bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false ); + void ImplPaint( sal_uInt16 nPos, bool bErase = false, bool bLayout = false ); void ImplDoPaint( const Rectangle& rRect, bool bLayout = false ); void ImplCalcMetrics(); void ImplUpdateEntryMetrics( ImplEntryType& rEntry ); @@ -280,14 +280,14 @@ public: sal_uInt16 GetDisplayLineCount() const; void SetEntryFlags( sal_uInt16 nPos, long nFlags ); - void DrawEntry( sal_uInt16 nPos, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false ); + void DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false, bool bLayout = false ); - void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); + void SelectEntry( sal_uInt16 nPos, bool bSelect ); void DeselectAll(); sal_uInt16 GetEntryPosForPoint( const Point& rPoint ) const; sal_uInt16 GetLastVisibleEntry() const; - sal_Bool ProcessKeyInput( const KeyEvent& rKEvt ); + bool ProcessKeyInput( const KeyEvent& rKEvt ); void SetTopEntry( sal_uInt16 nTop ); sal_uInt16 GetTopEntry() const { return mnTop; } @@ -297,7 +297,7 @@ public: void SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; } ProminentEntry GetProminentEntryType() const { return meProminentType; } using Window::IsVisible; - sal_Bool IsVisible( sal_uInt16 nEntry ) const; + bool IsVisible( sal_uInt16 nEntry ) const; long GetLeftIndent() const { return mnLeft; } void SetLeftIndent( long n ); @@ -361,7 +361,7 @@ public: bool IsReadOnly() const { return mbReadOnly; } using Control::ImplInitSettings; - void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); sal_uInt16 ImplGetTextStyle() const; /// pb: #106948# explicit mirroring for calc @@ -430,13 +430,13 @@ public: void SetEntryFlags( sal_uInt16 nPos, long nFlags ); - void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); + void SelectEntry( sal_uInt16 nPos, bool bSelect ); void SetNoSelection(); void ResetCurrentPos() { maLBWindow.ResetCurrentPos(); } sal_uInt16 GetCurrentPos() const { return maLBWindow.GetCurrentPos(); } - sal_Bool ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } - sal_Bool HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); + bool ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } + bool HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); void SetSeparatorPos( sal_uInt16 n ) { maLBWindow.SetSeparatorPos( n ); } sal_uInt16 GetSeparatorPos() const { return maLBWindow.GetSeparatorPos(); } @@ -445,7 +445,7 @@ public: sal_uInt16 GetTopEntry() const { return maLBWindow.GetTopEntry(); } void ShowProminentEntry( sal_uInt16 nPos ) { maLBWindow.ShowProminentEntry( nPos ); } using Window::IsVisible; - sal_Bool IsVisible( sal_uInt16 nEntry ) const { return maLBWindow.IsVisible( nEntry ); } + bool IsVisible( sal_uInt16 nEntry ) const { return maLBWindow.IsVisible( nEntry ); } void SetProminentEntryType( ProminentEntry eType ) { maLBWindow.SetProminentEntryType( eType ); } ProminentEntry GetProminentEntryType() const { return maLBWindow.GetProminentEntryType(); } @@ -454,18 +454,18 @@ public: void SetLeftIndent( sal_uInt16 n ) { maLBWindow.SetLeftIndent( n ); } void ScrollHorz( short nDiff ) { maLBWindow.ScrollHorz( nDiff ); } - void SetTravelSelect( sal_Bool bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); } - sal_Bool IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } - sal_Bool IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } + void SetTravelSelect( bool bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); } + bool IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } + bool IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } - void EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } - sal_Bool IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } + void EnableMultiSelection( bool bMulti, bool bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } + bool IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } - void SetMultiSelectionSimpleMode( sal_Bool bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } - sal_Bool IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } + void SetMultiSelectionSimpleMode( bool bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } + bool IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } - void SetReadOnly( sal_Bool b ) { maLBWindow.SetReadOnly( b ); } - sal_Bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } + void SetReadOnly( bool b ) { maLBWindow.SetReadOnly( b ); } + bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } Size CalcSize( sal_uInt16 nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } @@ -488,8 +488,8 @@ public: void SetListItemSelectHdl( const Link& rLink ) { maLBWindow.SetListItemSelectHdl( rLink ); } const Link& GetListItemSelectHdl() const { return maLBWindow.GetListItemSelectHdl(); } void SetSelectionChangedHdl( const Link& rLnk ) { maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); } - void SetCallSelectionChangedHdl( sal_Bool bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); } - sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } + void SetCallSelectionChangedHdl( bool bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); } + bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } sal_uInt16 GetSelectModifier() const { return maLBWindow.GetSelectModifier(); } void SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ); @@ -514,7 +514,7 @@ private: Size maPrefSz; sal_uInt16 mnDDLineCount; sal_uInt16 mnPopupModeStartSaveSelection; - sal_Bool mbAutoWidth; + bool mbAutoWidth; protected: virtual bool PreNotify( NotifyEvent& rNEvt ); @@ -527,11 +527,11 @@ public: void SetPrefSize( const Size& rSz ) { maPrefSz = rSz; } const Size& GetPrefSize() const { return maPrefSz; } - void SetAutoWidth( sal_Bool b ) { mbAutoWidth = b; } - sal_Bool IsAutoWidth() const { return mbAutoWidth; } + void SetAutoWidth( bool b ) { mbAutoWidth = b; } + bool IsAutoWidth() const { return mbAutoWidth; } Size CalcFloatSize(); - void StartFloat( sal_Bool bStartTracking ); + void StartFloat( bool bStartTracking ); virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); @@ -602,7 +602,7 @@ public: void EnableUserDraw( bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } - void DrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false ); + void DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false, bool bLayout = false ); bool GetEdgeBlending() const { return mbEdgeBlending; } void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; } @@ -611,7 +611,7 @@ public: class ImplBtn : public PushButton { private: - sal_Bool mbDown; + bool mbDown; Link maMBDownHdl; @@ -627,7 +627,7 @@ public: }; -void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); +void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); #endif // INCLUDED_VCL_INC_ILSTBOX_HXX diff --git a/vcl/inc/image.h b/vcl/inc/image.h index a59c865b23ed..370e19f46cca 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -119,7 +119,7 @@ struct ImplImageRefData ImplImageRefData() {} // Um Warning zu umgehen ~ImplImageRefData(); - sal_Bool IsEqual( const ImplImageRefData& rData ); + bool IsEqual( const ImplImageRefData& rData ); }; // ---------------- @@ -134,7 +134,7 @@ struct ImplImageData ImplImageData( const BitmapEx& rBmpEx ); ~ImplImageData(); - sal_Bool IsEqual( const ImplImageData& rData ); + bool IsEqual( const ImplImageData& rData ); }; // ------------- diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index 31b6e4329b09..c0eb805090f8 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -43,16 +43,16 @@ public: void ImplSetSalBitmap( SalBitmap* pSalBitmap ); SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; } - sal_Bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); - sal_Bool ImplCreate( const ImpBitmap& rImpBitmap ); - sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); - sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); + bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); + bool ImplCreate( const ImpBitmap& rImpBitmap ); + bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); + bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); Size ImplGetSize() const; sal_uInt16 ImplGetBitCount() const; - BitmapBuffer* ImplAcquireBuffer( sal_Bool bReadOnly ); - void ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly ); + BitmapBuffer* ImplAcquireBuffer( bool bReadOnly ); + void ImplReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); sal_uLong ImplGetRefCount() const { return mnRefCount; } void ImplIncRefCount() { mnRefCount++; } diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 0bdd8edb2969..75bc9267acb7 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -75,7 +75,7 @@ private: FontEmphasisMark meEmphasisMark; short mnOrientation; FontKerning mnKerning; - sal_Bool mbWordLine:1, + bool mbWordLine:1, mbOutline:1, mbConfigLookup:1, // there was a config lookup mbShadow:1, diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 6926aee63c64..931bf6b355f5 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -64,8 +64,8 @@ private: sal_uLong mnDocFilePos; mutable sal_uLong mnSizeBytes; sal_uLong mnRefCount; - sal_Bool mbSwapOut; - sal_Bool mbSwapUnderway; + bool mbSwapOut; + bool mbSwapUnderway; // SvgData support SvgDataPtr maSvgData; @@ -82,20 +82,20 @@ private: virtual ~ImpGraphic(); ImpGraphic& operator=( const ImpGraphic& rImpGraphic ); - sal_Bool operator==( const ImpGraphic& rImpGraphic ) const; - sal_Bool operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } + bool operator==( const ImpGraphic& rImpGraphic ) const; + bool operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } - void ImplClearGraphics( sal_Bool bCreateSwapInfo ); + void ImplClearGraphics( bool bCreateSwapInfo ); void ImplClear(); GraphicType ImplGetType() const; void ImplSetDefaultType(); - sal_Bool ImplIsSupportedGraphic() const; + bool ImplIsSupportedGraphic() const; - sal_Bool ImplIsTransparent() const; - sal_Bool ImplIsAlpha() const; - sal_Bool ImplIsAnimated() const; - sal_Bool ImplIsEPS() const; + bool ImplIsTransparent() const; + bool ImplIsAlpha() const; + bool ImplIsAnimated() const; + bool ImplIsEPS() const; Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; @@ -141,24 +141,24 @@ private: const OUString& ImplGetDocFileName() const; sal_uLong ImplGetDocFilePos() const; - sal_Bool ImplReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); - sal_Bool ImplWriteEmbedded( SvStream& rOStream ); + bool ImplReadEmbedded( SvStream& rIStream, bool bSwap = false ); + bool ImplWriteEmbedded( SvStream& rOStream ); - sal_Bool ImplSwapIn(); - sal_Bool ImplSwapIn( SvStream* pIStm ); + bool ImplSwapIn(); + bool ImplSwapIn( SvStream* pIStm ); - sal_Bool ImplSwapOut(); - sal_Bool ImplSwapOut( SvStream* pOStm ); + bool ImplSwapOut(); + bool ImplSwapOut( SvStream* pOStm ); - sal_Bool ImplIsSwapOut() const; + bool ImplIsSwapOut() const; void ImplSetLink( const GfxLink& ); GfxLink ImplGetLink(); - sal_Bool ImplIsLink() const; + bool ImplIsLink() const; sal_uLong ImplGetChecksum() const; - sal_Bool ImplExportNative( SvStream& rOStm ) const; + bool ImplExportNative( SvStream& rOStm ) const; friend SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ); friend SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ); diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index f81f1e5fd798..186e4406fac1 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -36,7 +36,7 @@ typedef struct OctreeNode OctreeNode* pNext; OctreeNode* pNextInCache; sal_uInt16 nPalIndex; - sal_Bool bLeaf; + bool bLeaf; } NODE; typedef NODE* PNODE; diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index e142f0ab0101..11e4ea0e8907 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -226,7 +226,7 @@ namespace vcl Size maDetailsCollapsedSize; Size maDetailsExpandedSize; - sal_Bool mbShowLayoutPage; + bool mbShowLayoutPage; Size getJobPageSize(); void updateNup(); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 41b510f7e879..a30ca80c277a 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -115,7 +115,7 @@ public: // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual sal_Bool PostEvent( void* pData ) = 0; + virtual bool PostEvent( void* pData ) = 0; virtual void SetTitle( const OUString& rTitle ) = 0; virtual void SetIcon( sal_uInt16 nIcon ) = 0; @@ -142,7 +142,7 @@ public: const SalFrameGeometry& GetUnmirroredGeometry() const { return maGeometry; } virtual void SetWindowState( const SalFrameState* pState ) = 0; - virtual sal_Bool GetWindowState( SalFrameState* pState ) = 0; + virtual bool GetWindowState( SalFrameState* pState ) = 0; virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) = 0; // Enable/Disable ScreenSaver, SystemAgents, ... @@ -173,7 +173,7 @@ public: // returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType' // returns sal_False if no mapping exists or function not supported // this is required for advanced menu support - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 7c3ffdb005e8..3c4d04709432 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -110,9 +110,9 @@ protected: const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, com::sun::star::drawing::LineCap) = 0; - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0; + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0; // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, @@ -139,15 +139,15 @@ protected: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0; // native widget rendering methods that require mirroring - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ); - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -260,7 +260,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -352,7 +352,7 @@ public: void mirror( long& nX, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; - sal_Bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; + bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; void mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( ImplControlValue&, const OutputDevice*, bool bBack = false ) const; @@ -385,15 +385,15 @@ public: com::sun::star::drawing::LineCap i_eLineCap, const OutputDevice* i_pOutDev); - sal_Bool DrawPolyLineBezier( sal_uInt32 nPoints, + bool DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); - sal_Bool DrawPolygonBezier( sal_uInt32 nPoints, + bool DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); - sal_Bool DrawPolyPolygonBezier( sal_uInt32 nPoly, + bool DrawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry, @@ -443,7 +443,7 @@ public: SalInvert nFlags, const OutputDevice *pOutDev ); - sal_Bool DrawEPS( long nX, long nY, + bool DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, @@ -452,10 +452,10 @@ public: // native widget rendering functions // Query the platform layer for control support - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); // 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, @@ -463,7 +463,7 @@ public: const OutputDevice *pOutDev ); // 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, @@ -472,7 +472,7 @@ public: const OutputDevice *pOutDev ); // 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/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 2a15583dbbfa..6515fc2fab0f 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -65,7 +65,7 @@ public: SalMenu() {} virtual ~SalMenu(); - virtual sal_Bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars + virtual bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) = 0; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 302200a6a9c2..219e2ce026fe 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -39,10 +39,10 @@ class VCL_PLUGIN_PUBLIC SalObject { void* m_pInst; SALOBJECTPROC m_pCallback; - sal_Bool m_bMouseTransparent:1, + bool m_bMouseTransparent:1, m_bEraseBackground:1; public: - SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( sal_False ), m_bEraseBackground( sal_True ) {} + SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( false ), m_bEraseBackground( true ) {} virtual ~SalObject(); virtual void ResetClipRegion() = 0; @@ -67,13 +67,13 @@ public: { m_pInst = pInst; m_pCallback = pProc; } long CallCallback( sal_uInt16 nEvent, const void* pEvent ) { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; } - void SetMouseTransparent( sal_Bool bMouseTransparent ) + void SetMouseTransparent( bool bMouseTransparent ) { m_bMouseTransparent = bMouseTransparent; } - sal_Bool IsMouseTransparent() + bool IsMouseTransparent() { return m_bMouseTransparent; } - void EnableEraseBackground( sal_Bool bEnable ) + void EnableEraseBackground( bool bEnable ) { m_bEraseBackground = bEnable; } - sal_Bool IsEraseBackgroundEnabled() + bool IsEraseBackgroundEnabled() { return m_bEraseBackground; } }; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 3e96c557122f..ce003ff17354 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -61,15 +61,15 @@ public: virtual SalGraphics* GetGraphics() = 0; virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; // This function set the driver data and // set the new indepen data in pSetupData - virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ) = 0; + virtual bool SetPrinterData( ImplJobSetup* pSetupData ) = 0; // This function merged the indepen driver data // and set the new indepen data in pSetupData // Only the data must changed, where the bit // in nFlags is set - virtual sal_Bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) = 0; + virtual bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) = 0; virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, @@ -90,7 +90,7 @@ public: SalPrinter() {} virtual ~SalPrinter(); - virtual sal_Bool StartJob( const OUString* pFileName, + virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, sal_uLong nCopies, @@ -100,16 +100,16 @@ public: // implement for pull model print systems only, // default implementations (see salvtables.cxx) just returns sal_False - virtual sal_Bool StartJob( const OUString* pFileName, + virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, ImplJobSetup* pSetupData, vcl::PrinterController& rController ); - virtual sal_Bool EndJob() = 0; - virtual sal_Bool AbortJob() = 0; + virtual bool EndJob() = 0; + virtual bool AbortJob() = 0; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) = 0; - virtual sal_Bool EndPage() = 0; + virtual bool EndPage() = 0; virtual sal_uLong GetErrorCode() = 0; }; diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 2720e34f99bc..736ee06822a5 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -37,10 +37,10 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; // Set new size, without saving the old contents - virtual sal_Bool SetSize( long nNewDX, long nNewDY ) = 0; + virtual bool SetSize( long nNewDX, long nNewDY ) = 0; // Set new size using a buffer at the given address - virtual sal_Bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray & /* pBuffer */ ) + virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray & /* pBuffer */ ) { // Only the headless virtual device has an implementation that uses pBuffer. return SetSize( nNewDX, nNewDY ); diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index b592a6ab7768..22b71c6b9d94 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -155,11 +155,11 @@ struct SalWheelMouseEvent long mnNotchDelta; // Number of fixed rotations sal_uLong mnScrollLines; // Actual number of lines to scroll sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2|MOUSE_LEFT|MOUSE_MIDDLE|MOUSE_RIGHT) - sal_Bool mbHorz; // Horizontal - sal_Bool mbDeltaIsPixel; // delta value is a pixel value (on touch devices) + bool mbHorz; // Horizontal + bool mbDeltaIsPixel; // delta value is a pixel value (on touch devices) SalWheelMouseEvent() - : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( sal_False ), mbDeltaIsPixel( sal_False ) + : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( false ), mbDeltaIsPixel( false ) {} }; diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index c86b5a271a68..ba69bda08d9b 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -505,7 +505,7 @@ namespace vcl * MapString() replaces the UCS-2 characters in str with glyphIDs. * @ingroup sft */ - int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical); + int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical); /** * Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index ec9c475c5395..f46bf003f9cc 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -134,11 +134,11 @@ struct ImplSVAppData sal_uInt16 mnSysWinMode; // Mode, when SystemWindows should be created sal_uInt16 mnLayout; // --- RTL-Flags --- currently not used, only for testing short mnDialogScaleX; // Scale X-Positions and sizes in Dialogs - sal_Bool mbInAppMain; // is Application::Main() on stack - sal_Bool mbInAppExecute; // is Application::Execute() on stack - sal_Bool mbAppQuit; // is Application::Quit() called - sal_Bool mbSettingsInit; // sal_True: Settings are initialized - sal_Bool mbNoYield; // Application::Yield will not wait for events if the queue is empty + bool mbInAppMain; // is Application::Main() on stack + bool mbInAppExecute; // is Application::Execute() on stack + bool mbAppQuit; // is Application::Quit() called + bool mbSettingsInit; // sal_True: Settings are initialized + bool mbNoYield; // Application::Yield will not wait for events if the queue is empty // essentially that makes it the same as Application::Reschedule Application::DialogCancelMode meDialogCancel; // sal_True: All Dialog::Execute() calls will be terminated immediately with return sal_False long mnDefaultLayoutBorder; // default value in pixel for layout distances used @@ -175,7 +175,7 @@ struct ImplSVGDIData long mnRealAppFontX; // AppFont X-Numenator for 40/tel Width long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX long mnAppFontY; // AppFont Y-Numenator for 80/tel Height - sal_Bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End + bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End bool mbNativeFontConfig; // true: do not override UI font bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects }; @@ -200,9 +200,9 @@ struct ImplSVWinData Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode sal_uInt16 mnTrackFlags; // tracking flags sal_uInt16 mnAutoScrollFlags; // auto scroll flags - sal_Bool mbNoDeactivate; // sal_True: do not execute Deactivate - sal_Bool mbNoSaveFocus; // sal_True: menus must not save/restore focus - sal_Bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant + bool mbNoDeactivate; // sal_True: do not execute Deactivate + bool mbNoSaveFocus; // sal_True: menus must not save/restore focus + bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant }; @@ -236,16 +236,16 @@ struct ImplSVCtrlData struct ImplSVHelpData { - sal_Bool mbContextHelp : 1; // is ContextHelp enabled - sal_Bool mbExtHelp : 1; // is ExtendedHelp enabled - sal_Bool mbExtHelpMode : 1; // is in ExtendedHelp Mode - sal_Bool mbOldBalloonMode : 1; // BallonMode, befor ExtHelpMode started - sal_Bool mbBalloonHelp : 1; // is BalloonHelp enabled - sal_Bool mbQuickHelp : 1; // is QuickHelp enabled - sal_Bool mbSetKeyboardHelp : 1; // tiphelp was activated by keyboard - sal_Bool mbKeyboardHelp : 1; // tiphelp was activated by keyboard - sal_Bool mbAutoHelpId : 1; // generate HelpIds - sal_Bool mbRequestingHelp : 1; // In Window::RequestHelp + bool mbContextHelp : 1; // is ContextHelp enabled + bool mbExtHelp : 1; // is ExtendedHelp enabled + bool mbExtHelpMode : 1; // is in ExtendedHelp Mode + bool mbOldBalloonMode : 1; // BallonMode, befor ExtHelpMode started + bool mbBalloonHelp : 1; // is BalloonHelp enabled + bool mbQuickHelp : 1; // is QuickHelp enabled + bool mbSetKeyboardHelp : 1; // tiphelp was activated by keyboard + bool mbKeyboardHelp : 1; // tiphelp was activated by keyboard + bool mbAutoHelpId : 1; // generate HelpIds + bool mbRequestingHelp : 1; // In Window::RequestHelp HelpTextWindow* mpHelpWin; // HelpWindow sal_uLong mnLastHelpHideTime; // ticks of last show }; @@ -308,7 +308,7 @@ struct ImplSVData SalInstance* mpDefInst; // Default SalInstance Application* mpApp; // pApp WorkWindow* mpDefaultWin; // Default-Window - sal_Bool mbDeInit; // Is VCL deinitializing + bool mbDeInit; // Is VCL deinitializing sal_uLong mnThreadCount; // is VCL MultiThread enabled ImplConfigData* mpFirstConfigData; // Zeiger auf ersten Config-Block ImplTimerData* mpFirstTimerData; // list of all running timers @@ -318,8 +318,8 @@ struct ImplSVData ResMgr* mpResMgr; // SV-Resource-Manager sal_uLong mnTimerPeriod; // current timer period sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack - sal_Bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden - sal_Bool mbNoCallTimer; // sal_True: No Timeout calls + bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden + bool mbNoCallTimer; // sal_True: No Timeout calls ImplSVAppData maAppData; // indepen data for class Application ImplSVGDIData maGDIData; // indepen data for Output classes ImplSVWinData maWinData; // indepen data for Windows classes @@ -330,7 +330,7 @@ struct ImplSVData Window* mpIntroWindow; // the splash screen DockingManager* mpDockingManager; BlendFrameCache* mpBlendFrameCache; - sal_Bool mbIsTestTool; + bool mbIsTestTool; oslThreadIdentifier mnMainThreadId; rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; @@ -377,18 +377,18 @@ struct ImplDelData { ImplDelData* mpNext; const Window* mpWindow; - sal_Bool mbDel; + bool mbDel; ImplDelData( const Window* pWindow = NULL ) - : mpNext( NULL ), mpWindow( NULL ), mbDel( sal_False ) + : mpNext( NULL ), mpWindow( NULL ), mbDel( false ) { if( pWindow ) AttachToWindow( pWindow ); } virtual ~ImplDelData(); bool IsDead() const { - DBG_ASSERT( mbDel == sal_False, "object deleted while in use !" ); - return (mbDel!=sal_False); + DBG_ASSERT( mbDel == false, "object deleted while in use !" ); + return mbDel; } private: @@ -402,7 +402,7 @@ struct ImplSVEvent Link* mpLink; Window* mpWindow; ImplDelData maDelData; - sal_Bool mbCall; + bool mbCall; }; #endif // INCLUDED_VCL_INC_SVDATA_HXX diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 6c8bd8e39621..bfffe7bcffd6 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -95,24 +95,24 @@ struct ImplToolItem // the default size is the precomputed size for standard items // ie those that are just ordinary buttons (no windows or text etc.) // bCheckMaxWidth indicates that item windows must not exceed maxWidth in which case they will be painted as buttons - Size GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); + Size GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); // only useful for buttons: returns if the text or image part or both can be drawn according to current button drawing style - void DetermineButtonDrawStyle( ButtonType eButtonType, sal_Bool& rbImage, sal_Bool& rbText ) const; + void DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbImage, bool& rbText ) const; // returns the rectangle which contains the drop down arrow // or an empty rect if there is none // bHorz denotes the toolbox alignment - Rectangle GetDropDownRect( sal_Bool bHorz ) const; + Rectangle GetDropDownRect( bool bHorz ) const; // returns sal_True if the toolbar item is currently clipped, which can happen for docked toolbars - sal_Bool IsClipped() const; + bool IsClipped() const; // returns sal_True if the toolbar item is currently hidden i.e. they are unchecked in the toolbar Customize menu - sal_Bool IsItemHidden() const; + bool IsItemHidden() const; private: - void init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, sal_Bool bEmptyBtn); + void init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn); }; namespace vcl @@ -163,7 +163,7 @@ struct ImplToolBoxPrivateData vcl::IImageListProvider* mpImageListProvider; vcl::ImageListType meImageListType; - sal_Bool mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper + bool mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper mbAssumeDocked:1, // only used during calculations to override current floating/popup mode mbAssumeFloating:1, mbAssumePopupMode:1, diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 0cf197a7d70d..bd2fd96dbbc8 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -323,7 +323,7 @@ public: // and false else; if true was returned the event should // be swallowed bool Dispatch( const XEvent* pEvent ); - void grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents = sal_False ); + void grabPointer( bool bGrab, bool bOwnerEvents = false ); GtkSalDisplay* getDisplay(); GdkDisplay* getGdkDisplay(); @@ -356,7 +356,7 @@ public: // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual sal_Bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -379,7 +379,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); // Enable/Disable ScreenSaver, SystemAgents, ... virtual void StartPresentation( sal_Bool bStart ); @@ -405,7 +405,7 @@ public: virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 628221bf1f94..d3c540b0307f 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -42,12 +42,12 @@ public: long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ); - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, @@ -130,17 +130,17 @@ public: // will be set when UI theme was changed - static sal_Bool bThemeChanged; - static sal_Bool bNeedPixmapPaint; + static bool bThemeChanged; + static bool bNeedPixmapPaint; // native widget methods - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -163,115 +163,115 @@ protected: typedef std::list< Rectangle > clipList; GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect ); - sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); + bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); - sal_Bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart, + bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, + bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart, + bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 99fd9cb3f8a0..39ef5b80222a 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -40,7 +40,7 @@ class GtkSalObject : public SalObject static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer ); static void signalDestroy( GtkWidget*, gpointer ); public: - GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow = sal_True ); + GtkSalObject( GtkSalFrame* pParent, bool bShow = true ); virtual ~GtkSalObject(); // overload all pure virtual methods diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index 2550dd38052f..8e955a32d1d7 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -24,11 +24,11 @@ public: GtkSalPrinter(SalInfoPrinter* i_pInfoPrinter); using PspSalPrinter::StartJob; - virtual sal_Bool StartJob( + virtual bool StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, ImplJobSetup* io_pSetupData, vcl::PrinterController& io_rController); - virtual sal_Bool EndJob(); + virtual bool EndJob(); private: bool impl_doJob( diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 4b2ac33dc26f..aa99268f82f8 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -40,7 +40,7 @@ class GtkSalMenu : public SalMenu private: std::vector< GtkSalMenuItem* > maItems; - sal_Bool mbMenuBar; + bool mbMenuBar; Menu* mpVCLMenu; GtkSalMenu* mpOldSalMenu; GtkSalMenu* mpParentSalMenu; @@ -55,10 +55,10 @@ private: void ActivateAllSubmenus(MenuBar* pMenuBar); public: - GtkSalMenu( sal_Bool bMenuBar ); + GtkSalMenu( bool bMenuBar ); virtual ~GtkSalMenu(); - virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars + virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); @@ -83,7 +83,7 @@ public: virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } virtual GActionGroup* GetActionGroup() { return mpActionGroup; } - virtual sal_Bool IsItemVisible( unsigned nPos ); + virtual bool IsItemVisible( unsigned nPos ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, @@ -100,7 +100,7 @@ public: void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate(); void Deactivate( const gchar* aMenuCommand ); - void Display( sal_Bool bVisible ); + void Display( bool bVisible ); bool PrepUpdate(); void Update(); // Update this menu only. void UpdateFull(); // Update full menu hierarchy from this menu. @@ -114,7 +114,7 @@ public: sal_uInt16 mnId; // Item ID MenuItemType mnType; // Item type - sal_Bool mbVisible; // Item visibility. + bool mbVisible; // Item visibility. Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index 2c5f13942ca9..76b21925383f 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -27,7 +27,7 @@ class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension { private: - sal_Bool mbUseExtension; + bool mbUseExtension; sal_uInt32 mnDefaultGroup; sal_uInt32 mnGroup; int mnEventBase; @@ -39,9 +39,9 @@ public: SalI18N_KeyboardExtension( Display *pDisplay ); inline ~SalI18N_KeyboardExtension(); - inline sal_Bool UseExtension() const ; // server and client support the + inline bool UseExtension() const ; // server and client support the // extension - inline void UseExtension( sal_Bool bState );// used to disable the Extension + inline void UseExtension( bool bState );// used to disable the Extension void Dispatch( XEvent *pEvent ); // keep track of group changes @@ -59,14 +59,14 @@ SalI18N_KeyboardExtension::~SalI18N_KeyboardExtension() { } -inline sal_Bool +inline bool SalI18N_KeyboardExtension::UseExtension() const { return mbUseExtension; } inline void -SalI18N_KeyboardExtension::UseExtension( sal_Bool bState ) +SalI18N_KeyboardExtension::UseExtension( bool bState ) { mbUseExtension = mbUseExtension && bState; } diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 00fcd3ee6869..b9a38daa8f7f 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -139,11 +139,11 @@ public: inline Pixel GetUsed() const { return m_nUsed; } inline int GetClass() const { return m_aVisual.GetClass(); } - sal_Bool GetXPixels( XColor &rColor, + bool GetXPixels( XColor &rColor, int r, int g, int b ) const; - inline sal_Bool GetXPixel( XColor &rColor, + inline bool GetXPixel( XColor &rColor, int r, int g, int b ) const; @@ -262,7 +262,7 @@ protected: XLIB_Cursor aPointerCache_[POINTER_COUNT]; // Keyboard - sal_Bool bNumLockFromXS_; // Num Lock handled by X Server + bool bNumLockFromXS_; // Num Lock handled by X Server int nNumLockIndex_; // modifier index in modmap int nNumLockMask_; // keyevent state mask for KeySym nShiftKeySym_; // first shift modifier @@ -290,7 +290,7 @@ protected: void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight ); public: static SalDisplay *GetSalDisplay( Display* display ); - static sal_Bool BestVisual( Display *pDisp, + static bool BestVisual( Display *pDisp, int nScreen, XVisualInfo &rVI ); @@ -340,7 +340,7 @@ public: const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; } srv_vendor_t GetServerVendor() const { return meServerVendor; } void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); } - sal_Bool IsDisplay() const { return !!pXLib_; } + bool IsDisplay() const { return !!pXLib_; } GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; } GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; } GC GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; } @@ -376,7 +376,7 @@ public: unsigned int GetXScreenCount() const { return m_aScreens.size(); } const std::list< SalFrame* >& getFrames() const { return m_aFrames; } - sal_Bool IsNumLockFromXS() const { return bNumLockFromXS_; } + bool IsNumLockFromXS() const { return bNumLockFromXS_; } std::list< SalObject* >& getSalObjects() { return m_aSalObjects; } @@ -403,7 +403,7 @@ public: virtual void Yield(); virtual void PostUserEvent(); - sal_Bool IsEvent(); + bool IsEvent(); void SetupInput( SalI18N_InputMethod *pInputMethod ); }; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index bb6253f3f34f..d76218b918dc 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -89,11 +89,11 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame Rectangle maRestorePosSize; sal_uIntPtr nStyle_; SalExtStyle mnExtStyle; - sal_Bool bAlwaysOnTop_; - sal_Bool bViewable_; - sal_Bool bMapped_; - sal_Bool mbInShow; - sal_Bool bDefaultPosition_; // client is centered initially + bool bAlwaysOnTop_; + bool bViewable_; + bool bMapped_; + bool mbInShow; + bool bDefaultPosition_; // client is centered initially bool m_bXEmbed; int nVisibility_; int m_nWorkArea; @@ -192,7 +192,7 @@ public: sal_uIntPtr GetStyle() const { return nStyle_; } XLIB_Cursor GetCursor() const { return hCursor_; } - sal_Bool IsCaptured() const { return nCaptured_ == 1; } + bool IsCaptured() const { return nCaptured_ == 1; } #if !defined(__synchronous_extinput__) void HandleExtTextEvent (XClientMessageEvent *pEvent); #endif @@ -217,7 +217,7 @@ public: // call with false to setup graphics with window (GetWindow()) virtual void updateGraphics( bool bClear ); - virtual sal_Bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -234,7 +234,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nMonitor ); virtual void StartPresentation( sal_Bool bStart ); virtual void SetAlwaysOnTop( sal_Bool bOnTop ); @@ -248,7 +248,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep(); diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 962c32e60e3f..e6426b226231 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -108,9 +108,9 @@ protected: SalColor nTextColor_; Pixel nTextPixel_; - sal_Bool bFontVertical_; + bool bFontVertical_; - sal_Bool bDisableGraphite_; + bool bDisableGraphite_; GC pBrushGC_; // Brush attributes SalColor nBrushColor_; @@ -125,20 +125,20 @@ protected: GC pStippleGC_; GC pTrackingGC_; - sal_Bool bWindow_ : 1; // is Window - sal_Bool bPrinter_ : 1; // is Printer - sal_Bool bVirDev_ : 1; // is VirDev - sal_Bool bPenGC_ : 1; // is Pen GC valid - sal_Bool bFontGC_ : 1; // is Font GC valid - sal_Bool bBrushGC_ : 1; // is Brush GC valid - sal_Bool bMonoGC_ : 1; // is Mono GC valid - sal_Bool bCopyGC_ : 1; // is Copy GC valid - sal_Bool bInvertGC_ : 1; // is Invert GC valid - sal_Bool bInvert50GC_ : 1; // is Invert50 GC valid - sal_Bool bStippleGC_ : 1; // is Stipple GC valid - sal_Bool bTrackingGC_ : 1; // is Tracking GC valid + bool bWindow_ : 1; // is Window + bool bPrinter_ : 1; // is Printer + bool bVirDev_ : 1; // is VirDev + bool bPenGC_ : 1; // is Pen GC valid + bool bFontGC_ : 1; // is Font GC valid + bool bBrushGC_ : 1; // is Brush GC valid + bool bMonoGC_ : 1; // is Mono GC valid + bool bCopyGC_ : 1; // is Copy GC valid + bool bInvertGC_ : 1; // is Invert GC valid + bool bInvert50GC_ : 1; // is Invert50 GC valid + bool bStippleGC_ : 1; // is Stipple GC valid + bool bTrackingGC_ : 1; // is Tracking GC valid bool bXORMode_ : 1; // is ROP XOR Mode set - sal_Bool bDitherBrush_ : 1; // is solid or tile + bool bDitherBrush_ : 1; // is solid or tile using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, @@ -156,7 +156,7 @@ protected: GC pGC, bool bClose ); - sal_Bool GetDitherPixmap ( SalColor nSalColor ); + bool GetDitherPixmap ( SalColor nSalColor ); inline GC GetMonoGC( Pixmap hPixmap ); inline GC GetCopyGC(); @@ -233,7 +233,7 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -277,13 +277,13 @@ public: virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency ); #if 1 // TODO: remove these obselete methods - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); @@ -314,7 +314,7 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 3b545bff969f..5b398ae984c4 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -29,7 +29,7 @@ public: X11SalMenu() {} virtual ~X11SalMenu(); - virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars + virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index dc65ba5185d9..e8b71eefaa93 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -64,10 +64,10 @@ public: XLIB_Window maSecondary; Colormap maColormap; SalClipRegion maClipRegion; - sal_Bool mbVisible; + bool mbVisible; static VCL_DLLPUBLIC bool Dispatch( XEvent* pEvent ); - static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = sal_True ); X11SalObject(); virtual ~X11SalObject(); diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index fe6afd432b32..b1210b3a5243 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -41,14 +41,14 @@ class X11SalVirtualDevice : public SalVirtualDevice int nDX_; int nDY_; sal_uInt16 nDepth_; - sal_Bool bGraphics_; // is Graphics used - sal_Bool bExternPixmap_; + bool bGraphics_; // is Graphics used + bool bExternPixmap_; public: X11SalVirtualDevice(); virtual ~X11SalVirtualDevice(); - sal_Bool Init( SalDisplay *pDisplay, + bool Init( SalDisplay *pDisplay, long nDX, long nDY, sal_uInt16 nBitCount, SalX11Screen nXScreen, @@ -66,7 +66,7 @@ public: { return pDisplay_; } - sal_Bool IsDisplay() const + bool IsDisplay() const { return pDisplay_->IsDisplay(); } @@ -80,7 +80,7 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ); // Set new size, without saving the old contents - virtual sal_Bool SetSize( long nNewDX, long nNewDY ); + virtual bool SetSize( long nNewDX, long nNewDY ); virtual void GetSize( long& rWidth, long& rHeight ); }; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 05b5abb8cc16..279fc27c3518 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -100,15 +100,15 @@ struct ImplWinData sal_uInt16* mpExtOldAttrAry; Rectangle* mpCursorRect; long mnCursorExtWidth; - sal_Bool mbVertical; + bool mbVertical; Rectangle* mpCompositionCharRects; long mnCompositionCharRects; Rectangle* mpFocusRect; Rectangle* mpTrackRect; sal_uInt16 mnTrackFlags; sal_uInt16 mnIsTopWindow; - sal_Bool mbMouseOver; // tracks mouse over for native widget paint effect - sal_Bool mbEnableNativeWidget; // toggle native widget rendering + bool mbMouseOver; // tracks mouse over for native widget paint effect + bool mbEnableNativeWidget; // toggle native widget rendering ::std::list< Window* > maTopWindowChildren; }; @@ -119,7 +119,7 @@ struct ImplOverlapData Region* mpSaveBackRgn; // saved region, which must be invalidated Window* mpNextBackWin; // next window with saved background sal_uIntPtr mnSaveBackSize; // bitmap size of saved background - sal_Bool mbSaveBack; // sal_True: save background + bool mbSaveBack; // sal_True: save background sal_uInt8 mnTopLevel; // Level for Overlap-Window }; @@ -158,16 +158,16 @@ struct ImplFrameData sal_uInt16 mnMouseCode; // mouse code sal_uInt16 mnMouseMode; // mouse mode MapUnit meMapUnit; // last MapUnit for LogicUnitToPixel - sal_Bool mbHasFocus; // focus - sal_Bool mbInMouseMove; // is MouseMove on stack - sal_Bool mbMouseIn; // is Mouse inside the frame - sal_Bool mbStartDragCalled; // is command startdrag called - sal_Bool mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN - sal_Bool mbMinimized; // set, when FrameSize <= 0 - sal_Bool mbStartFocusState; // FocusState, when sending the event - sal_Bool mbInSysObjFocusHdl; // within a SysChildren's GetFocus handler - sal_Bool mbInSysObjToTopHdl; // within a SysChildren's ToTop handler - sal_Bool mbSysObjFocus; // does a SysChild have focus + bool mbHasFocus; // focus + bool mbInMouseMove; // is MouseMove on stack + bool mbMouseIn; // is Mouse inside the frame + bool mbStartDragCalled; // is command startdrag called + bool mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN + bool mbMinimized; // set, when FrameSize <= 0 + bool mbStartFocusState; // FocusState, when sending the event + bool mbInSysObjFocusHdl; // within a SysChildren's GetFocus handler + bool mbInSysObjToTopHdl; // within a SysChildren's ToTop handler + bool mbSysObjFocus; // does a SysChild have focus ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > mxDragSource; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget; @@ -175,7 +175,7 @@ struct ImplFrameData ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection; - sal_Bool mbInternalDragGestureRecognizer; + bool mbInternalDragGestureRecognizer; }; struct ImplAccessibleInfos @@ -371,7 +371,7 @@ public: // helper methods -bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouseLeave, +bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, long nX, long nY, sal_uIntPtr nMsgTime, sal_uInt16 nCode, sal_uInt16 nMode ); void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); |