From 5babf1b9037eb283798322eecd8334e6ff1db655 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 3 Apr 2014 13:52:06 +0200 Subject: remove unnecessary scope qualifier from sal_Bool uses i.e. convert "::sal_Bool" to "sal_Bool" Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067 --- toolkit/source/awt/animatedimagespeer.cxx | 2 +- toolkit/source/awt/asynccallback.cxx | 4 ++-- toolkit/source/awt/stylesettings.cxx | 4 ++-- toolkit/source/awt/stylesettings.hxx | 4 ++-- toolkit/source/awt/vclxmenu.cxx | 12 ++++++------ toolkit/source/awt/vclxtabpagecontainer.cxx | 2 +- toolkit/source/awt/vclxtopwindow.cxx | 8 ++++---- toolkit/source/awt/vclxwindow.cxx | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'toolkit/source/awt') diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 2500b1e82209..2b544919ea98 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -326,7 +326,7 @@ namespace toolkit } - ::sal_Bool SAL_CALL AnimatedImagesPeer::isAnimationRunning( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AnimatedImagesPeer::isAnimationRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Throbber* pThrobber( dynamic_cast< Throbber* >( GetWindow() ) ); diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 0e5765af69af..63346a9172e2 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -41,7 +41,7 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XRequestCallback: @@ -72,7 +72,7 @@ OUString SAL_CALL AsyncCallback::getImplementationName() throw (css::uno::Runtim return OUString("com.sun.star.awt.comp.AsyncCallback"); } -::sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 4c8e2b2e4d0d..32bcef11cbfa 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -761,7 +761,7 @@ namespace toolkit } - ::sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException, std::exception) { StyleMethodGuard aGuard( *m_pData ); const Window* pWindow = m_pData->pOwningWindow->GetWindow(); @@ -771,7 +771,7 @@ namespace toolkit } - void SAL_CALL WindowStyleSettings::setHighContrastMode( ::sal_Bool _highcontrastmode ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStyleSettings::setHighContrastMode( sal_Bool _highcontrastmode ) throw (RuntimeException, std::exception) { StyleMethodGuard aGuard( *m_pData ); Window* pWindow = m_pData->pOwningWindow->GetWindow(); diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index 1235c251b32d..841c5470909e 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -135,8 +135,8 @@ namespace toolkit virtual void SAL_CALL setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getWorkspaceColor() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getHighContrastMode() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHighContrastMode( ::sal_Bool _highcontrastmode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getHighContrastMode() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHighContrastMode( sal_Bool _highcontrastmode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getApplicationFont() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setApplicationFont( const ::com::sun::star::awt::FontDescriptor& _applicationfont ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getHelpFont() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index ecf50e08d86f..97ccd04ef2ad 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -195,7 +195,7 @@ throw (css::uno::RuntimeException, std::exception) return aNames; } -::sal_Bool SAL_CALL VCLXMenu::supportsService(const OUString& rServiceName ) +sal_Bool SAL_CALL VCLXMenu::supportsService(const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); @@ -663,7 +663,7 @@ namespace } -::sal_Bool SAL_CALL VCLXMenu::isPopupMenu( ) +sal_Bool SAL_CALL VCLXMenu::isPopupMenu( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -699,7 +699,7 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL VCLXMenu::hideDisabledEntries( - ::sal_Bool bHide ) + sal_Bool bHide ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -714,7 +714,7 @@ throw (css::uno::RuntimeException, std::exception) } -::sal_Bool SAL_CALL VCLXMenu::isInExecute( ) +sal_Bool SAL_CALL VCLXMenu::isInExecute( ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -739,7 +739,7 @@ throw (css::uno::RuntimeException, std::exception) void SAL_CALL VCLXMenu::enableAutoMnemonics( - ::sal_Bool bEnable ) + sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -854,7 +854,7 @@ throw (css::uno::RuntimeException, std::exception) void SAL_CALL VCLXMenu::setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, - ::sal_Bool bScale ) + sal_Bool bScale ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 4b8766206964..9894fbcc3b75 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -108,7 +108,7 @@ void SAL_CALL VCLXTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpa TabControl* pTabCtrl = (TabControl*)GetWindow(); return pTabCtrl != NULL ? pTabCtrl->GetPageCount() : 0; } -::sal_Bool SAL_CALL VCLXTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) { return (getActiveTabPageID() == tabPageIndex); } diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 8636454012c4..c7dccda58fda 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -162,7 +162,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c } -::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -174,7 +174,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c } -void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXTopWindow_Base::setIsMaximized( sal_Bool _ismaximized ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -186,7 +186,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro } -::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -198,7 +198,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro } -void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXTopWindow_Base::setIsMinimized( sal_Bool _isMinimized ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 82ce13627d21..f12e9ec4daa3 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -2557,7 +2557,7 @@ VCLXWindow::getPropertyByName( const OUString& rName ) throw (::com::sun::star:: return GetPropHelper()->getPropertyByName( rName ); } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL VCLXWindow::hasPropertyByName( const OUString& rName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return GetPropHelper()->hasPropertyByName( rName ); -- cgit