summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-10 08:35:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-10 08:36:06 +0200
commit7af850c89664d3c739abd244cb7016b806c0f293 (patch)
tree7642abfe5d3b39d6e4577579476b8d5e24853943 /toolkit
parente2723d00b77dc1044e2ba599ba93517af34e1ea5 (diff)
vcl: sal_Bool -> bool
Change-Id: Iff4da6d6281eb9194db348ebc10fbe7718538401
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/inc/helper/unowrapper.hxx4
-rw-r--r--toolkit/source/awt/vclxcontainer.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx6
-rw-r--r--toolkit/source/awt/vclxwindow.cxx2
-rw-r--r--toolkit/source/controls/unocontrol.cxx2
-rw-r--r--toolkit/source/helper/unowrapper.cxx10
-rw-r--r--toolkit/source/helper/vclunohelper.cxx2
7 files changed, 14 insertions, 14 deletions
diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx
index ee967e63dfed..8e131ccddd44 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -52,7 +52,7 @@ public:
virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) SAL_OVERRIDE;
// Window
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) SAL_OVERRIDE;
virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE;
void WindowDestroyed( Window* pWindow ) SAL_OVERRIDE;
@@ -75,7 +75,7 @@ public:
// Accessibility
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
- CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ) SAL_OVERRIDE;
+ CreateAccessible( Menu* pMenu, bool bIsMenuBar ) SAL_OVERRIDE;
private:
virtual ~UnoWrapper();
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 45b5e20b3f3f..04292434b9e6 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -95,7 +95,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref
for ( sal_uInt16 n = 0; n < nChildren; n++ )
{
Window* pChild = pWindow->GetChild( n );
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xWP = pChild->GetComponentInterface( sal_True );
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xWP = pChild->GetComponentInterface( true );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xW( xWP, ::com::sun::star::uno::UNO_QUERY );
pChildRefs[n] = xW;
}
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index bbfe52f755e6..a6b4a1041027 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -940,7 +940,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
// #i70217# Don't always create a new component object. It's possible that VCL has called
// GetComponentInterface( sal_True ) in the Dialog ctor itself (see Window::IsTopWindow() )
// which creates a component object.
- css::uno::Reference< css::awt::XWindowPeer > xWinPeer = pNewWindow->GetComponentInterface( sal_False );
+ css::uno::Reference< css::awt::XWindowPeer > xWinPeer = pNewWindow->GetComponentInterface( false );
if ( xWinPeer.is() )
*ppNewComp = dynamic_cast< VCLXDialog* >( xWinPeer.get() );
else
@@ -1271,7 +1271,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
if ( !pNewComp )
{
// Default-Interface
- xRef = pNewWindow->GetComponentInterface( sal_True );
+ xRef = pNewWindow->GetComponentInterface( true );
}
else
{
@@ -1279,7 +1279,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
xRef = pNewComp;
pNewWindow->SetComponentInterface( xRef );
}
- DBG_ASSERT( pNewWindow->GetComponentInterface( sal_False ) == xRef,
+ DBG_ASSERT( pNewWindow->GetComponentInterface( false ) == xRef,
"VCLXToolkit::createWindow: did #133706# resurge?" );
if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::SHOW )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index e2643258d29c..71bff1b54a44 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -617,7 +617,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
if ( pNextC )
pNext = pNextC;
- pNext->GetComponentInterface( sal_True );
+ pNext->GetComponentInterface( true );
aEvent.NextFocus = (::cppu::OWeakObject*)pNext->GetWindowPeer();
}
mpImpl->getFocusListeners().focusLost( aEvent );
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 16a3e8d662a5..8e7378a96f5f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -189,7 +189,7 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( bool bAcceptExist
}
try
{
- xMe->createPeer( NULL, pParentWindow->GetComponentInterface( sal_True ) );
+ xMe->createPeer( NULL, pParentWindow->GetComponentInterface( true ) );
}
catch( const Exception& )
{
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index efe55e5bbffc..b9934c1b3f61 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -152,7 +152,7 @@ UnoWrapper::~UnoWrapper()
return mxToolkit.get();
}
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, sal_Bool bCreate )
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, bool bCreate )
{
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer();
if ( !xPeer.is() && bCreate )
@@ -227,7 +227,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
Window* pClient = pChild->GetWindow( WINDOW_CLIENT );
if ( pClient->GetWindowPeer() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( sal_False ), ::com::sun::star::uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY );
xComp->dispose();
}
@@ -246,7 +246,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
if ( pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( sal_False ), ::com::sun::star::uno::UNO_QUERY );
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY );
xComp->dispose();
}
@@ -259,7 +259,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
pParent->GetWindowPeer()->notifyWindowRemoved( *pWindow );
VCLXWindow* pWindowPeer = pWindow->GetWindowPeer();
- uno::Reference< lang::XComponent > xWindowPeerComp( pWindow->GetComponentInterface( sal_False ), uno::UNO_QUERY );
+ uno::Reference< lang::XComponent > xWindowPeerComp( pWindow->GetComponentInterface( false ), uno::UNO_QUERY );
OSL_ENSURE( ( pWindowPeer != NULL ) == xWindowPeerComp.is(),
"UnoWrapper::WindowDestroyed: inconsistency in the window's peers!" );
if ( pWindowPeer )
@@ -294,7 +294,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
}
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar )
+::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, bool bIsMenuBar )
{
return maAccessibleFactoryAccess.getFactory().createAccessible( pMenu, bIsMenuBar );
}
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index e7285bd07e96..5fb541d34f26 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -189,7 +189,7 @@ Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( Window* pWindow )
{
- UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface( sal_True ) );
+ UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface( true ) );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > x = pContainer;
UnoControlModel* pContainerModel = new UnoControlContainerModel( ::comphelper::getProcessComponentContext() );