diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-03 13:52:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-03 13:54:02 +0200 |
commit | 5babf1b9037eb283798322eecd8334e6ff1db655 (patch) | |
tree | a6be386ebc21a7e0c47b5ac78279edc873cf0578 /sfx2 | |
parent | c03c9da8c249c2e2a61bab3d6fad325d5934f5e0 (diff) |
remove unnecessary scope qualifier from sal_Bool uses
i.e. convert "::sal_Bool" to "sal_Bool"
Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appinit.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/doc/docundomanager.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/doc/ownsubfilterservice.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/sfxmodelfactory.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/inc/docundomanager.hxx | 6 | ||||
-rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 2 |
10 files changed, 26 insertions, 26 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 7e026060cbf1..1ff37e1938b4 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -83,7 +83,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -132,7 +132,7 @@ OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (Runt return OUString("com.sun.star.comp.sfx2.SfxTerminateListener"); } -::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index cb49f397c12d..6ba62be253f6 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -930,7 +930,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 case PROPHANDLE_TERMINATEVETOSTATE : { // use new value in case it's a valid information only - ::sal_Bool bState( sal_False ); + sal_Bool bState( sal_False ); if (! (aValue >>= bState)) return; diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 83e8d7e7e0ab..7181593f7976 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -135,7 +135,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( + 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; @@ -266,9 +266,9 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifiable: - virtual ::sal_Bool SAL_CALL isModified( ) + virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setModified( ::sal_Bool bModified ) + virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifyBroadcaster: @@ -380,7 +380,7 @@ public: return OUString("CompatWriterDocPropsImpl"); } - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } @@ -1379,7 +1379,7 @@ SfxDocumentMetaData::getImplementationName() throw (css::uno::RuntimeException, return OUString("SfxDocumentMetaData"); } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL SfxDocumentMetaData::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception) { @@ -2169,7 +2169,7 @@ SfxDocumentMetaData::createClone() } // ::com::sun::star::util::XModifiable: -::sal_Bool SAL_CALL SfxDocumentMetaData::isModified( ) +sal_Bool SAL_CALL SfxDocumentMetaData::isModified( ) throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); @@ -2179,7 +2179,7 @@ SfxDocumentMetaData::createClone() return m_isModified || (xMB.is() ? xMB->isModified() : sal_False); } -void SAL_CALL SfxDocumentMetaData::setModified( ::sal_Bool bModified ) +void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) { css::uno::Reference<css::util::XModifiable> xMB; diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 1ff0e915cc81..d71f019c2b82 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -320,14 +320,14 @@ namespace sfx2 } - ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isUndoPossible(); } - ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isRedoPossible(); @@ -406,7 +406,7 @@ namespace sfx2 } - ::sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isLocked(); diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 1b92f71caa64..27c525a1a4b7 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -47,12 +47,12 @@ public: virtual ~OwnSubFilterService(); // XFilter - virtual ::sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index e12f92d0c094..38720fce1d75 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -2345,7 +2345,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia return xDialogLibraries; } -::sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index d890309ad8c2..a8f57f17bf74 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -81,7 +81,7 @@ namespace sfx2 // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -194,7 +194,7 @@ namespace sfx2 return m_sImplementationName; } - ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 5f81011f8df6..31d8731cc36c 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -70,8 +70,8 @@ namespace sfx2 virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -85,7 +85,7 @@ namespace sfx2 // XLockable, base of XUndoManager virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild, base of XUndoManager virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index e205733741d8..1af408f8f33d 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -316,7 +316,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) // XStatusbarController -::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonDown( +sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonDown( const awt::MouseEvent& rMouseEvent ) throw ( uno::RuntimeException, std::exception ) { @@ -334,7 +334,7 @@ throw ( uno::RuntimeException, std::exception ) -::sal_Bool SAL_CALL SfxStatusBarControl::mouseMove( +sal_Bool SAL_CALL SfxStatusBarControl::mouseMove( const awt::MouseEvent& rMouseEvent ) throw (uno::RuntimeException, std::exception) { @@ -351,7 +351,7 @@ throw (uno::RuntimeException, std::exception) -::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp( +sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp( const ::awt::MouseEvent& rMouseEvent ) throw ( uno::RuntimeException, std::exception ) { @@ -371,7 +371,7 @@ throw ( uno::RuntimeException, std::exception ) void SAL_CALL SfxStatusBarControl::command( const awt::Point& rPos, ::sal_Int32 nCommand, - ::sal_Bool /*bMouseEvent*/, + sal_Bool /*bMouseEvent*/, const ::com::sun::star::uno::Any& /*aData*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 957a3351d180..50100aae2675 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -599,7 +599,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) } // XSubToolbarController -::sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) { return sal_False; } |