Avoid reserved identifiers

Change-Id: I759939aa74570be63f5d41814c22aad1851d65c4
Reviewed-on: https://gerrit.libreoffice.org/23587
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 18 insertions, 18 deletions

diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 07189ce3f138..a89a3742f006 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -34,7 +34,7 @@ SvXMLAutoCorrectExport::SvXMLAutoCorrectExport(
 :   SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     pAutocorr_List( pNewAutocorr_List )
 {
-    _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST),
+    GetNamespaceMap_().Add( GetXMLToken ( XML_NP_BLOCK_LIST),
                             GetXMLToken ( XML_N_BLOCK_LIST ),
                             XML_NAMESPACE_BLOCKLIST );
 }
@@ -46,8 +46,8 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/)
     addChaffWhenEncryptedStorage();
 
     AddAttribute ( XML_NAMESPACE_NONE,
-                   _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
-                   _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
+                   GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
+                   GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
     {
         SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true);
         SvxAutocorrWordList::Content aContent = pAutocorr_List->getSortedContent();
@@ -78,7 +78,7 @@ SvXMLExceptionListExport::SvXMLExceptionListExport(
 :   SvXMLExport( xContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     rList( rNewList )
 {
-    _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
+    GetNamespaceMap_().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
                             GetXMLToken ( XML_N_BLOCK_LIST ),
                             XML_NAMESPACE_BLOCKLIST );
 }
@@ -90,8 +90,8 @@ sal_uInt32 SvXMLExceptionListExport::exportDoc(enum XMLTokenEnum /*eClass*/)
     addChaffWhenEncryptedStorage();
 
     AddAttribute ( XML_NAMESPACE_NONE,
-                   _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
-                   _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
+                   GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_BLOCKLIST ),
+                   GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_BLOCKLIST ) );
     {
         SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true);
         sal_uInt16 nBlocks= rList.size();
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index 548b7c9a9faf..604fb7e7dcad 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -38,9 +38,9 @@ public:
 
     virtual ~SvXMLAutoCorrectExport() {}
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override;
-    void _ExportAutoStyles() override {}
-    void _ExportMasterStyles () override {}
-    void _ExportContent() override {}
+    void ExportAutoStyles_() override {}
+    void ExportMasterStyles_ () override {}
+    void ExportContent_() override {}
 };
 
 class SvStringsISortDtor;
@@ -58,9 +58,9 @@ public:
 
     virtual ~SvXMLExceptionListExport() {}
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override;
-    void _ExportAutoStyles() override {}
-    void _ExportMasterStyles () override {}
-    void _ExportContent() override {}
+    void ExportAutoStyles_() override {}
+    void ExportMasterStyles_ () override {}
+    void ExportContent_() override {}
 };
 #endif
 
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 08312ac708b6..e7fb6702f5c8 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -324,9 +324,9 @@ public:
     virtual ~SvxXMLTextExportComponent();
 
     // methods without content:
-    virtual void _ExportAutoStyles() override;
-    virtual void _ExportMasterStyles() override;
-    virtual void _ExportContent() override;
+    virtual void ExportAutoStyles_() override;
+    virtual void ExportMasterStyles_() override;
+    virtual void ExportContent_() override;
 
 private:
     css::uno::Reference< css::text::XText > mxText;
@@ -413,7 +413,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
 }
 
 // methods without content:
-void SvxXMLTextExportComponent::_ExportAutoStyles()
+void SvxXMLTextExportComponent::ExportAutoStyles_()
 {
     rtl::Reference< XMLTextParagraphExport > xTextExport( GetTextParagraphExport() );
 
@@ -421,13 +421,13 @@ void SvxXMLTextExportComponent::_ExportAutoStyles()
     xTextExport->exportTextAutoStyles();
 }
 
-void SvxXMLTextExportComponent::_ExportContent()
+void SvxXMLTextExportComponent::ExportContent_()
 {
     rtl::Reference< XMLTextParagraphExport > xTextExport( GetTextParagraphExport() );
 
     xTextExport->exportText( mxText );
 }
 
-void SvxXMLTextExportComponent::_ExportMasterStyles() {}
+void SvxXMLTextExportComponent::ExportMasterStyles_() {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */