diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /embeddedobj/source/inc/commonembobj.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'embeddedobj/source/inc/commonembobj.hxx')
-rw-r--r-- | embeddedobj/source/inc/commonembobj.hxx | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index 676847a7a907..f98c033809e4 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -250,13 +250,13 @@ 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; // XEmbeddedObject @@ -264,51 +264,51 @@ public: throw ( css::embed::UnreachableStateException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getCurrentState() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::embed::UnreachableStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setClientSite( const css::uno::Reference< css::embed::XEmbeddedClient >& xClient ) throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL update() throw ( css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setContainerName( const OUString& sName ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // XVisualObject @@ -317,23 +317,23 @@ public: throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XEmbedPersist @@ -347,14 +347,14 @@ public: css::embed::WrongStateException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL storeAsEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, @@ -365,20 +365,20 @@ public: css::embed::WrongStateException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) throw ( css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasEntry() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getEntryName() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; // XLinkageSupport @@ -388,16 +388,16 @@ public: css::embed::WrongStateException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isLink() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLinkURL() throw ( css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XCommonEmbedPersist @@ -406,11 +406,11 @@ public: throw ( css::embed::WrongStateException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isReadonly() throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL reload( const css::uno::Sequence< css::beans::PropertyValue >& lArguments, @@ -419,12 +419,12 @@ public: css::embed::WrongStateException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; // XEmbedPersist2 virtual sal_Bool SAL_CALL isStored() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XInplaceObject @@ -432,71 +432,71 @@ public: const css::awt::Rectangle& aClipRect ) throw ( css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL enableModeless( sal_Bool bEnable ) throw ( css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL translateAccelerators( const css::uno::Sequence< css::awt::KeyEvent >& aKeys ) throw ( css::embed::WrongStateException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; // XClassifiedObject virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getClassName() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setClassInfo( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) throw ( css::lang::NoSupportException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; // XComponentSupplier virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // XStateChangeBroadcaster - virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XCloseable virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw ( css::util::CloseVetoException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // XEventBroadcaster virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& Listener ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& Listener ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XDefaultSizeTransmitter //#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method - virtual void SAL_CALL setDefaultSize( const css::awt::Size& rSize_100TH_MM ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultSize( const css::awt::Size& rSize_100TH_MM ) throw (css::uno::RuntimeException, std::exception) override; }; #endif |