From 7af850c89664d3c739abd244cb7016b806c0f293 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 10 Sep 2014 08:35:26 +0200 Subject: vcl: sal_Bool -> bool Change-Id: Iff4da6d6281eb9194db348ebc10fbe7718538401 --- basctl/source/basicide/baside2.hxx | 2 +- basctl/source/basicide/baside2b.cxx | 2 +- include/svtools/headbar.hxx | 2 +- include/svtools/svmedit.hxx | 2 +- include/svtools/toolpanel/paneltabbar.hxx | 2 +- include/svtools/toolpanel/toolpaneldeck.hxx | 2 +- include/svx/srchdlg.hxx | 2 +- include/vcl/unowrap.hxx | 4 ++-- include/vcl/window.hxx | 2 +- sfx2/source/sidebar/AccessibleTitleBar.cxx | 2 +- svtools/source/control/headbar.cxx | 2 +- svtools/source/edit/svmedit.cxx | 2 +- svtools/source/toolpanel/paneltabbar.cxx | 4 ++-- svtools/source/toolpanel/toolpaneldeck.cxx | 4 ++-- svtools/source/toolpanel/toolpaneldrawer.cxx | 4 ++-- svtools/source/toolpanel/toolpaneldrawer.hxx | 2 +- svtools/source/uno/wizard/wizardpagecontroller.cxx | 2 +- svx/source/dialog/srchdlg.cxx | 2 +- toolkit/inc/helper/unowrapper.hxx | 4 ++-- toolkit/source/awt/vclxcontainer.cxx | 2 +- toolkit/source/awt/vclxtoolkit.cxx | 6 +++--- toolkit/source/awt/vclxwindow.cxx | 2 +- toolkit/source/controls/unocontrol.cxx | 2 +- toolkit/source/helper/unowrapper.cxx | 10 +++++----- toolkit/source/helper/vclunohelper.cxx | 2 +- vcl/source/window/accessibility.cxx | 2 +- vcl/source/window/window.cxx | 2 +- 27 files changed, 38 insertions(+), 38 deletions(-) diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 72af6c79a9ef..02ce15c3c414 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -116,7 +116,7 @@ private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(sal_Bool bCreate = true) SAL_OVERRIDE; + GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; CodeCompleteDataCache aCodeCompleteCache; boost::scoped_ptr< CodeCompleteWindow > pCodeCompleteWnd; OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 9d53af5e587d..2fadb712aa84 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2094,7 +2094,7 @@ void ComplexEditorWindow::SetLineNumberDisplay(bool b) } uno::Reference< awt::XWindowPeer > -EditorWindow::GetComponentInterface(sal_Bool bCreate) +EditorWindow::GetComponentInterface(bool bCreate) { uno::Reference< awt::XWindowPeer > xPeer( Window::GetComponentInterface(false)); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index ce4d50b077f3..63fb5e91e6f1 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -372,7 +372,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate ) SAL_OVERRIDE; }; diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 0970e38b40aa..892d80fcc18f 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -34,7 +34,7 @@ public: MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(sal_Bool bCreate = sal_True) SAL_OVERRIDE; + GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; }; diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 3f1d36ccb858..190b86bf5668 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -81,7 +81,7 @@ namespace svt virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; + GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE; private: ::std::auto_ptr< PanelTabBar_Impl > m_pImpl; diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 2eb7d8318548..1f2497c1aeec 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -169,7 +169,7 @@ namespace svt virtual void GetFocus() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; + GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE; private: ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 6b28b5ad88bf..7ec864e14544 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -143,7 +143,7 @@ public: void SetSrchFlag( bool bSuccess = false ) { mbSuccess = bSuccess; } bool GetSrchFlag() { return mbSuccess; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool bCreate ) SAL_OVERRIDE; + GetComponentInterface( bool bCreate ) SAL_OVERRIDE; void SetSaveToModule(bool b); diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index fd0e9794fe63..5cd880215483 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -67,14 +67,14 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) = 0; virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; virtual void WindowDestroyed( Window* pWindow ) = 0; // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ) = 0; + CreateAccessible( Menu* pMenu, bool bIsMenuBar ) = 0; protected: ~UnoWrapperBase() {} diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 0e0b18e53ceb..e4f49dab2d87 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1066,7 +1066,7 @@ public: // API to set/query the component interfaces virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool bCreate = sal_True ); + GetComponentInterface( bool bCreate = true ); virtual void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx index 4ce6deab874b..3fd70960ce78 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.cxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx @@ -32,7 +32,7 @@ namespace sfx2 { namespace sidebar { Reference AccessibleTitleBar::Create (TitleBar& rTitleBar) { - rTitleBar.GetComponentInterface(sal_True); + rTitleBar.GetComponentInterface(true); VCLXWindow* pWindow = rTitleBar.GetWindowPeer(); if (pWindow != NULL) return new Accessible(new AccessibleTitleBar(pWindow)); diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 1b3970712db3..51fac595c035 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1546,7 +1546,7 @@ void HeaderBar::SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::sta mxAccessible = _xAccessible; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > HeaderBar::GetComponentInterface( sal_Bool bCreate ) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > HeaderBar::GetComponentInterface( bool bCreate ) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer (Window::GetComponentInterface(false)); diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 8ea2f0af83bf..c1319e57cf2a 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -28,7 +28,7 @@ MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle ) // virtual css::uno::Reference< css::awt::XWindowPeer > -MultiLineEdit::GetComponentInterface(sal_Bool bCreate) +MultiLineEdit::GetComponentInterface(bool bCreate) { css::uno::Reference< css::awt::XWindowPeer > xPeer( VclMultiLineEdit::GetComponentInterface(false)); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index f955f2fe365e..581c2576ba70 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -1345,9 +1345,9 @@ namespace svt } - Reference< XWindowPeer > PanelTabBar::GetComponentInterface( sal_Bool i_bCreate ) + Reference< XWindowPeer > PanelTabBar::GetComponentInterface( bool i_bCreate ) { - Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) ); + Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( false ) ); if ( !xWindowPeer.is() && i_bCreate ) { xWindowPeer.set( new PanelTabBarPeer( *this ) ); diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 272a0d7d0f4b..19c0a22febb4 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -504,9 +504,9 @@ namespace svt } - Reference< XWindowPeer > ToolPanelDeck::GetComponentInterface( sal_Bool i_bCreate ) + Reference< XWindowPeer > ToolPanelDeck::GetComponentInterface( bool i_bCreate ) { - Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) ); + Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( false ) ); if ( !xWindowPeer.is() && i_bCreate ) { xWindowPeer.set( new ToolPanelDeckPeer( *this ) ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index df3382bb2be8..4de6648d3e48 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -292,9 +292,9 @@ namespace svt } - Reference< XWindowPeer > ToolPanelDrawer::GetComponentInterface( sal_Bool i_bCreate ) + Reference< XWindowPeer > ToolPanelDrawer::GetComponentInterface( bool i_bCreate ) { - Reference< XWindowPeer > xWindowPeer( Window::GetComponentInterface( sal_False ) ); + Reference< XWindowPeer > xWindowPeer( Window::GetComponentInterface( false ) ); if ( !xWindowPeer.is() && i_bCreate ) { xWindowPeer.set( new ToolPanelDrawerPeer() ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index 536a88727106..92898ba202ab 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -80,7 +80,7 @@ namespace svt virtual void MouseButtonDown( const MouseEvent& i_rMouseEvent ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool i_bCreate ) SAL_OVERRIDE; + GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE; private: Rectangle impl_calcTextBoundingBox() const; diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 992caa55bdf6..4d86bd4d17d5 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -64,7 +64,7 @@ namespace svt { namespace uno try { m_xWizardPage.set( m_xController->createPage( - Reference< XWindow >( i_rParent.GetComponentInterface( sal_True ), UNO_QUERY_THROW ), + Reference< XWindow >( i_rParent.GetComponentInterface( true ), UNO_QUERY_THROW ), m_nPageId ), UNO_SET_THROW ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index e4673fb8c8ac..0a5ca73116d6 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2195,7 +2195,7 @@ void SvxSearchDialog::SaveToModule_Impl() } ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - SvxSearchDialog::GetComponentInterface( sal_Bool bCreate ) + SvxSearchDialog::GetComponentInterface( bool bCreate ) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer (Window::GetComponentInterface(false)); 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() ); diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index f6262b0e4505..3b64a2fbd819 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -143,7 +143,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos() ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::CreateAccessible() { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc( GetComponentInterface( sal_True ), ::com::sun::star::uno::UNO_QUERY ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc( GetComponentInterface( true ), ::com::sun::star::uno::UNO_QUERY ); return xAcc; } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index ef1ff62e9ec9..73940bce7e7d 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3254,7 +3254,7 @@ void Window::SetWindowPeer( Reference< css::awt::XWindowPeer > xPeer, VCLXWindow mpWindowImpl->mpVCLXWindow = pVCLXWindow; } -Reference< css::awt::XWindowPeer > Window::GetComponentInterface( sal_Bool bCreate ) +Reference< css::awt::XWindowPeer > Window::GetComponentInterface( bool bCreate ) { if ( !mpWindowImpl->mxWindowPeer.is() && bCreate ) { -- cgit