diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 15:19:55 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 15:19:55 +0100 |
commit | 0f82480261a177cbb4f83548c8ce578056bb625a (patch) | |
tree | 163a6edf2ba6edd747550cff3f8a5439b54cc173 /vcl | |
parent | 16e7112f3e34302db168bfbb8f3b3882d6358715 (diff) |
Windows vcl: sal_Bool -> bool fixup
Change-Id: I60cba53ec0a5aaedf20b6c0c295a91be226b4354
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/win/salframe.h | 6 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 18 | ||||
-rw-r--r-- | vcl/inc/win/salmenu.h | 2 | ||||
-rw-r--r-- | vcl/inc/win/salprn.h | 14 | ||||
-rw-r--r-- | vcl/inc/win/salvd.h | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 8 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salnativewidgets-luna.cxx | 8 | ||||
-rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 14 | ||||
-rw-r--r-- | vcl/win/source/gdi/salvd.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 6 | ||||
-rw-r--r-- | vcl/win/source/window/salmenu.cxx | 2 |
12 files changed, 42 insertions, 42 deletions
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 0a54ac2ba61d..2aa3eed27ee3 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -90,7 +90,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 ); virtual void SetMenu( SalMenu* pSalMenu ); @@ -105,7 +105,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 ); @@ -119,7 +119,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/win/salgdi.h b/vcl/inc/win/salgdi.h index bea5b641db4f..d41783320bc0 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -214,9 +214,9 @@ protected: const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin, com::sun::star::drawing::LineCap); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ); + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ); // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, @@ -243,15 +243,15 @@ protected: 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 ); // 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 ) 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& 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 ); @@ -328,7 +328,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*, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -374,7 +374,7 @@ public: virtual bool supportsOperation( OutDevSupportType ) const; // Query the platform layer for control support - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index 28f623f16eb5..4fa0d038802d 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -28,7 +28,7 @@ class WinSalMenu : public SalMenu public: WinSalMenu(); virtual ~WinSalMenu(); - 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/win/salprn.h b/vcl/inc/win/salprn.h index 411924dd2dbb..9a807c999c51 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -61,9 +61,9 @@ public: 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, @@ -98,17 +98,17 @@ public: virtual ~WinSalPrinter(); using SalPrinter::StartJob; - 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 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(); void markInvalid(); diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h index f59a0bff2845..498a71fce59d 100644 --- a/vcl/inc/win/salvd.h +++ b/vcl/inc/win/salvd.h @@ -51,7 +51,7 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - 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/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 84023168f963..c999f0df8373 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -1543,7 +1543,7 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint // ----------------------------------------------------------------------- -sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { #ifdef USE_GDI_BEZIERS // for NT, we can handover the array directly @@ -1560,7 +1560,7 @@ sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* // ----------------------------------------------------------------------- -sal_Bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) { #ifdef USE_GDI_BEZIERS // for NT, we can handover the array directly @@ -1612,7 +1612,7 @@ sal_Bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* // ----------------------------------------------------------------------- -sal_Bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, +bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) { #ifdef USE_GDI_BEZIERS @@ -1750,7 +1750,7 @@ static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSiz return bRetValue; } -sal_Bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) +bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { sal_Bool bRetValue = FALSE; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 7c7e52fad499..fb33dfa0aadd 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2539,7 +2539,7 @@ int ScopedTrueTypeFont::open(void * pBuffer, sal_uInt32 nLen, return OpenTTFontBuffer(pBuffer, nLen, nFaceNum, &m_pFont); } -sal_Bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, +bool WinSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding, sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo ) { diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index d3f1412d496a..40346f3c6e91 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -236,7 +236,7 @@ static HTHEME getThemeHandle( HWND hWnd, LPCWSTR name ) * Returns TRUE if the platform supports native * drawing of the control defined by nPart */ -sal_Bool WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { HTHEME hTheme = NULL; @@ -351,7 +351,7 @@ sal_Bool WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar * aPos was or was not inside the native widget specified by the * nType/nPart combination. */ -sal_Bool WinSalGraphics::hitTestNativeControl( ControlType, +bool WinSalGraphics::hitTestNativeControl( ControlType, ControlPart, const Rectangle&, const Point&, @@ -1163,7 +1163,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool WinSalGraphics::drawNativeControl( ControlType nType, +bool WinSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -1296,7 +1296,7 @@ sal_Bool WinSalGraphics::drawNativeControl( ControlType nType, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool WinSalGraphics::getNativeControlRegion( ControlType nType, +bool WinSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 96430ad04cb1..cc10cac3fb55 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -1188,7 +1188,7 @@ void WinSalInfoPrinter::ReleaseGraphics( SalGraphics* ) mbGraphics = FALSE; } -sal_Bool WinSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) +bool WinSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) { if ( ImplUpdateSalJobSetup( this, pSetupData, TRUE, static_cast<WinSalFrame*>(pFrame) ) ) { @@ -1199,14 +1199,14 @@ sal_Bool WinSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) return FALSE; } -sal_Bool WinSalInfoPrinter::SetPrinterData( ImplJobSetup* pSetupData ) +bool WinSalInfoPrinter::SetPrinterData( ImplJobSetup* pSetupData ) { if ( !ImplTestSalJobSetup( this, pSetupData, FALSE ) ) return FALSE; return ImplUpdateSalPrnIC( this, pSetupData ); } -sal_Bool WinSalInfoPrinter::SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) +bool WinSalInfoPrinter::SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) { ImplJobSetupToDevMode( this, pSetupData, nFlags ); if ( ImplUpdateSalJobSetup( this, pSetupData, TRUE, NULL ) ) @@ -1451,7 +1451,7 @@ static int lcl_StartDocW( HDC hDC, DOCINFOW* pInfo, WinSalPrinter* pPrt ) return nRet; } -sal_Bool WinSalPrinter::StartJob( const OUString* pFileName, +bool WinSalPrinter::StartJob( const OUString* pFileName, const OUString& rJobName, const OUString&, sal_uLong nCopies, @@ -1580,7 +1580,7 @@ sal_Bool WinSalPrinter::StartJob( const OUString* pFileName, return TRUE; } -sal_Bool WinSalPrinter::EndJob() +bool WinSalPrinter::EndJob() { HDC hDC = mhDC; if ( isValid() && hDC ) @@ -1612,7 +1612,7 @@ sal_Bool WinSalPrinter::EndJob() return TRUE; } -sal_Bool WinSalPrinter::AbortJob() +bool WinSalPrinter::AbortJob() { mbAbort = TRUE; @@ -1705,7 +1705,7 @@ SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJo return mpGraphics; } -sal_Bool WinSalPrinter::EndPage() +bool WinSalPrinter::EndPage() { HDC hDC = mhDC; if ( hDC && mpGraphics ) diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 54ef0637dcef..603dd40918f9 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -219,7 +219,7 @@ void WinSalVirtualDevice::ReleaseGraphics( SalGraphics* ) // ----------------------------------------------------------------------- -sal_Bool WinSalVirtualDevice::SetSize( long nDX, long nDY ) +bool WinSalVirtualDevice::SetSize( long nDX, long nDY ) { if( mbForeignDC || !mhBmp ) return TRUE; // ??? diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index a0ada8b8ea63..74fbe8adccdf 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1097,7 +1097,7 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) // ----------------------------------------------------------------------- -sal_Bool WinSalFrame::PostEvent( void* pData ) +bool WinSalFrame::PostEvent( void* pData ) { return (sal_Bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); } @@ -1857,7 +1857,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) // ----------------------------------------------------------------------- -sal_Bool WinSalFrame::GetWindowState( SalFrameState* pState ) +bool WinSalFrame::GetWindowState( SalFrameState* pState ) { if ( maState.mnWidth && maState.mnHeight ) { @@ -3483,7 +3483,7 @@ LanguageType WinSalFrame::GetInputLanguage() // ----------------------------------------------------------------------- -sal_Bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) +bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) { sal_Bool bRet = FALSE; sal_IntPtr nLangType = aLangType; diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index e7a3aad77756..b4d40a692016 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -162,7 +162,7 @@ WinSalMenu::~WinSalMenu() ::DestroyMenu( mhMenu ); } -sal_Bool WinSalMenu::VisibleMenuBar() +bool WinSalMenu::VisibleMenuBar() { // The Win32 implementation never shows a native // menubar. Thus, native menus are only visible |