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>

8 files changed, 54 insertions, 54 deletions

diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index 6c1d368dd1fd..cbafb3024c82 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -38,9 +38,9 @@ public:
 
     virtual ~SwXMLBlockListExport() {}
     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 SwXMLTextBlockExport : public SvXMLExport
@@ -58,9 +58,9 @@ public:
     virtual ~SwXMLTextBlockExport() {}
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;}
     void exportDoc(const OUString & rText);
-    void _ExportAutoStyles() override {}
-    void _ExportMasterStyles () override {}
-    void _ExportContent() override {}
+    void ExportAutoStyles_() override {}
+    void ExportMasterStyles_ () override {}
+    void ExportContent_() override {}
 };
 
 #endif
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx
index 4ba7d8bdcf94..1c6aadeac4e6 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -34,7 +34,7 @@ SwXMLBlockListExport::SwXMLBlockListExport(
 :   SvXMLExport( rContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     rBlockList(rBlocks)
 {
-    _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 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum )
     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 ) );
     AddAttribute( XML_NAMESPACE_BLOCKLIST,
                   XML_LIST_NAME,
                   OUString (rBlockList.GetName()));
@@ -84,13 +84,13 @@ SwXMLTextBlockExport::SwXMLTextBlockExport(
 :   SvXMLExport( rContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     rBlockList(rBlocks)
 {
-    _GetNamespaceMap().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
+    GetNamespaceMap_().Add( GetXMLToken ( XML_NP_BLOCK_LIST ),
                             GetXMLToken ( XML_N_BLOCK_LIST ),
                             XML_NAMESPACE_BLOCKLIST );
-    _GetNamespaceMap().Add( GetXMLToken ( XML_NP_OFFICE ),
+    GetNamespaceMap_().Add( GetXMLToken ( XML_NP_OFFICE ),
                             GetXMLToken(XML_N_OFFICE_OOO),
                             XML_NAMESPACE_OFFICE );
-    _GetNamespaceMap().Add( GetXMLToken ( XML_NP_TEXT ),
+    GetNamespaceMap_().Add( GetXMLToken ( XML_NP_TEXT ),
                             GetXMLToken(XML_N_TEXT_OOO),
                             XML_NAMESPACE_TEXT );
 }
@@ -102,14 +102,14 @@ void SwXMLTextBlockExport::exportDoc(const OUString &rText)
     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 ) );
     AddAttribute ( XML_NAMESPACE_NONE,
-                   _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_TEXT ),
-                   _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_TEXT ) );
+                   GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_TEXT ),
+                   GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_TEXT ) );
     AddAttribute ( XML_NAMESPACE_NONE,
-                   _GetNamespaceMap().GetAttrNameByKey ( XML_NAMESPACE_OFFICE ),
-                   _GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_OFFICE ) );
+                   GetNamespaceMap_().GetAttrNameByKey ( XML_NAMESPACE_OFFICE ),
+                   GetNamespaceMap_().GetNameByKey ( XML_NAMESPACE_OFFICE ) );
     AddAttribute( XML_NAMESPACE_BLOCKLIST,
                   XML_LIST_NAME,
                   OUString (rBlockList.GetName()));
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index f8abc462efbb..cf4413f0910f 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -136,7 +136,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
     {
         if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
         {
-            _GetNamespaceMap().Add(
+            GetNamespaceMap_().Add(
                 GetXMLToken(XML_NP_OFFICE_EXT),
                 GetXMLToken(XML_N_OFFICE_EXT),
                 XML_NAMESPACE_OFFICE_EXT);
@@ -169,7 +169,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
                         sal_uInt16 nIdx = pUnknown->GetFirstNamespaceIndex();
                         while( USHRT_MAX != nIdx )
                         {
-                            _GetNamespaceMap().Add( pUnknown->GetPrefix( nIdx ),
+                            GetNamespaceMap_().Add( pUnknown->GetPrefix( nIdx ),
                                                 pUnknown->GetNamespace( nIdx ) );
                             nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
                         }
@@ -333,10 +333,10 @@ SwXMLExport::~SwXMLExport()
     _FinitItemExport();
 }
 
-void SwXMLExport::_ExportFontDecls()
+void SwXMLExport::ExportFontDecls_()
 {
     GetFontAutoStylePool(); // make sure the pool is created
-    SvXMLExport::_ExportFontDecls();
+    SvXMLExport::ExportFontDecls_();
 }
 
 #define NUM_EXPORTED_VIEW_SETTINGS 11
@@ -439,7 +439,7 @@ void SwXMLExport::SetBodyAttributes()
     }
 }
 
-void SwXMLExport::_ExportContent()
+void SwXMLExport::ExportContent_()
 {
     // export forms
     Reference<XDrawPageSupplier> xDrawPageSupplier(GetModel(), UNO_QUERY);
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index b6d0da46c7e4..baed84b5a28b 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -86,13 +86,13 @@ class SwXMLExport : public SvXMLExport
                            SwXMLTableInfo_Impl& rTableInfo,
                            sal_uInt32 nHeaderRows = 0 );
 
-    virtual void _ExportMeta() override;
-    virtual void _ExportFontDecls() override;
-    virtual void _ExportStyles( bool bUsed ) override;
-    virtual void _ExportAutoStyles() override;
-    virtual void _ExportMasterStyles() 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 ExportContent_() override;
     virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
     virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
     virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override;
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 9d8ef8ab0be3..94340c2ca329 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -160,9 +160,9 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami
     }
 }
 
