summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/gio
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /ucb/source/ucp/gio
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'ucb/source/ucp/gio')
-rw-r--r--ucb/source/ucp/gio/gio_content.hxx30
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.hxx22
-rw-r--r--ucb/source/ucp/gio/gio_inputstream.hxx10
-rw-r--r--ucb/source/ucp/gio/gio_outputstream.hxx12
-rw-r--r--ucb/source/ucp/gio/gio_provider.hxx18
-rw-r--r--ucb/source/ucp/gio/gio_resultset.hxx4
-rw-r--r--ucb/source/ucp/gio/gio_seekable.hxx14
7 files changed, 55 insertions, 55 deletions
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 6055b6bad548..180ba638d649 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -136,54 +136,54 @@ public:
virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
getProperties( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
+ com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
getCommands( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
+ com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
- virtual OUString getParentURL() SAL_OVERRIDE;
+ virtual OUString getParentURL() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
- throw() SAL_OVERRIDE;
+ throw() override;
virtual void SAL_CALL release()
- throw() SAL_OVERRIDE;
+ throw() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL
getImplementationName()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL
getContentType()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Any SAL_CALL
execute( const com::sun::star::ucb::Command& aCommand,
sal_Int32 CommandId,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment )
- throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL abort( sal_Int32 CommandId )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
SAL_CALL queryCreatableContentsInfo()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( com::sun::star::uno::RuntimeException, std::exception ) override;
com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
queryCreatableContentsInfo(
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index 15c6142c4c1e..824b1174f320 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -64,26 +64,26 @@ public:
const com::sun::star::uno::Reference< Content >& rContent, sal_Int32 nOpenMode );
virtual ~DataSupplier();
- virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE;
+ virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override;
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >
- queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE;
+ queryContentIdentifier( sal_uInt32 nIndex ) override;
virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
- queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE;
+ queryContent( sal_uInt32 nIndex ) override;
- virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE;
+ virtual bool getResult( sal_uInt32 nIndex ) override;
- virtual sal_uInt32 totalCount() SAL_OVERRIDE;
- virtual sal_uInt32 currentCount() SAL_OVERRIDE;
- virtual bool isCountFinal() SAL_OVERRIDE;
+ virtual sal_uInt32 totalCount() override;
+ virtual sal_uInt32 currentCount() override;
+ virtual bool isCountFinal() override;
virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
- queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE;
- virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE;
+ queryPropertyValues( sal_uInt32 nIndex ) override;
+ virtual void releasePropertyValues( sal_uInt32 nIndex ) override;
- virtual void close() SAL_OVERRIDE;
+ virtual void close() override;
virtual void validate()
- throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE;
+ throw( com::sun::star::ucb::ResultSetException ) override;
};
}
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 709ae5d1fd9d..ca2bac2018d2 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -46,30 +46,30 @@ public:
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::BufferSizeExceededException,
::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
sal_Int32 nMaxBytesToRead )
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::BufferSizeExceededException,
::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::BufferSizeExceededException,
::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL available()
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL closeInput()
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
} // namespace gio
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index caf8a5fd096d..e11beab088a8 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -46,28 +46,28 @@ public:
// XInterface
virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); }
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
// XOutputStream
virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL flush()
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL closeOutput()
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ com::sun::star::uno::RuntimeException, std::exception ) override;
};
} // namespace gio
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 848271bcdb76..863e0e46a895 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -36,25 +36,25 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire()
- throw() SAL_OVERRIDE;
+ throw() override;
virtual void SAL_CALL release()
- throw() SAL_OVERRIDE;
+ throw() override;
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -69,7 +69,7 @@ public:
queryContent( const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier )
throw( ::com::sun::star::ucb::IllegalIdentifierException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
}
diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx
index 1b1d15000698..236a7e18c889 100644
--- a/ucb/source/ucp/gio/gio_resultset.hxx
+++ b/ucb/source/ucp/gio/gio_resultset.hxx
@@ -32,8 +32,8 @@ namespace gio
com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv;
private:
- virtual void initStatic() SAL_OVERRIDE;
- virtual void initDynamic() SAL_OVERRIDE;
+ virtual void initStatic() override;
+ virtual void initDynamic() override;
public:
DynamicResultSet(
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 7b0eddb7b87d..339b8281da6a 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -44,28 +44,28 @@ public:
// XInterface
virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); }
+ throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
// XSeekable
virtual void SAL_CALL seek( sal_Int64 location )
throw( ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL getPosition()
throw( ::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL getLength()
throw( ::com::sun::star::io::IOException,
- ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ::com::sun::star::uno::RuntimeException, std::exception ) override;
// XTruncate
virtual void SAL_CALL truncate()
throw( com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ com::sun::star::uno::RuntimeException, std::exception ) override;
};
} // namespace gio