[Libreoffice-commits] core.git: include/vcl vcl/generic vcl/source
Takeshi Abe
tabe at fixedpoint.jp
Mon Jun 17 19:28:03 PDT 2013
include/vcl/strhelper.hxx | 4 ++--
vcl/generic/print/printerjob.cxx | 6 +++---
vcl/source/helper/strhelper.cxx | 4 ++--
vcl/source/window/brdwin.cxx | 10 +++++-----
vcl/source/window/dialog.cxx | 16 ++++++++--------
vcl/source/window/dlgctrl.cxx | 2 +-
6 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 3c517e8a6c7be101b35bcad3885439434574dabc
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jun 18 11:22:11 2013 +0900
sal_Bool to bool
Change-Id: Id1c64ab4be262713204cfeeb6333ec7d33fffcfb
diff --git a/include/vcl/strhelper.hxx b/include/vcl/strhelper.hxx
index 0d0949a..155e0d4 100644
--- a/include/vcl/strhelper.hxx
+++ b/include/vcl/strhelper.hxx
@@ -37,8 +37,8 @@ namespace psp
VCL_DLLPUBLIC int GetCommandLineTokenCount(const OUString&);
// returns number of tokens (zero if empty or whitespace only)
- VCL_DLLPUBLIC String WhitespaceToSpace( const String&, sal_Bool bProtect = sal_True );
- VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&, sal_Bool bProtect = sal_True);
+ VCL_DLLPUBLIC String WhitespaceToSpace( const String&, bool bProtect = true );
+ VCL_DLLPUBLIC OString WhitespaceToSpace(const OString&, bool bProtect = true);
// returns a string with multiple adjacent occurrences of whitespace
// converted to a single space. if bProtect is sal_True (nonzero), then
// doublequote, singlequote and singleleftquote protect their respective
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 5d61ff9..04c1739 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -335,7 +335,7 @@ PrinterJob::StartJob (
OUString aFilterWS;
// Creator (this application)
- aFilterWS = WhitespaceToSpace( rAppName, sal_False );
+ aFilterWS = WhitespaceToSpace( rAppName, false );
WritePS (mpJobHeader, "%%Creator: (");
WritePS (mpJobHeader, aFilterWS);
WritePS (mpJobHeader, ")\n");
@@ -364,14 +364,14 @@ PrinterJob::StartJob (
* use the filename, if it contains only ascii
* else omit %%Title
*/
- aFilterWS = WhitespaceToSpace( rJobName, sal_False );
+ aFilterWS = WhitespaceToSpace( rJobName, false );
OUString aTitle( aFilterWS );
if( ! isAscii( aTitle ) )
{
sal_Int32 nIndex = 0;
while( nIndex != -1 )
aTitle = rFileName.getToken( 0, '/', nIndex );
- aTitle = WhitespaceToSpace( aTitle, sal_False );
+ aTitle = WhitespaceToSpace( aTitle, false );
if( ! isAscii( aTitle ) )
aTitle = OUString();
}
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 7511ea0..156aa00 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -261,7 +261,7 @@ int GetCommandLineTokenCount(const OUString& rLine)
return nTokenCount;
}
-String WhitespaceToSpace( const String& rLine, sal_Bool bProtect )
+String WhitespaceToSpace( const String& rLine, bool bProtect )
{
int nLen = rLine.Len();
if( ! nLen )
@@ -317,7 +317,7 @@ String WhitespaceToSpace( const String& rLine, sal_Bool bProtect )
return OUString(*pBuffer == ' ' ? pBuffer+1 : pBuffer);
}
-OString WhitespaceToSpace(const OString& rLine, sal_Bool bProtect)
+OString WhitespaceToSpace(const OString& rLine, bool bProtect)
{
sal_Int32 nLen = rLine.getLength();
if (!nLen)
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index cbe9dec..3b5437d 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -117,7 +117,7 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
const Rectangle& rRect,
SymbolType eSymbol, sal_uInt16 nState )
{
- sal_Bool bMouseOver = (nState & BUTTON_DRAW_HIGHLIGHT) != 0;
+ bool bMouseOver = (nState & BUTTON_DRAW_HIGHLIGHT) != 0;
nState &= ~BUTTON_DRAW_HIGHLIGHT;
Rectangle aTempRect;
@@ -363,8 +363,8 @@ sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData,
if ( pData->mnHitTest )
{
sal_uInt16 nDragFullTest = 0;
- sal_Bool bTracking = sal_True;
- sal_Bool bHitTest = sal_True;
+ bool bTracking = true;
+ bool bHitTest = true;
if ( pData->mnHitTest & BORDERWINDOW_HITTEST_CLOSE )
{
@@ -429,13 +429,13 @@ sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData,
}
else
{
- bTracking = sal_False;
+ bTracking = false;
if ( (pData->mnHitTest & BORDERWINDOW_DRAW_TITLE) &&
((rMEvt.GetClicks() % 2) == 0) )
{
pData->mnHitTest = 0;
- bHitTest = sal_False;
+ bHitTest = false;
if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
{
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index cd79e74..8466ab2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -70,24 +70,24 @@ static OString ImplGetDialogText( Dialog* pDialog )
// =======================================================================
-static sal_Bool ImplIsMnemonicCtrl( Window* pWindow )
+static bool ImplIsMnemonicCtrl( Window* pWindow )
{
if( ! pWindow->GetSettings().GetStyleSettings().GetAutoMnemonic() )
- return sal_False;
+ return false;
if ( (pWindow->GetType() == WINDOW_RADIOBUTTON) ||
(pWindow->GetType() == WINDOW_CHECKBOX) ||
(pWindow->GetType() == WINDOW_TRISTATEBOX) ||
(pWindow->GetType() == WINDOW_PUSHBUTTON) )
- return sal_True;
+ return true;
if ( pWindow->GetType() == WINDOW_FIXEDTEXT )
{
if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) )
- return sal_False;
+ return false;
Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT );
if ( !pNextWindow )
- return sal_False;
+ return false;
pNextWindow = pNextWindow->GetWindow( WINDOW_CLIENT );
if ( !(pNextWindow->GetStyle() & WB_TABSTOP) ||
(pNextWindow->GetType() == WINDOW_FIXEDTEXT) ||
@@ -96,12 +96,12 @@ static sal_Bool ImplIsMnemonicCtrl( Window* pWindow )
(pNextWindow->GetType() == WINDOW_CHECKBOX) ||
(pNextWindow->GetType() == WINDOW_TRISTATEBOX) ||
(pNextWindow->GetType() == WINDOW_PUSHBUTTON) )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 132722b..11d3739 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
// =======================================================================
-static sal_Bool ImplHasIndirectTabParent( Window* pWindow )
+static bool ImplHasIndirectTabParent( Window* pWindow )
{
// The window has inderect tab parent if it is included in tab hierarchy
// of the indirect parent window
More information about the Libreoffice-commits
mailing list