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 --- scripting/source/dlgprov/DialogModelProvider.cxx | 6 ++-- scripting/source/dlgprov/DialogModelProvider.hxx | 6 ++-- scripting/source/stringresource/stringresource.hxx | 40 +++++++++++----------- scripting/source/vbaevents/eventhelper.cxx | 8 ++--- 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'scripting/source') diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx index 548fdc2440f3..6e61692692e8 100644 --- a/scripting/source/dlgprov/DialogModelProvider.cxx +++ b/scripting/source/dlgprov/DialogModelProvider.cxx @@ -97,7 +97,7 @@ uno::Type SAL_CALL DialogModelProvider::getElementType() throw (css::uno::Runtim return m_xDialogModel->getElementType(); } -::sal_Bool SAL_CALL DialogModelProvider::hasElements() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DialogModelProvider::hasElements() throw (css::uno::RuntimeException, std::exception) { return m_xDialogModel->hasElements(); } @@ -113,7 +113,7 @@ css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames() t return m_xDialogModel->getElementNames(); } -::sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) { return m_xDialogModel->hasByName(aName); } @@ -164,7 +164,7 @@ OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno:: return comp_DialogModelProvider::_getImplementationName(); } -::sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index b9f412068676..87e7c4d6f7c2 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -42,12 +42,12 @@ private: // ::com::sun::star::container::XElementAccess: virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XNameAccess: virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XNameReplace: virtual void SAL_CALL replaceByName(const OUString & aName, const ::com::sun::star::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; @@ -58,7 +58,7 @@ private: // ::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; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 9f79361b3d4e..92e6d6b47770 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -164,7 +164,7 @@ protected: //=== Impl methods for ...ForLocale methods === OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) throw (::com::sun::star::resource::MissingResourceException); - ::sal_Bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); + sal_Bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); ::com::sun::star::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); void implSetString( const OUString& ResourceID, const OUString& Str, LocaleItem* pLocaleItem ); @@ -203,9 +203,9 @@ public: const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, + virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) @@ -221,9 +221,9 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringResourceManager - virtual ::sal_Bool SAL_CALL isReadOnly() + virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, ::sal_Bool FindClosestMatch ) + virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, @@ -355,9 +355,9 @@ public: const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, + virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) @@ -373,9 +373,9 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringResourceManager - virtual ::sal_Bool SAL_CALL isReadOnly() + virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, ::sal_Bool FindClosestMatch ) + virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, @@ -407,7 +407,7 @@ public: throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL isModified( ) + virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -469,9 +469,9 @@ public: const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, + virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) @@ -487,9 +487,9 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringResourceManager - virtual ::sal_Bool SAL_CALL isReadOnly() + virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, ::sal_Bool FindClosestMatch ) + virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, @@ -521,7 +521,7 @@ public: throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL isModified( ) + virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -595,9 +595,9 @@ public: const ::com::sun::star::lang::Locale& locale ) throw ( ::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) + virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, + virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID, const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getResourceIDs( ) @@ -613,9 +613,9 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringResourceManager - virtual ::sal_Bool SAL_CALL isReadOnly() + virtual sal_Bool SAL_CALL isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, ::sal_Bool FindClosestMatch ) + virtual void SAL_CALL setCurrentLocale( const ::com::sun::star::lang::Locale& locale, sal_Bool FindClosestMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultLocale( const ::com::sun::star::lang::Locale& locale ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, @@ -647,7 +647,7 @@ public: throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL isModified( ) + virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComment( const OUString& Comment ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 36a8335fc9c2..72ec5d7bc78b 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -487,12 +487,12 @@ public: // XNameAccess virtual Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return getCppuType(static_cast< const OUString * >(0) ); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); } private: @@ -583,7 +583,7 @@ public: virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException, std::exception) SAL_OVERRIDE; // XCloseListener - virtual void SAL_CALL queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -728,7 +728,7 @@ EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::Invocatio // XCloseListener void SAL_CALL -EventListener::queryClosing( const lang::EventObject& /*Source*/, ::sal_Bool /*GetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) +EventListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) { //Nothing to do } -- cgit