-void SwXMLExport::_ExportStyles( bool bUsed )
+void SwXMLExport::ExportStyles_( bool bUsed )
 {
-    SvXMLExport::_ExportStyles( bUsed );
+    SvXMLExport::ExportStyles_( bUsed );
 
     // drawing defaults
     GetShapeExport()->ExportGraphicDefaults();
@@ -174,7 +174,7 @@ void SwXMLExport::_ExportStyles( bool bUsed )
     GetPageExport()->exportDefaultStyle();
 }
 
-void SwXMLExport::_ExportAutoStyles()
+void SwXMLExport::ExportAutoStyles_()
 {
     // The order in which styles are collected *MUST* be the same as
     // the order in which they are exported. Otherwise, caching will
@@ -241,7 +241,7 @@ XMLPageExport* SwXMLExport::CreatePageExport()
     return new XMLTextMasterPageExport( *this );
 }
 
-void SwXMLExport::_ExportMasterStyles()
+void SwXMLExport::ExportMasterStyles_()
 {
     // export master styles
     GetPageExport()->exportMasterStyles( false );
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index b79dcc5a2764..75ba494e69e3 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -156,9 +156,9 @@ void SwXMLImport::SetStatistics(
     pProgress->SetValue( 0 );
 }
 
-void SwXMLExport::_ExportMeta()
+void SwXMLExport::ExportMeta_()
 {
-    SvXMLExport::_ExportMeta();
+    SvXMLExport::ExportMeta_();
 
     if( !IsBlockMode() )
     {
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 18aca7065802..fcf472f2c6da 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -495,7 +495,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
             {
                 OUString sTmp;
                 const sal_uInt16 nPrefix2 = GetImport().GetNamespaceMap().
-                        _GetKeyByAttrName( rValue, &sTmp );
+                        GetKeyByAttrName_( rValue, &sTmp );
                 sFormula = XML_NAMESPACE_OOOW == nPrefix2 ? sTmp : rValue;
             }
             break;
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index c620f5bc1ef0..e49d4d58118d 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -177,21 +177,21 @@ public:
         : SvXMLExport(xContext, "sw::StoredChapterNumberingExport", rFileName,
             util::MeasureUnit::CM, xHandler)
     {
-        _GetNamespaceMap().Add(GetXMLToken(XML_NP_OFFICE),
+        GetNamespaceMap_().Add(GetXMLToken(XML_NP_OFFICE),
                                GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE);
-        _GetNamespaceMap().Add(GetXMLToken(XML_NP_TEXT),
+        GetNamespaceMap_().Add(GetXMLToken(XML_NP_TEXT),
                                GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT);
-        _GetNamespaceMap().Add(GetXMLToken(XML_NP_STYLE),
+        GetNamespaceMap_().Add(GetXMLToken(XML_NP_STYLE),
                                GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE);
-        _GetNamespaceMap().Add(GetXMLToken(XML_NP_FO),
+        GetNamespaceMap_().Add(GetXMLToken(XML_NP_FO),
                                GetXMLToken(XML_N_FO), XML_NAMESPACE_FO);
-        _GetNamespaceMap().Add(GetXMLToken(XML_NP_SVG),
+        GetNamespaceMap_().Add(GetXMLToken(XML_NP_SVG),
                                GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG);
     }
 
-    virtual void _ExportAutoStyles() override {}
-    virtual void _ExportMasterStyles() override {}
-    virtual void _ExportContent() override {}
+    virtual void ExportAutoStyles_() override {}
+    virtual void ExportMasterStyles_() override {}
+    virtual void ExportContent_() override {}
 
     void ExportRule(SvxXMLNumRuleExport & rExport,
             uno::Reference<container::XIndexReplace> const& xRule)
@@ -218,20 +218,20 @@ public:
         GetDocHandler()->startDocument();
 
         AddAttribute(XML_NAMESPACE_NONE,
-                      _GetNamespaceMap().GetAttrNameByKey(XML_NAMESPACE_OFFICE),
-                      _GetNamespaceMap().GetNameByKey(XML_NAMESPACE_OFFICE));
+                      GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_OFFICE),
+                      GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_OFFICE));
         AddAttribute(XML_NAMESPACE_NONE,
-                      _GetNamespaceMap().GetAttrNameByKey (XML_NAMESPACE_TEXT),
-                      _GetNamespaceMap().GetNameByKey(XML_NAMESPACE_TEXT));
+                      GetNamespaceMap_().GetAttrNameByKey (XML_NAMESPACE_TEXT),
+                      GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_TEXT));
         AddAttribute(XML_NAMESPACE_NONE,
-                      _GetNamespaceMap().GetAttrNameByKey(XML_NAMESPACE_STYLE),
-                      _GetNamespaceMap().GetNameByKey(XML_NAMESPACE_STYLE));
+                      GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_STYLE),
+                      GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_STYLE));
         AddAttribute(XML_NAMESPACE_NONE,
-                      _GetNamespaceMap().GetAttrNameByKey(XML_NAMESPACE_FO),
-                      _GetNamespaceMap().GetNameByKey(XML_NAMESPACE_FO));
+                      GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_FO),
+                      GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_FO));
         AddAttribute(XML_NAMESPACE_NONE,
-                      _GetNamespaceMap().GetAttrNameByKey(XML_NAMESPACE_SVG),
-                      _GetNamespaceMap().GetNameByKey(XML_NAMESPACE_SVG));
+                      GetNamespaceMap_().GetAttrNameByKey(XML_NAMESPACE_SVG),
+                      GetNamespaceMap_().GetNameByKey(XML_NAMESPACE_SVG));
 
         {
             // let's just have a office:styles as a dummy root