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 /sc/inc/chartuno.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/inc/chartuno.hxx')
-rw-r--r-- | sc/inc/chartuno.hxx | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 57475815326a..dccf365d6b34 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -57,7 +57,7 @@ public: ScChartsObj(ScDocShell* pDocSh, SCTAB nT); virtual ~ScChartsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XTableCharts virtual void SAL_CALL addNewByName( const OUString& aName, @@ -66,43 +66,43 @@ public: ::com::sun::star::table::CellRangeAddress >& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - 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; }; typedef ::cppu::WeakComponentImplHelper< @@ -130,21 +130,21 @@ private: protected: // ::comphelper::OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, - std::exception) SAL_OVERRIDE; + std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; // ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; public: ScChartObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN); virtual ~ScChartObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // XInterface DECLARE_XINTERFACE() @@ -153,44 +153,44 @@ public: DECLARE_XTYPEPROVIDER() // XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XTableChart - virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + std::exception) override; + virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL - getRanges( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getRanges( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) throw(::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; // XEmbeddedObjectSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL - getEmbeddedObject() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getEmbeddedObject() throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - 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; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif |