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 /xmloff/source/chart | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'xmloff/source/chart')
29 files changed, 89 insertions, 89 deletions
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index f0af27a79574..c5645638ac34 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -40,9 +40,9 @@ public: protected: // ____ XPropertySetInfo ____ - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) override; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) override; private: OUString m_aColorPropName; diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx index 448e1fffe6df..9f7411dd0966 100644 --- a/xmloff/source/chart/ColorPropertySet.hxx +++ b/xmloff/source/chart/ColorPropertySet.hxx @@ -41,7 +41,7 @@ public: protected: // ____ 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; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) @@ -49,55 +49,55 @@ protected: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::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::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; private: ::com::sun::star::uno::Reference< diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index 34252b5c3736..d62a7db8ef3a 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -75,7 +75,7 @@ public: /** descr Set the given value inside an Any to the variable referenced by the data member. */ - virtual void SetValue (const ::com::sun::star::uno::Any & rValue) SAL_OVERRIDE + virtual void SetValue (const ::com::sun::star::uno::Any & rValue) override { rValue >>= mrValue; } diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx index ad8916852a3a..44f3db677d10 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx @@ -35,7 +35,7 @@ protected: const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const SAL_OVERRIDE; + ) const override; public: explicit SchXMLAutoStylePoolP( SchXMLExport& rSchXMLExport ); diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 37709e0b4af1..7bae970a6ba2 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -78,7 +78,7 @@ public: const OUString& rLocalName, OUString& rAddress ); virtual ~SchXMLCategoriesContext(); - virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; class DateScaleContext : public SvXMLImportContext @@ -89,7 +89,7 @@ public: const Reference< beans::XPropertySet >& rAxisProps ); virtual ~DateScaleContext(); - virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: Reference< beans::XPropertySet > m_xAxisProps; diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index d0284feb1068..a734d3357ae8 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -36,12 +36,12 @@ public: bool& rbAxisPositionAttributeImported ); virtual ~SchXMLAxisContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc, const OUString& rChartTypeServiceName, diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index b6d8a4211dcd..762d0f11bd71 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx @@ -34,9 +34,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; }; diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index a68e49a636a7..5aeed6577557 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -82,13 +82,13 @@ public: virtual ~SchXMLChartContext(); virtual void StartElement( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLTable maTable; @@ -146,11 +146,11 @@ public: virtual ~SchXMLTitleContext(); virtual void StartElement( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx index bc8413eb7f3f..73751ce4efec 100644 --- a/xmloff/source/chart/SchXMLLegendContext.hxx +++ b/xmloff/source/chart/SchXMLLegendContext.hxx @@ -27,7 +27,7 @@ public: SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ); virtual ~SchXMLLegendContext(); - virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index 970e4344405b..1fa28cee100c 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -40,15 +40,15 @@ public: OUString& rText, OUString * pOutId = 0 ); virtual ~SchXMLParagraphContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; - virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPARAGRAPHCONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index 6f3fad5328c8..0a77d653d1e1 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -103,12 +103,12 @@ public: const ::com::sun::star::awt::Size & rChartSize ); virtual ~SchXMLPlotAreaContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; private: SchXMLImportHelper& mrImportHelper; @@ -159,7 +159,7 @@ public: bool bSymbolSizeForSeriesIsMissingInFile ); virtual ~SchXMLDataPointContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLCoordinateRegionContext : public SvXMLImportContext @@ -171,7 +171,7 @@ public: , const OUString& rLocalName , SchXMLPositonAttributesHelper& rPositioning ); virtual ~SchXMLCoordinateRegionContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLPositonAttributesHelper& m_rPositioning; @@ -199,7 +199,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLWallFloorContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLStockContext : public SvXMLImportContext @@ -225,7 +225,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, ContextType eContextType ); virtual ~SchXMLStockContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLStatisticsObjectContext : public SvXMLImportContext @@ -252,11 +252,11 @@ public: virtual ~SchXMLStatisticsObjectContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper & mrImportHelper; diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx index 84abb7b1a4dc..e5e8e1b0a6be 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx @@ -34,7 +34,7 @@ public: virtual ~SchXMLPropertyMappingContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDocument; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index 0905b65e33f8..6ad9775f4dcb 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -42,11 +42,11 @@ public: virtual ~SchXMLRegressionCurveObjectContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: @@ -71,7 +71,7 @@ public: virtual ~SchXMLEquationContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper& mrImportHelper; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 59a2844953f8..a7178769d7d3 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -74,7 +74,7 @@ public: const OUString& rLocalName, ::std::vector< OUString > & rAddresses ); virtual ~SchXMLDomain2Context(); - virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ) override; }; SchXMLDomain2Context::SchXMLDomain2Context( diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index d4544c0ead6e..57c8d9f74cb1 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -87,12 +87,12 @@ public: const ::com::sun::star::awt::Size & rChartSize ); virtual ~SchXMLSeries2Context(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; static void initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 1f7d77ec9393..8b58f4cb5a70 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -600,8 +600,8 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; // classes for cells and their content diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index e9484c481162..67bbdb2bfeab 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -56,9 +56,9 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; void setRowPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); void setColumnPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); @@ -100,7 +100,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLTableColumnContext : public SvXMLImportContext @@ -113,7 +113,7 @@ public: const OUString& rLocalName, SchXMLTable& aTable ); virtual ~SchXMLTableColumnContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; // classes for rows @@ -134,7 +134,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; class SchXMLTableRowContext : public SvXMLImportContext @@ -153,7 +153,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; // classes for cells and their content @@ -177,9 +177,9 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTABLECONTEXT_HXX diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 1fd4f5c5c732..632df793811a 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -35,13 +35,13 @@ class SchXMLListItemContext : public SvXMLImportContext public: SchXMLListItemContext( SvXMLImport& rImport, const OUString& rLocalName, OUString& rText ); virtual ~SchXMLListItemContext(); - virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: OUString& m_rText; diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index e66d94e35178..db4508fcff9b 100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx @@ -34,13 +34,13 @@ public: const OUString& rLocalName, ::com::sun::star::uno::Sequence< OUString>& rTextList ); virtual ~SchXMLTextListContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; private: ::com::sun::star::uno::Sequence< OUString>& m_rTextList; diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx index 29175b669dd2..97d0c9b271e4 100644 --- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx +++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx @@ -27,8 +27,8 @@ public: explicit XMLAxisPositionPropertyHdl( bool bCrossingValue ); virtual ~XMLAxisPositionPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: bool m_bCrossingValue; diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index 9144e494cb3f..bc1feb065a5c 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -42,7 +42,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, - const XMLPropertyState& rProp ) SAL_OVERRIDE; + const XMLPropertyState& rProp ) override; private: }; diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx index 07f19a5f837f..d1090b810b2c 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx @@ -27,7 +27,7 @@ public: XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); virtual ~XMLErrorBarStylePropertyHdl(); - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx index a5e65185c7a0..3f02d57c93d4 100644 --- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx +++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx @@ -31,8 +31,8 @@ public: {} virtual ~XMLErrorIndicatorPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index aee92d636d4e..88ec8a8b110e 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -32,12 +32,12 @@ public: ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLLabelSeparatorContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; private: OUString m_aSeparator; diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index 718101cac17d..3eab26aa930b 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -36,12 +36,12 @@ public: ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLSymbolImageContext(); - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void EndElement() override; private: OUString msURL; diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx index 48a7cfecaa08..27382a26a2f4 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx @@ -27,8 +27,8 @@ public: explicit XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); virtual ~XMLSymbolTypePropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: bool m_bIsNamedSymbol; diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx index 62952d5500df..0300c1d6eafc 100644 --- a/xmloff/source/chart/XMLTextOrientationHdl.hxx +++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx @@ -29,10 +29,10 @@ public: virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, - const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLTEXTORIENTATIONHDL_HXX diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 7c212e56aab8..8c37b3a70b07 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -45,7 +45,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; }; SchXMLBodyContext_Impl::SchXMLBodyContext_Impl( diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 102d64e4fed1..36e0f2c449ec 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -54,7 +54,7 @@ public: virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; // context for flat file xml format @@ -72,7 +72,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList) SAL_OVERRIDE; + const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList) override; }; class SchXMLBodyContext : public SvXMLImportContext @@ -88,11 +88,11 @@ public: const OUString& rLName ); virtual ~SchXMLBodyContext(); - virtual void EndElement() SAL_OVERRIDE; + virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; + const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX |