From 381f8a5673b70e31fda2739da25f3863895ae665 Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Mon, 24 Feb 2014 01:53:13 +1100
Subject: sal_Bool -> bool in mostly vcl module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:
	include/vcl/settings.hxx
	svtools/source/table/tablecontrol_impl.cxx
	sw/source/core/frmedt/fecopy.cxx
	vcl/inc/canvasbitmap.hxx
	vcl/inc/headless/svpframe.hxx
	vcl/inc/unx/salframe.h
	vcl/inc/win/salframe.h
	vcl/inc/win/salprn.h
	vcl/inc/win/salvd.h
	vcl/osx/DragSource.cxx
	vcl/osx/DragSource.hxx
	vcl/osx/DropTarget.cxx
	vcl/osx/DropTarget.hxx
	vcl/osx/OSXTransferable.cxx
	vcl/osx/OSXTransferable.hxx
	vcl/osx/clipboard.cxx
	vcl/osx/clipboard.hxx
	vcl/osx/salprn.cxx
	vcl/qa/cppunit/canvasbitmaptest.cxx
	vcl/source/components/fontident.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/spinfld.cxx
	vcl/source/gdi/gdimtf.cxx
	vcl/source/gdi/virdev.cxx
	vcl/source/helper/canvasbitmap.cxx
	vcl/source/window/dockwin.cxx
	vcl/unx/generic/dtrans/X11_selection.hxx
	vcl/unx/kde/UnxFilePicker.cxx
	vcl/unx/kde/UnxFilePicker.hxx
	vcl/unx/kde4/KDE4FilePicker.cxx
	vcl/unx/kde4/KDE4FilePicker.hxx
	vcl/unx/kde4/KDESalFrame.hxx

Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0
Reviewed-on: https://gerrit.libreoffice.org/8219
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/workben/outdevgrind.cxx | 2 +-
 vcl/workben/svdem.cxx       | 2 +-
 vcl/workben/svpclient.cxx   | 6 +++---
 vcl/workben/svptest.cxx     | 2 +-
 vcl/workben/vcldemo.cxx     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'vcl/workben')

diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 52e48a8c910d..715b7cedebdf 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -136,7 +136,7 @@ void setupMethodStubs( functor_vector_type& res )
     const Wallpaper   aWallpaper( aWhiteColor );
 
     GDIMetaFile       aMtf;
-    aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),sal_True) );
+    aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),true) );
     aMtf.AddAction( new MetaRectAction(aRect) );
 
     /* void DrawTextArray( const Point& rStartPt, const OUString& rStr,
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index b085d9824634..33cd1346773b 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -43,7 +43,7 @@ SAL_IMPLEMENT_MAIN()
     tools::extendApplicationEnvironment();
 
     Reference< XMultiServiceFactory > xMS;
-    xMS = cppu::createRegistryServiceFactory( "types.rdb", "applicat.rdb", sal_True );
+    xMS = cppu::createRegistryServiceFactory( "types.rdb", "applicat.rdb", true );
 
     comphelper::setProcessServiceFactory( xMS );
 
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 9125cb1120ca..61fe3e056349 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -104,7 +104,7 @@ public:
     void        Paint( const Rectangle& rRect );
     void        Resize();
 
-    sal_Bool        Close();
+    bool        Close();
 
     void parseList( const OString& rList );
     OString processCommand( const OString& rCommand );
@@ -149,9 +149,9 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aQuitButton.Show();
 }
 
-sal_Bool MyWin::Close()
+bool MyWin::Close()
 {
-    sal_Bool bRet = WorkWindow::Close();
+    bool bRet = WorkWindow::Close();
     if( bRet )
         Application::Quit();
     return bRet;
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 52b13a0ccc17..e5c677375c93 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -51,7 +51,7 @@ SAL_IMPLEMENT_MAIN()
     tools::extendApplicationEnvironment();
 
     Reference< XMultiServiceFactory > xMS;
-    xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True );
+    xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), true );
 
     comphelper::setProcessServiceFactory( xMS );
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 841305e854ca..c8cd734e7732 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -46,7 +46,7 @@ SAL_IMPLEMENT_MAIN()
     tools::extendApplicationEnvironment();
 
     Reference< XMultiServiceFactory > xMS;
-    xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True );
+    xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), true );
 
     comphelper::setProcessServiceFactory( xMS );
 
-- 
cgit