summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml/xmlfmt.cxx
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 /sw/source/filter/xml/xmlfmt.cxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/filter/xml/xmlfmt.cxx')
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 51f0869b020f..e4ecd3e4ef41 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -263,7 +263,7 @@ class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
protected:
- virtual uno::Reference < style::XStyle > Create() SAL_OVERRIDE;
+ virtual uno::Reference < style::XStyle > Create() override;
public:
@@ -279,9 +279,9 @@ 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;
- virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
+ virtual void Finish( bool bOverwrite ) override;
};
TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext );
@@ -437,7 +437,7 @@ protected:
virtual void SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
- const OUString& rValue ) SAL_OVERRIDE;
+ const OUString& rValue ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
@@ -453,12 +453,12 @@ public:
sal_uInt16 nFamily);
virtual ~SwXMLItemSetStyleContext_Impl();
- virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
+ virtual void CreateAndInsert( bool bOverwrite ) override;
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;
// The item set may be empty!
SfxItemSet *GetItemSet() { return pItemSet; }
@@ -715,17 +715,17 @@ protected:
virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
// HACK
virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
- sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ sal_uInt16 nFamily ) const override;
virtual uno::Reference < container::XNameContainer >
- GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE;
- virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ GetStylesContainer( sal_uInt16 nFamily ) const override;
+ virtual OUString GetServiceName( sal_uInt16 nFamily ) const override;
// HACK
public:
@@ -739,9 +739,9 @@ public:
bool bAuto );
virtual ~SwXMLStylesContext_Impl();
- virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext );
@@ -904,7 +904,7 @@ void SwXMLStylesContext_Impl::EndElement()
class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
{
protected:
- virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE;
+ virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
const SwXMLImport& GetSwImport() const
@@ -919,7 +919,7 @@ public:
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~SwXMLMasterStylesContext_Impl();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext );