summaryrefslogtreecommitdiff
path: root/scripting/source/provider
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /scripting/source/provider
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'scripting/source/provider')
-rw-r--r--scripting/source/provider/ActiveMSPList.hxx2
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx50
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.hxx8
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx34
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.hxx8
-rw-r--r--scripting/source/provider/URIHelper.hxx14
6 files changed, 58 insertions, 58 deletions
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 576e1c01a471..ed4e1445a6d7 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -78,7 +78,7 @@ public:
virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
void addActiveMSP( const css::uno::Reference< css::uno::XInterface >& xComponent,
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 9237294e0035..b2df40e2426c 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -79,14 +79,14 @@ public:
virtual OUString
SAL_CALL getName()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_Name;
}
virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
getChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
std::vector< Sequence< Reference < browse::XBrowseNode > > > seqs;
seqs.reserve( m_Nodes.getLength() );
@@ -126,7 +126,7 @@ public:
virtual sal_Bool SAL_CALL
hasChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
if ( m_Nodes.getLength() != 0 )
{
@@ -151,7 +151,7 @@ public:
}
virtual sal_Int16 SAL_CALL getType()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return browse::BrowseNodeTypes::CONTAINER;
}
@@ -203,14 +203,14 @@ public:
virtual OUString SAL_CALL getName()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_sNodeName;
}
virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
getChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
if ( m_hBNA == NULL )
{
@@ -231,13 +231,13 @@ public:
}
virtual sal_Bool SAL_CALL hasChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return sal_True;
}
virtual sal_Int16 SAL_CALL getType()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return browse::BrowseNodeTypes::CONTAINER;
}
@@ -430,7 +430,7 @@ public:
virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
getChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
if ( hasChildNodes() )
{
@@ -464,28 +464,28 @@ public:
}
virtual sal_Int16 SAL_CALL getType()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_xWrappedBrowseNode->getType();
}
virtual OUString
SAL_CALL getName()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_xWrappedBrowseNode->getName();
}
virtual sal_Bool SAL_CALL
hasChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_xWrappedBrowseNode->hasChildNodes();
}
// XInterface
virtual Any SAL_CALL queryInterface( const Type& aType )
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
Any aRet = t_BrowseNodeBase::queryInterface( aType );
if ( aRet.hasValue() )
@@ -503,13 +503,13 @@ public:
}
virtual void SAL_CALL acquire()
- throw ()
+ throw () SAL_OVERRIDE
{
osl_atomic_increment( &m_refCount );
}
virtual void SAL_CALL release()
- throw ()
+ throw () SAL_OVERRIDE
{
if ( osl_atomic_decrement( &m_refCount ) == 0 )
{
@@ -519,12 +519,12 @@ public:
// XTypeProvider (implemnented by base, but needs to be overridden for
// delegating to aggregate)
virtual Sequence< Type > SAL_CALL getTypes()
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_xWrappedTypeProv->getTypes();
}
virtual Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw ( com::sun::star::uno::RuntimeException, std::exception )
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
{
return css::uno::Sequence<sal_Int8>();
}
@@ -558,7 +558,7 @@ public:
virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
getChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
// no need to sort user, share, doc1...docN
//::std::sort( m_vNodes.begin(), m_vNodes.end(), alphaSortForBNodes() );
@@ -572,21 +572,21 @@ public:
}
virtual sal_Int16 SAL_CALL getType()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return browse::BrowseNodeTypes::ROOT;
}
virtual OUString
SAL_CALL getName()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return m_Name;
}
virtual sal_Bool SAL_CALL
hasChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
sal_Bool result = sal_True;
if ( !m_vNodes.size() )
@@ -615,14 +615,14 @@ public:
}
virtual OUString SAL_CALL getName()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return OUString("Root");
}
virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
getChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
Sequence < Reference < browse::XBrowseNode > > locnBNs = getAllBrowseNodes( m_xComponentContext );
@@ -639,13 +639,13 @@ public:
}
virtual sal_Bool SAL_CALL hasChildNodes()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return sal_True; // will always be user and share
}
virtual sal_Int16 SAL_CALL getType()
- throw ( RuntimeException, std::exception )
+ throw ( RuntimeException, std::exception ) SAL_OVERRIDE
{
return browse::BrowseNodeTypes::CONTAINER;
}
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 719feda84231..4ceeecbccca2 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -50,20 +50,20 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
supportsService( OUString const & serviceName )
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XBrowseNodeFactory
virtual css::uno::Reference< css::script::browse::XBrowseNode > SAL_CALL
createView( sal_Int16 viewType )
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
css::uno::Reference< css::script::browse::XBrowseNode >
getSelectorHierarchy()
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index d5d76ccf74e8..3b8bacdcb13e 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -56,41 +56,41 @@ public:
// XServiceInfo implementation
virtual OUString SAL_CALL getImplementationName( )
- throw( css::uno::RuntimeException, std::exception );
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XBrowseNode implementation
virtual OUString SAL_CALL getName()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasChildNodes()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Int16 SAL_CALL getType()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
- virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw ( css::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, 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 (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType( ) throw ( css::uno::RuntimeException, std::exception);
- virtual sal_Bool SAL_CALL hasElements( ) throw ( css::uno::RuntimeException, std::exception);
+ virtual css::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 supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception );
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw( css::uno::RuntimeException, std::exception );
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XScriptProvider implementation
virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL
getScript( const OUString& scriptURI )
throw( css::script::provider::ScriptFrameworkErrorException,
- css::uno::RuntimeException, std::exception );
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**
* XInitialise implementation
@@ -99,7 +99,7 @@ public:
* containing the URI
*/
virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args )
- throw ( css::uno::Exception, css::uno::RuntimeException, std::exception);
+ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// Public method to return all Language Providers in this MasterScriptProviders
// context.
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index ed8b3905367e..462a83022ee1 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -55,20 +55,20 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
supportsService( OUString const & serviceName )
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception );
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XScriptProviderFactory
virtual css::uno::Reference< css::script::provider::XScriptProvider >
SAL_CALL createScriptProvider( const css::uno::Any& context )
- throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+ throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index af24b050044c..c9d120e56cdb 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -65,33 +65,33 @@ public:
virtual void SAL_CALL
initialize( const css::uno::Sequence < css::uno::Any > & args )
- throw ( css::uno::Exception, css::uno::RuntimeException, std::exception);
+ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL
getRootStorageURI()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL
getScriptURI( const OUString& rStorageURI )
throw( css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception );
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL
getStorageURI( const OUString& rScriptURI )
throw( css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception );
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual OUString SAL_CALL
getImplementationName()
- throw( css::uno::RuntimeException, std::exception );
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception );
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception );
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
} // namespace func_provider