summaryrefslogtreecommitdiff
path: root/sw/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 /sw/source/filter/xml
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx34
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx30
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimp.hxx26
-rw-r--r--sw/source/filter/xml/xmlitem.hxx2
-rw-r--r--sw/source/filter/xml/xmliteme.cxx4
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx10
-rw-r--r--sw/source/filter/xml/xmltbli.cxx14
-rw-r--r--sw/source/filter/xml/xmltbli.hxx4
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.hxx30
15 files changed, 93 insertions, 93 deletions
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index c24f8d3471e5..eedd9d83ff76 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -43,15 +43,15 @@ class SwXMLWriter : public StgWriter
using StgWriter::Write;
protected:
- virtual sal_uLong WriteStorage() SAL_OVERRIDE;
- virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) SAL_OVERRIDE;
+ virtual sal_uLong WriteStorage() override;
+ virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) override;
public:
SwXMLWriter( const OUString& rBaseURL );
virtual ~SwXMLWriter();
- virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) SAL_OVERRIDE;
+ virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ) override;
private:
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index ddf1140fff67..3edbb4fe07e6 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -69,9 +69,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;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
const SvxBrushItem& GetItem() const { return *pItem; }
};
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 5deea5bd7d07..165aa1e55f87 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -87,16 +87,16 @@ class SwXMLExport : public SvXMLExport
SwXMLTableInfo_Impl& rTableInfo,
sal_uInt32 nHeaderRows = 0 );
- virtual void _ExportMeta() SAL_OVERRIDE;
- virtual void _ExportFontDecls() SAL_OVERRIDE;
- virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE;
- virtual void _ExportAutoStyles() SAL_OVERRIDE;
- virtual void _ExportMasterStyles() SAL_OVERRIDE;
- virtual void SetBodyAttributes() SAL_OVERRIDE;
- virtual void _ExportContent() SAL_OVERRIDE;
- virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE;
- virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) SAL_OVERRIDE;
- virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) SAL_OVERRIDE;
+ virtual void _ExportMeta() override;
+ virtual void _ExportFontDecls() override;
+ virtual void _ExportStyles( bool bUsed ) override;
+ virtual void _ExportAutoStyles() override;
+ virtual void _ExportMasterStyles() override;
+ virtual void SetBodyAttributes() override;
+ virtual void _ExportContent() override;
+ virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+ virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+ virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override;
// string constants for table cell export
const OUString sNumberFormat;
@@ -108,11 +108,11 @@ private:
void DeleteTableLines();
protected:
- virtual XMLTextParagraphExport* CreateTextParagraphExport() SAL_OVERRIDE;
- virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE;
- virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE;
- virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE;
- virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE;
+ virtual XMLTextParagraphExport* CreateTextParagraphExport() override;
+ virtual SvXMLAutoStylePoolP* CreateAutoStylePool() override;
+ virtual XMLPageExport* CreatePageExport() override;
+ virtual XMLShapeExport* CreateShapeExport() override;
+ virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override;
public:
SwXMLExport(
@@ -121,7 +121,7 @@ public:
virtual ~SwXMLExport();
- virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE;
+ virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
@@ -136,7 +136,7 @@ public:
// XUnoTunnel
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
const SwDoc* getDoc() const;
SwDoc* getDoc();
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 );
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index e03657095d1b..b5df169bdfef 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -262,7 +262,7 @@ protected:
const SvXMLExportPropertyMapper& rPropExp
, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
- ) const SAL_OVERRIDE;
+ ) const override;
public:
explicit SwXMLAutoStylePoolP( SvXMLExport& rExport );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index b7e771a61b0b..99d4c7a86937 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -130,7 +130,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
@@ -175,7 +175,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport,
@@ -266,7 +266,7 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl(
@@ -327,7 +327,7 @@ public:
TYPEINFO_OVERRIDE();
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl(
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index a95134420d72..1309e1f3fc46 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -100,11 +100,11 @@ protected:
virtual SvXMLImportContext *CreateContext( 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;
- virtual XMLTextImportHelper* CreateTextImport() SAL_OVERRIDE;
+ virtual XMLTextImportHelper* CreateTextImport() override;
- virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE;
+ virtual XMLShapeImportHelper* CreateShapeImport() override;
public:
SwXMLImport(
@@ -117,16 +117,16 @@ public:
virtual void SAL_CALL startDocument()
throw (::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException,
- std::exception) SAL_OVERRIDE;
+ 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;
// XUnoTunnel
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
// XInitialization
- 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 InsertStyles( bool bAuto );
void FinishStyles();
@@ -176,21 +176,21 @@ public:
OUString *pParent=0 ) const;
virtual void SetStatistics(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE;
- virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) SAL_OVERRIDE;
- virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override;
+ virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
+ virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override;
virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE;
+ const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) override;
// initialize XForms
- virtual void initXForms() SAL_OVERRIDE;
+ virtual void initXForms() override;
// get the document properties, but only if they actually need importing
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>
GetDocumentProperties() const;
- virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE;
+ virtual void NotifyEmbeddedFontRead() override;
const SwDoc* getDoc() const;
SwDoc* getDoc();
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index c5f7651c347d..8984fe6184e6 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -50,7 +50,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;
// This method is called from this instance implementation of
// CreateChildContext if the element matches an entry in the
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 536dc949e43e..2b28b352f7df 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -75,7 +75,7 @@ public:
const SfxPoolItem& rItem,
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap,
- const SfxItemSet *pSet = NULL ) const SAL_OVERRIDE;
+ const SfxItemSet *pSet = NULL ) const override;
virtual void handleElementItem(
SvXMLExport& rExport,
@@ -83,7 +83,7 @@ public:
const SfxPoolItem& rItem,
const SvXMLUnitConverter& rUnitConverter,
const SfxItemSet& rSet,
- SvXmlExportFlags nFlags ) const SAL_OVERRIDE;
+ SvXmlExportFlags nFlags ) const override;
inline void SetAbsWidth( sal_uInt32 nAbs );
};
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index ec7f0351f054..ddecdccc0c35 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -70,19 +70,19 @@ public:
SfxItemSet& rSet,
const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter,
- const SvXMLNamespaceMap& rNamespaceMap ) SAL_OVERRIDE;
+ const SvXMLNamespaceMap& rNamespaceMap ) override;
virtual bool
handleNoItem(SvXMLItemMapEntry const& rEntry,
SfxItemSet & rSet,
OUString const& rValue,
SvXMLUnitConverter const& rUnitConverter,
- SvXMLNamespaceMap const& rNamespaceMap) SAL_OVERRIDE;
+ SvXMLNamespaceMap const& rNamespaceMap) override;
virtual void finished(SfxItemSet & rSet,
- SvXMLUnitConverter const& rUnitConverter) const SAL_OVERRIDE;
+ SvXMLUnitConverter const& rUnitConverter) const override;
- virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) SAL_OVERRIDE;
+ virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) override;
private:
void Reset();
@@ -261,7 +261,7 @@ public:
const ::uno::Reference< xml::sax::XAttributeList > & xAttrList,
SfxItemSet& rItemSet,
const SvXMLItemMapEntry& rEntry,
- const SvXMLUnitConverter& rUnitConv ) SAL_OVERRIDE;
+ const SvXMLUnitConverter& rUnitConv ) override;
};
SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl(
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 93d12a5811d7..189aa79645cc 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -430,8 +430,8 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- virtual void EndElement() SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
+ virtual void EndElement() override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -836,7 +836,7 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -893,9 +893,9 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -1014,7 +1014,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
};
@@ -1074,7 +1074,7 @@ public:
virtual ~SwXMLDDETableContext_Impl();
virtual void StartElement(
- const Reference<xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+ const Reference<xml::sax::XAttributeList> & xAttrList) override;
OUString& GetConnectionName() { return sConnectionName; }
OUString& GetDDEApplication() { return sDDEApplication; }
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 7c743bc74527..f9c781f3d885 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -146,7 +146,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;
+ ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
@@ -183,7 +183,7 @@ public:
const SwStartNode *InsertTableSection(const SwStartNode *pPrevSttNd = 0,
OUString const* pStringValueStyleName = 0);
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; }
};
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index f5e1e35561a9..debc85c5fd6e 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -36,11 +36,11 @@ public:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
- const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ const Reference< xml::sax::XAttributeList > & xAttrList ) override;
// The body element's text:global attribute can be ignored, because
// we must have the correct object shell already.
- virtual void EndElement() SAL_OVERRIDE;
+ virtual void EndElement() override;
};
SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport,
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 0131f1d414b1..d64d7b14f72a 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -48,21 +48,21 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport
protected:
virtual void exportStyleContent(
const ::com::sun::star::uno::Reference<
- ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE;
+ ::com::sun::star::style::XStyle > & rStyle ) override;
virtual void _collectTextEmbeddedAutoStyles(
const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
+ ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
virtual void _exportTextEmbedded(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) SAL_OVERRIDE;
+ ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) override;
virtual void exportTable(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- bool bAutoStyles, bool bProgress ) SAL_OVERRIDE;
+ bool bAutoStyles, bool bProgress ) override;
public:
SwXMLTextParagraphExport(
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 23e4051eab23..f753c44f33d8 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -33,7 +33,7 @@ protected:
SvXMLImport& rImport,
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:
SwXMLTextImportHelper(
@@ -53,14 +53,14 @@ public:
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertOOoLink( SvXMLImport& rImport,
const OUString& rHRef,
const OUString& rStyleName,
const OUString& rTableName,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertApplet(
@@ -68,14 +68,14 @@ public:
const OUString &rCode,
bool bMayScript,
const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
createAndInsertPlugin(
const OUString &rMimeType,
const OUString& rHRef,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
@@ -83,13 +83,13 @@ public:
const OUString &rName,
const OUString &rHRef,
const OUString &rStyleName,
- sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
+ sal_Int32 nWidth, sal_Int32 nHeight ) override;
virtual void endAppletOrPlugin(
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE;
+ ::std::map < const OUString, OUString > &rParamMap) override;
- virtual bool IsInHeaderFooter() const SAL_OVERRIDE;
+ virtual bool IsInHeaderFooter() const override;
// redlining helper methods
// (here is the real implementation)
@@ -99,21 +99,21 @@ public:
const OUString& rAuthor, /// name of the author
const OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
- bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph
+ bool bMergeLastPara) override; /// merge last paragraph
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> RedlineCreateText(
::com::sun::star::uno::Reference< /// needed to get the document
::com::sun::star::text::XTextCursor> & rOldCursor,
- const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call
+ const OUString& rId) override; /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
const OUString& rId, /// ID used to RedlineAdd() call
bool bStart, /// start or end Cursor
- bool bIsOutsideOfParagraph) SAL_OVERRIDE;
- virtual void RedlineAdjustStartNodeCursor( bool bStart) SAL_OVERRIDE;
- virtual void SetShowChanges( bool bShowChanges ) SAL_OVERRIDE;
- virtual void SetRecordChanges( bool bRecordChanges ) SAL_OVERRIDE;
+ bool bIsOutsideOfParagraph) override;
+ virtual void RedlineAdjustStartNodeCursor( bool bStart) override;
+ virtual void SetShowChanges( bool bShowChanges ) override;
+ virtual void SetRecordChanges( bool bRecordChanges ) override;
virtual void SetChangesProtectionKey(
- const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE;
+ const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) override;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX