summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter/xml
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 /reportdesign/source/filter/xml
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'reportdesign/source/filter/xml')
-rw-r--r--reportdesign/source/filter/xml/dbloader2.hxx8
-rw-r--r--reportdesign/source/filter/xml/xmlAutoStyle.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlCell.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx20
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx24
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx24
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReport.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlSection.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.hxx20
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlTable.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.hxx10
27 files changed, 89 insertions, 89 deletions
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index d5fcdab115a3..0864d3e23ad0 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -71,9 +71,9 @@ public:
explicit ORptTypeDetection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE;
- ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE;
+ OUString SAL_CALL getImplementationName() throw(std::exception ) override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override;
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override;
// static methods
static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException )
@@ -84,7 +84,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
- virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
};
}
#endif
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
index fe38992c655f..2919bed2f920 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
@@ -38,7 +38,7 @@ namespace rptxml
const SvXMLExportPropertyMapper& rPropExp,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
- ) const SAL_OVERRIDE;
+ ) const override;
OXMLAutoStylePoolP(const OXMLAutoStylePoolP&) = delete;
void operator =(const OXMLAutoStylePoolP&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index bec3281dfb84..d6a137738c17 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -51,10 +51,10 @@ namespace rptxml
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 EndElement() SAL_OVERRIDE;
+ virtual void Characters( const OUString& rChars ) override;
+ virtual void EndElement() override;
void setComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent);
void setContainsShape(bool _bContainsShapes);
diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx
index f67ed760e2b6..8f6e31817ea6 100644
--- a/reportdesign/source/filter/xml/xmlColumn.hxx
+++ b/reportdesign/source/filter/xml/xmlColumn.hxx
@@ -46,8 +46,8 @@ namespace rptxml
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;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
index fc77d154fb98..adc937912b8d 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx
@@ -41,7 +41,7 @@ namespace rptxml
// This method is called for all characters that are contained in the
// current element. The default is to ignore them.
- virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+ virtual void Characters( const OUString& rChars ) override;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 9220a5517721..cf67c7dea6c1 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -54,11 +54,11 @@ namespace rptxml
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;
- virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+ virtual void Characters( const OUString& rChars ) override;
/** adds value to property
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 42c816cdaf17..23aa6509d208 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -175,7 +175,7 @@ namespace rptxml
const SvXMLUnitConverter& /*rUnitConverter*/,
const SvXMLNamespaceMap& /*rNamespaceMap*/,
const ::std::vector< XMLPropertyState >* /*pProperties*/ = 0,
- sal_uInt32 /*nIdx*/ = 0 ) const SAL_OVERRIDE
+ sal_uInt32 /*nIdx*/ = 0 ) const override
{
// nothing to do here
}
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 190cbeb2f63c..5ddf94677ef4 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -167,17 +167,17 @@ private:
private:
ORptExport();
- virtual void SetBodyAttributes() SAL_OVERRIDE;
+ virtual void SetBodyAttributes() override;
protected:
- virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE;
- virtual void _ExportAutoStyles() SAL_OVERRIDE;
- virtual void _ExportContent() SAL_OVERRIDE;
- virtual void _ExportMasterStyles() SAL_OVERRIDE;
- virtual void _ExportFontDecls() SAL_OVERRIDE;
- virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) SAL_OVERRIDE;
- virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE;
- virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE;
+ virtual void _ExportStyles( bool bUsed ) override;
+ virtual void _ExportAutoStyles() override;
+ virtual void _ExportContent() override;
+ virtual void _ExportMasterStyles() override;
+ virtual void _ExportFontDecls() override;
+ virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) override;
+ virtual SvXMLAutoStylePoolP* CreateAutoStylePool() override;
+ virtual XMLShapeExport* CreateShapeExport() override;
virtual ~ORptExport(){};
public:
@@ -190,7 +190,7 @@ public:
create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
// XExporter
- virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; }
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index 83e8f40c39fe..62dd63b23e67 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -53,24 +53,24 @@ public:
private:
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName( ) 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) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
// ::com::sun::star::xml::sax::XDocumentHandler:
- virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
void exportTableRows();
private:
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 913445db3c5f..c18edf50de9d 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -59,8 +59,8 @@ public:
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Int16 nControl );
- virtual void InsertControlCharacter(sal_Int16 _nControl) SAL_OVERRIDE;
- virtual void InsertString(const OUString& _sString) SAL_OVERRIDE;
+ virtual void InsertControlCharacter(sal_Int16 _nControl) override;
+ virtual void InsertString(const OUString& _sString) override;
};
OXMLCharContent::OXMLCharContent(
SvXMLImport& rImport,
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 6e7f115de678..9e0827579184 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -38,7 +38,7 @@ namespace rptxml
protected:
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:
OXMLFixedContent(const OXMLFixedContent&) = delete;
OXMLFixedContent& operator =(const OXMLFixedContent&) = delete;
@@ -53,9 +53,9 @@ namespace rptxml
// This method is called for all characters that are contained in the
// current element. The default is to ignore them.
- virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+ virtual void Characters( const OUString& rChars ) override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
index 16806ec38ed2..127e7c519f59 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx
@@ -40,7 +40,7 @@ namespace rptxml
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition >& _xComponent
);
virtual ~OXMLFormatCondition();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx
index 9bd423fd07ec..0c78d4726cb2 100644
--- a/reportdesign/source/filter/xml/xmlFunction.hxx
+++ b/reportdesign/source/filter/xml/xmlFunction.hxx
@@ -50,7 +50,7 @@ namespace rptxml
);
virtual ~OXMLFunction();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx
index b6fa28b7222b..9ebc34cb5a1c 100644
--- a/reportdesign/source/filter/xml/xmlGroup.hxx
+++ b/reportdesign/source/filter/xml/xmlGroup.hxx
@@ -47,9 +47,9 @@ namespace rptxml
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;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index 31da0c0d2ebe..152a25cd2430 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -47,7 +47,7 @@ namespace rptxml
OPropertyHandlerFactory();
virtual ~OPropertyHandlerFactory();
- virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 _nType) const SAL_OVERRIDE;
+ virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 _nType) const override;
};
class OXMLHelper
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index d19292916cf1..72a06d069366 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -51,24 +51,24 @@ public:
private:
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName( ) 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) override;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
// ::com::sun::star::xml::sax::XDocumentHandler:
- virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startElement(const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endElement(const OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL characters(const OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException, std::exception) override;
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
private:
ImportDocumentHandler(ImportDocumentHandler &) = delete;
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx
index e32179a53e94..81e161ca1f06 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.hxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx
@@ -39,7 +39,7 @@ namespace rptxml
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;
};
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index ab88f2e7efae..0a945258ac71 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -43,11 +43,11 @@ namespace rptxml
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;
- virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) SAL_OVERRIDE;
+ virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) override;
private:
/** initializes our object's properties whose runtime (API) default is different from the file
diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx
index 5708f034da38..211c39366455 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.hxx
@@ -41,7 +41,7 @@ namespace rptxml
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;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index 5c7571e30ba7..c087dbd9015f 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -60,9 +60,9 @@ namespace rptxml
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;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 51ef60396902..00d296d209e5 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -46,7 +46,7 @@ namespace rptxml
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;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 1dad3e3f5869..b8a941cce8e3 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -61,7 +61,7 @@ public:
::std::vector< XMLPropertyState >& /*rProperties*/,
const OUString& /*rValue*/,
const SvXMLUnitConverter& /*rUnitConverter*/,
- const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const SAL_OVERRIDE
+ const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const override
{
// nothing to do here
return true;
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 44b058bdffef..b9ea2ab2a59b 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -53,7 +53,7 @@ namespace rptxml
virtual void SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
- const OUString& rValue ) SAL_OVERRIDE;
+ const OUString& rValue ) override;
public:
@@ -68,9 +68,9 @@ namespace rptxml
virtual void FillPropertySet(const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
+ ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
- virtual void SetDefaults() SAL_OVERRIDE;
+ virtual void SetDefaults() override;
void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue);
};
@@ -111,13 +111,13 @@ namespace rptxml
sal_uInt16 nFamily,
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 SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
sal_uInt16 nFamily, 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;
public:
@@ -129,15 +129,15 @@ namespace rptxml
const bool bAutoStyles );
virtual ~OReportStylesContext();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
- sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ sal_uInt16 nFamily ) const override;
virtual ::com::sun::star::uno::Reference <
::com::sun::star::container::XNameContainer >
- GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE;
- virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE;
- virtual sal_uInt16 GetFamily( const OUString& rFamily ) const SAL_OVERRIDE;
+ GetStylesContainer( sal_uInt16 nFamily ) const override;
+ virtual OUString GetServiceName( sal_uInt16 nFamily ) const override;
+ virtual sal_uInt16 GetFamily( const OUString& rFamily ) const override;
sal_Int32 GetIndex(const sal_Int16 nContextID);
};
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index 0a90a866837b..4ad2f58abfc8 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -41,7 +41,7 @@ namespace rptxml
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;
public:
OXMLSubDocument( ORptFilter& rImport
@@ -52,8 +52,8 @@ namespace rptxml
,OXMLCell* _pCellParent);
virtual ~OXMLSubDocument();
- virtual void EndElement() SAL_OVERRIDE;
- virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) SAL_OVERRIDE;
+ virtual void EndElement() override;
+ virtual void addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair) override;
};
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index bdec3a15bcaa..553d3e763d62 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -64,9 +64,9 @@ namespace rptxml
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;
inline void addHeight(sal_Int32 _nHeight) { m_aHeight.push_back( _nHeight ); }
inline void addWidth(sal_Int32 _nWidth) { m_aWidth.push_back( _nWidth ); }
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index addd71640539..b248addb81ef 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -95,7 +95,7 @@ public:
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~RptMLMasterStylesContext_Impl();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
TYPEINIT1( RptMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index a06a99064472..3f0716b91243 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -107,9 +107,9 @@ protected:
// SvXMLImport
virtual SvXMLImportContext *CreateContext( 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 XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE;
+ virtual XMLShapeImportHelper* CreateShapeImport() override;
virtual ~ORptFilter() throw();
public:
@@ -117,7 +117,7 @@ public:
ORptFilter( const Reference< XComponentContext >& _rxContext, SvXMLImportFlags nImportFlags = SvXMLImportFlags::ALL );
// XFilter
- virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException );
static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
@@ -128,9 +128,9 @@ public:
void FinishStyles();
virtual void SAL_CALL startDocument()
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL endDocument()
- throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
const SvXMLTokenMap& GetDocElemTokenMap() const;
const SvXMLTokenMap& GetReportElemTokenMap() const;