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, 20 insertions, 20 deletions

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index bf1955218f86..d8b855f929b0 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -475,7 +475,7 @@ void ScXMLExport::SetSourceStream( const uno::Reference<io::XInputStream>& xNewS
             {
                 // add the loaded namespaces to the name space map
 
-                if ( !pSheetData->AddLoadedNamespaces( _GetNamespaceMap() ) )
+                if ( !pSheetData->AddLoadedNamespaces( GetNamespaceMap_() ) )
                 {
                     // conflicts in the namespaces - ignore the stream, save normally
                     xSourceStream.clear();
@@ -653,7 +653,7 @@ void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount)
     pSharedData->SortNoteShapes(); // sort twice, because some more shapes are added
 }
 
-void ScXMLExport::_ExportMeta()
+void ScXMLExport::ExportMeta_()
 {
     sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
     SCTAB nTableCount(0);
@@ -678,13 +678,13 @@ void ScXMLExport::_ExportMeta()
     }
 
     // export document properties
-    SvXMLExport::_ExportMeta();
+    SvXMLExport::ExportMeta_();
 }
 
-void ScXMLExport::_ExportFontDecls()
+void ScXMLExport::ExportFontDecls_()
 {
     GetFontAutoStylePool(); // make sure the pool is created
-    SvXMLExport::_ExportFontDecls();
+    SvXMLExport::ExportFontDecls_();
 }
 
 table::CellRangeAddress ScXMLExport::GetEndAddress(const uno::Reference<sheet::XSpreadsheet>& xTable, const sal_Int32 /* nTable */)
@@ -1805,7 +1805,7 @@ const ScXMLEditAttributeMap& ScXMLExport::GetEditAttributeMap() const
     return *mpEditAttrMap;
 }
 
-void ScXMLExport::_ExportContent()
+void ScXMLExport::ExportContent_()
 {
     nCurrentTable = 0;
     if (!pSharedData)
@@ -1898,7 +1898,7 @@ void ScXMLExport::_ExportContent()
     GetProgressBarHelper()->SetValue(GetProgressBarHelper()->GetReference());
 }
 
-void ScXMLExport::_ExportStyles( bool bUsed )
+void ScXMLExport::ExportStyles_( bool bUsed )
 {
     if (!pSharedData)
     {
@@ -1950,7 +1950,7 @@ void ScXMLExport::_ExportStyles( bool bUsed )
     aStylesExp->exportStyleFamily(OUString("CellStyles"),
         OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME), xCellStylesExportPropertySetMapper, false, XML_STYLE_FAMILY_TABLE_CELL);
 
-    SvXMLExport::_ExportStyles(bUsed);
+    SvXMLExport::ExportStyles_(bUsed);
 }
 
 void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& xProperties,
@@ -2192,7 +2192,7 @@ static uno::Any lcl_GetEnumerated( uno::Reference<container::XEnumerationAccess>
     return aRet;
 }
 
-void ScXMLExport::_ExportAutoStyles()
+void ScXMLExport::ExportAutoStyles_()
 {
     if (!GetModel().is())
         return;
@@ -2632,7 +2632,7 @@ void ScXMLExport::_ExportAutoStyles()
         GetTextParagraphExport()->exportTextAutoStyles();
 }
 
-void ScXMLExport::_ExportMasterStyles()
+void ScXMLExport::ExportMasterStyles_()
 {
     GetPageExport()->exportMasterStyles( true );
 }
@@ -4900,7 +4900,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn
                         // Add namespace declaration for unknown attributes if
                         // there aren't existing ones for the prefix used by the
                         // attibutes
-                        _GetNamespaceMap().Add( rPrefix,
+                        GetNamespaceMap_().Add( rPrefix,
                                                 pUnknown->GetNamespace( nIdx ) );
                     }
                     nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
@@ -4910,7 +4910,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn
     }
 
     // #i66550# needed for 'presentation:event-listener' element for URLs in shapes
-    _GetNamespaceMap().Add(
+    GetNamespaceMap_().Add(
         GetXMLToken( XML_NP_PRESENTATION ),
         GetXMLToken( XML_N_PRESENTATION ),
         XML_NAMESPACE_PRESENTATION );
@@ -4968,7 +4968,7 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
                     if (pDoc->GetSheetEvents(nTab))
                         bAnySheetEvents = true;
                 if (bAnySheetEvents)
-                    _GetNamespaceMap().Add(
+                    GetNamespaceMap_().Add(
                         GetXMLToken( XML_NP_OFFICE_EXT ),
                         GetXMLToken( XML_N_OFFICE_EXT ),
                         XML_NAMESPACE_OFFICE_EXT );
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 1b87b1d04408..46ed100b8822 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -132,13 +132,13 @@ class ScXMLExport : public SvXMLExport
     sal_Int32       GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
     void            CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount);
     void            CollectShapesAutoStyles(SCTAB nTableCount);
-    virtual void _ExportFontDecls() override;
-    virtual void _ExportStyles( bool bUsed ) override;
-    virtual void _ExportAutoStyles() override;
-    virtual void _ExportMasterStyles() 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 _ExportMeta() override;
+    virtual void ExportContent_() override;
+    virtual void ExportMeta_() override;
 
     void CollectInternalShape( css::uno::Reference< css::drawing::XShape > xShape );
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 68bde0937541..02bb1e17282b 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3353,7 +3353,7 @@ void ScXMLImport::ExtractFormulaNamespaceGrammar(
 {
     // parse the attribute value, extract namespace ID, literal namespace, and formula string
     rFormulaNmsp.clear();
-    sal_uInt16 nNsId = GetNamespaceMap()._GetKeyByAttrName( rAttrValue, nullptr, &rFormula, &rFormulaNmsp, false );
+    sal_uInt16 nNsId = GetNamespaceMap().GetKeyByAttrName_( rAttrValue, nullptr, &rFormula, &rFormulaNmsp, false );
 
     // check if we have an ODF formula namespace
     if( !bRestrictToExternalNmsp ) switch( nNsId )