[Libreoffice-commits] core.git: ucb/source

Stephan Bergmann sbergman at redhat.com
Tue Apr 8 00:58:08 PDT 2014


 ucb/source/ucp/gvfs/gvfs_content.hxx   |   30 ++++++++++++++---------------
 ucb/source/ucp/gvfs/gvfs_directory.hxx |   26 ++++++++++++-------------
 ucb/source/ucp/gvfs/gvfs_provider.hxx  |   18 ++++++++---------
 ucb/source/ucp/gvfs/gvfs_stream.hxx    |   34 ++++++++++++++++-----------------
 4 files changed, 54 insertions(+), 54 deletions(-)

New commits:
commit 411297a0ad63a3b7484005fd2ad27dd53b58c3d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 8 09:57:03 2014 +0200

    loplugin:saloverride
    
    Change-Id: I6259c0676c2b365549a6f07a71427c2c167c22d5

diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 80abafd..133cb21 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -98,15 +98,15 @@ private:
     // End Internal helpers
 
     // For ucbhelper
-    virtual OUString getParentURL();
+    virtual OUString getParentURL() SAL_OVERRIDE;
     // For ucbhelper
     virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
     getProperties( const com::sun::star::uno::Reference<
-               com::sun::star::ucb::XCommandEnvironment > & xEnv );
+               com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
     // For ucbhelper
     virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
     getCommands( const com::sun::star::uno::Reference<
-             com::sun::star::ucb::XCommandEnvironment > & xEnv );
+             com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
 
 public:
     // Command "getPropertyValues"
@@ -201,29 +201,29 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception );
+        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
-        throw();
+        throw() SAL_OVERRIDE;
     virtual void SAL_CALL release()
-        throw();
+        throw() SAL_OVERRIDE;
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception );
+        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception );
+        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     // XContent
     virtual OUString SAL_CALL
     getContentType()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     // XCommandProcessor
     virtual com::sun::star::uno::Any SAL_CALL
@@ -233,10 +233,10 @@ public:
          com::sun::star::ucb::XCommandEnvironment >& xEnv )
         throw( com::sun::star::uno::Exception,
                com::sun::star::ucb::CommandAbortedException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
     virtual void SAL_CALL
     abort( sal_Int32 CommandId )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
 
     // Additional interfaces
@@ -246,11 +246,11 @@ public:
     virtual com::sun::star::uno::Sequence<
         com::sun::star::ucb::ContentInfo > SAL_CALL
     queryCreatableContentsInfo()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException ) SAL_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 );
+        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
 
     com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index 1ea9fa7..4d296df 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx
@@ -33,8 +33,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
         com::sun::star::ucb::XCommandEnvironment > m_xEnv;
 
 private:
-    virtual void initStatic();
-    virtual void initDynamic();
+    virtual void initStatic() SAL_OVERRIDE;
+    virtual void initDynamic() SAL_OVERRIDE;
 
 public:
     DynamicResultSet( const com::sun::star::uno::Reference<
@@ -59,25 +59,25 @@ public:
 
     virtual ~DataSupplier();
 
-    virtual OUString queryContentIdentifierString( sal_uInt32 nIndex );
+    virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE;
     virtual com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentIdentifier >
-                          queryContentIdentifier( sal_uInt32 nIndex );
+                          queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE;
     virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
-                          queryContent( sal_uInt32 nIndex );
+                          queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE;
 
-    virtual bool      getResult( sal_uInt32 nIndex );
+    virtual bool      getResult( sal_uInt32 nIndex ) SAL_OVERRIDE;
 
-    virtual sal_uInt32    totalCount();
-    virtual sal_uInt32    currentCount();
-    virtual bool      isCountFinal();
+    virtual sal_uInt32    totalCount() SAL_OVERRIDE;
+    virtual sal_uInt32    currentCount() SAL_OVERRIDE;
+    virtual bool      isCountFinal() SAL_OVERRIDE;
 
     virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
-                          queryPropertyValues( sal_uInt32 nIndex  );
-    virtual void          releasePropertyValues( sal_uInt32 nIndex );
-    virtual void          close();
+                          queryPropertyValues( sal_uInt32 nIndex  ) SAL_OVERRIDE;
+    virtual void          releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE;
+    virtual void          close() SAL_OVERRIDE;
     virtual void          validate()
-        throw( com::sun::star::ucb::ResultSetException );
+        throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE;
 };
 
 }
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index 9ddf616..a03fb33 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -34,25 +34,25 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception );
+        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
-        throw();
+        throw() SAL_OVERRIDE;
     virtual void SAL_CALL release()
-        throw();
+        throw() SAL_OVERRIDE;
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception );
+        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception );
+        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // 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( 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;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -67,7 +67,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 );
+               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
 };
 
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx
index 88ea24d..cc62f1b 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.hxx
@@ -66,20 +66,20 @@ public:
 
     // XInterface
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire( void )
-        throw ()
+        throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
     virtual void SAL_CALL release( void )
-        throw()
+        throw() SAL_OVERRIDE
             { OWeakObject::release(); }
 
     // XStream
     virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream(  )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream(  )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(
@@ -88,7 +88,7 @@ public:
                 throw( ::com::sun::star::io::NotConnectedException,
                           ::com::sun::star::io::BufferSizeExceededException,
                           ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException );
+                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     virtual sal_Int32 SAL_CALL readSomeBytes(
             ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
@@ -96,61 +96,61 @@ public:
                 throw( ::com::sun::star::io::NotConnectedException,
                           ::com::sun::star::io::BufferSizeExceededException,
                           ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException );
+                          ::com::sun::star::uno::RuntimeException ) SAL_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 );
+                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     virtual sal_Int32 SAL_CALL available( void )
                 throw( ::com::sun::star::io::NotConnectedException,
                           ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException );
+                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     virtual void SAL_CALL closeInput( void )
                 throw( ::com::sun::star::io::NotConnectedException,
                           ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException );
+                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     // 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 );
+               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     virtual sal_Int64 SAL_CALL getPosition()
         throw( ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     virtual sal_Int64 SAL_CALL getLength()
         throw( ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
         // 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);
+               com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
     virtual void SAL_CALL flush( void )
         throw( com::sun::star::io::NotConnectedException,
                com::sun::star::io::BufferSizeExceededException,
                com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException);
+               com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
 
         virtual void SAL_CALL closeOutput( void )
         throw( com::sun::star::io::NotConnectedException,
                com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 
     // XTruncate
     virtual void SAL_CALL truncate( void )
         throw( com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
 };
 
 } // namespace gvfs


More information about the Libreoffice-commits mailing list