[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/quartz
Stephan Bergmann
sbergman at redhat.com
Fri Feb 21 04:08:48 PST 2014
vcl/inc/osx/salframe.h | 6 +++---
vcl/inc/osx/salmenu.h | 2 +-
vcl/inc/osx/salprn.h | 16 ++++++++--------
vcl/inc/quartz/salgdi.h | 18 +++++++++---------
vcl/inc/quartz/salvd.h | 2 +-
vcl/osx/salframe.cxx | 6 +++---
vcl/osx/salmenu.cxx | 2 +-
vcl/osx/salnativewidgets.cxx | 8 ++++----
vcl/osx/salprn.cxx | 16 ++++++++--------
vcl/quartz/salgdicommon.cxx | 10 +++++-----
vcl/quartz/salvd.cxx | 2 +-
11 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit d6dfeb95885a03e6f255c0be75b2dfa9258c61cc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 21 13:08:35 2014 +0100
Mac OS X vcl: sal_Bool -> bool fixup
Change-Id: I77a2e7957351ca6da44948e5a28d08116e1cd14d
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 464a54a..ed9f61c 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -110,7 +110,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 SetRepresentedURL( const OUString& );
@@ -125,7 +125,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 );
@@ -139,7 +139,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/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index 925a339..6bd9b72 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -56,7 +56,7 @@ public:
AquaSalMenu( bool bMenuBar );
virtual ~AquaSalMenu();
- 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/osx/salprn.h b/vcl/inc/osx/salprn.h
index 906a61d..d2ac588 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -73,9 +73,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter
virtual SalGraphics* GetGraphics();
virtual void ReleaseGraphics( SalGraphics* i_pGraphics );
- virtual sal_Bool Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData );
- virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData );
- virtual sal_Bool SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData );
+ virtual bool Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData );
+ virtual bool SetPrinterData( ImplJobSetup* pSetupData );
+ virtual bool SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData );
virtual void GetPageInfo( const ImplJobSetup* i_pSetupData,
long& o_rOutWidth, long& o_rOutHeight,
long& o_rPageOffX, long& o_rPageOffY,
@@ -127,7 +127,7 @@ class AquaSalPrinter : public SalPrinter
AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter );
virtual ~AquaSalPrinter();
- virtual sal_Bool StartJob( const OUString* i_pFileName,
+ virtual bool StartJob( const OUString* i_pFileName,
const OUString& i_rJobName,
const OUString& i_rAppName,
sal_uLong i_nCopies,
@@ -135,16 +135,16 @@ class AquaSalPrinter : public SalPrinter
bool i_bDirect,
ImplJobSetup* i_pSetupData );
// implement pull model print system
- virtual sal_Bool StartJob( const OUString* i_pFileName,
+ virtual bool StartJob( const OUString* i_pFileName,
const OUString& rJobName,
const OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
vcl::PrinterController& i_rListener );
- virtual sal_Bool EndJob();
- virtual sal_Bool AbortJob();
+ virtual bool EndJob();
+ virtual bool AbortJob();
virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData );
- virtual sal_Bool EndPage();
+ virtual bool EndPage();
virtual sal_uLong GetErrorCode();
private:
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index a92b2d7..7cd2e83 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -228,9 +228,9 @@ public:
virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
- 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 sal_uInt8* 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 sal_uInt8* const* pFlgAry );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
double fTransparency,
@@ -263,7 +263,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 bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
@@ -281,12 +281,12 @@ public:
CGPoint* makeCGptArray(sal_uLong nPoints, const SalPoint* pPtAry);
// 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 );
@@ -341,7 +341,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,
@@ -387,7 +387,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/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index fe69336..dc17534 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -60,7 +60,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/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 0b448d0..6231886 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -290,7 +290,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
// -----------------------------------------------------------------------
-sal_Bool AquaSalFrame::PostEvent( void *pData )
+bool AquaSalFrame::PostEvent( void *pData )
{
GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData );
return TRUE;
@@ -648,7 +648,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
// -----------------------------------------------------------------------
-sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState )
+bool AquaSalFrame::GetWindowState( SalFrameState* pState )
{
if ( !mpNSWindow )
return FALSE;
@@ -1538,7 +1538,7 @@ bool AquaSalFrame::SetPluginParent( SystemParentData* )
return sal_False;
}
-sal_Bool AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& )
+bool AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& )
{
// not supported yet
return FALSE;
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index d906727..57bc23f 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -517,7 +517,7 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem )
}
}
-sal_Bool AquaSalMenu::VisibleMenuBar()
+bool AquaSalMenu::VisibleMenuBar()
{
// Enable/disable experimental native menus code?
//
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 55b4e5e..cb0cfb0 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -268,7 +268,7 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */ ControlPart nPart,
* drawing of the control defined by nPart.
*
*/
-sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
+bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
{
bool bOk = sal_False;
@@ -402,7 +402,7 @@ sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPa
* aPos was or was not inside the native widget specified by the
* nType/nPart combination.
*/
-sal_Bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
const Point& rPos, bool& rIsInside )
{
if ( nType == CTRL_SCROLLBAR )
@@ -494,7 +494,7 @@ UInt32 AquaSalGraphics::getTrackState( ControlState nState )
* aValue: An optional value (tristate/numerical/string)
* aCaption: A caption or title string (like button text etc)
*/
-sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
+bool AquaSalGraphics::drawNativeControl(ControlType nType,
ControlPart nPart,
const Rectangle& rControlRegion,
ControlState nState,
@@ -1210,7 +1210,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
* aValue: An optional value (tristate/numerical/string)
* aCaption: A caption or title string (like button text etc)
*/
-sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/,
+bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/,
const ImplControlValue& aValue, const OUString&,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 37fa0ec..d57f7e6 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -164,14 +164,14 @@ void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* )
// -----------------------------------------------------------------------
-sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
+bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
+bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
{
// FIXME: implement driver data
if( io_pSetupData && io_pSetupData->mpDriverData )
@@ -241,7 +241,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
// -----------------------------------------------------------------------
-sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData )
+bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData )
{
if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC )
return sal_False;
@@ -623,7 +623,7 @@ AquaSalPrinter::~AquaSalPrinter()
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
+bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
const OUString& i_rJobName,
const OUString& i_rAppName,
ImplJobSetup* i_pSetupData,
@@ -634,7 +634,7 @@ sal_Bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
+bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
const OUString& /*i_rJobName*/,
const OUString& /*i_rAppName*/,
sal_uLong /*i_nCopies*/,
@@ -648,14 +648,14 @@ sal_Bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::EndJob()
+bool AquaSalPrinter::EndJob()
{
return mpInfoPrinter->EndJob();
}
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::AbortJob()
+bool AquaSalPrinter::AbortJob()
{
return mpInfoPrinter->AbortJob();
}
@@ -669,7 +669,7 @@ SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_b
// -----------------------------------------------------------------------
-sal_Bool AquaSalPrinter::EndPage()
+bool AquaSalPrinter::EndPage()
{
return mpInfoPrinter->EndPage();
}
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index dec87ff..b1c8121 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -143,7 +143,7 @@ static void AddPolyPolygonToPath( CGMutablePathRef xPath,
}
}
-sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile,
+bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace* pFontData,
sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding,
sal_Int32* pGlyphWidths, int nGlyphCount,
@@ -666,7 +666,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rS
#ifndef IOS
-sal_Bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
+bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight,
void* pEpsData, sal_uLong nByteCount )
{
// convert the raw data to an NSImageRef
@@ -857,7 +857,7 @@ bool AquaSalGraphics::drawPolyLine(
return true;
}
-sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
+bool AquaSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
@@ -1082,12 +1082,12 @@ void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint *pPtAry )
RefreshRect( nX, nY, nWidth, nHeight );
}
-sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
+bool AquaSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
-sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
+bool AquaSalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
const SalPoint* const*, const sal_uInt8* const* )
{
return sal_False;
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index ccafc04..0c61499 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -173,7 +173,7 @@ void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* )
// -----------------------------------------------------------------------
-sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
+bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
{
#ifdef IOS
(void) nDX;
More information about the Libreoffice-commits
mailing list