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>

27 files changed, 206 insertions, 206 deletions

diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index 58a3a059bf3d..fc7b6a1a6225 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -45,12 +45,12 @@ protected:
     virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     // override
-    virtual void _ExportMeta() override;
+    virtual void ExportMeta_() override;
 
     // 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;
 };
 
 #endif
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index f61879bffa85..d9f7907515e2 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -44,10 +44,10 @@ private:
 protected:
     virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
 
-    virtual void _ExportStyles( bool bUsed ) override;
-    virtual void _ExportAutoStyles() override;
-    virtual void _ExportMasterStyles() override;
-    virtual void _ExportContent() override;
+    virtual void ExportStyles_( bool bUsed ) override;
+    virtual void ExportAutoStyles_() override;
+    virtual void ExportMasterStyles_() override;
+    virtual void ExportContent_() override;
 
 public:
     SchXMLExport(
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index bf4275229ff7..a6bcd9ab8a46 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -45,9 +45,9 @@ public:
     virtual     ~XMLVersionListExport() {}
 
     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 XMLVersionListImport : public SvXMLImport
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 694dd6f38f6b..064f8d960cff 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3526,7 +3526,7 @@ SchXMLExport::SchXMLExport(
     maExportHelper( new SchXMLExportHelper(*this, *maAutoStylePool.get()) )
 {
     if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
-        _GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
+        GetNamespaceMap_().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
 }
 
 SchXMLExport::~SchXMLExport()
@@ -3549,18 +3549,18 @@ sal_uInt32 SchXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
     return SvXMLExport::exportDoc( eClass );
 }
 
-void SchXMLExport::_ExportStyles( bool bUsed )
+void SchXMLExport::ExportStyles_( bool bUsed )
 {
-    SvXMLExport::_ExportStyles( bUsed );
+    SvXMLExport::ExportStyles_( bUsed );
 }
 
-void SchXMLExport::_ExportMasterStyles()
+void SchXMLExport::ExportMasterStyles_()
 {
     // not available in chart
     SAL_INFO("xmloff.chart", "Master Style Export requested. Not available for Chart" );
 }
 
-void SchXMLExport::_ExportAutoStyles()
+void SchXMLExport::ExportAutoStyles_()
 {
     // there are no styles that require their own autostyles
     if( getExportFlags() & SvXMLExportFlags::CONTENT )
@@ -3578,7 +3578,7 @@ void SchXMLExport::_ExportAutoStyles()
     }
 }
 
-void SchXMLExport::_ExportContent()
+void SchXMLExport::ExportContent_()
 {
     Reference< chart::XChartDocument > xChartDoc( GetModel(), uno::UNO_QUERY );
     if( xChartDoc.is())
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index 7969b171e471..d51d71e346ec 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -125,7 +125,7 @@ void DomBuilderContext::StartElement(
         // namespace handling: determine namespace & namespace key
         OUString sNamespace;
         sal_uInt16 nNamespaceKey =
-            GetImport().GetNamespaceMap()._GetKeyByAttrName(
+            GetImport().GetNamespaceMap().GetKeyByAttrName_(
                 rName, nullptr, nullptr, &sNamespace );
 
         // create attribute node and set value
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 96d784deb850..7462a990a7ad 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -175,7 +175,7 @@ RDFaReader::ReadCURIE(OUString const & i_rCURIE) const
         OUString Prefix;
         OUString LocalName;
         OUString Namespace;
-        sal_uInt16 nKey( GetImport().GetNamespaceMap()._GetKeyByAttrName(
+        sal_uInt16 nKey( GetImport().GetNamespaceMap().GetKeyByAttrName_(
             i_rCURIE, &Prefix, &LocalName, &Namespace) );
         if ( Prefix == "_" )
         {
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index f4712a9f84cf..f75d65f3c26e 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -72,7 +72,7 @@ bool SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const
     return aNameHash == rCmp.aNameHash;
 }
 
-sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
+sal_uInt16 SvXMLNamespaceMap::Add_( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
 {
     if( XML_NAMESPACE_UNKNOWN == nKey )
     {
@@ -110,7 +110,7 @@ sal_uInt16 SvXMLNamespaceMap::Add( const OUString& rPrefix, const OUString& rNam
 #endif
 
     if ( aNameHash.find ( rPrefix ) == aNameHash.end() )
-        nKey = _Add( rPrefix, rName, nKey );
+        nKey = Add_( rPrefix, rName, nKey );
 
     return nKey;
 }
@@ -130,7 +130,7 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString& rPrefix, const OUStrin
     {
         NameSpaceHash::const_iterator aIter = aNameHash.find( rPrefix );
         if( aIter == aNameHash.end() || (*aIter).second->sName != rName )
-            nKey = _Add( rPrefix, rName, nKey );
+            nKey = Add_( rPrefix, rName, nKey );
     }
 
     return nKey;
@@ -269,14 +269,14 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
     }
 }
 
-sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName(
+sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_(
                             const OUString& rAttrName,
                             OUString *pLocalName) const
 {
-    return _GetKeyByAttrName( rAttrName, nullptr, pLocalName, nullptr, false/*bCache*/ );
+    return GetKeyByAttrName_( rAttrName, nullptr, pLocalName, nullptr, false/*bCache*/ );
 }
 
-sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
+sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName,
                                             OUString *pPrefix,
                                             OUString *pLocalName,
                                             OUString *pNamespace,
@@ -388,7 +388,7 @@ void SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix
     assert(XML_NAMESPACE_NONE != nKey);
     if( XML_NAMESPACE_NONE != nKey && ! ( aNameHash.count ( rPrefix ) ) )
     {
-        _Add( rPrefix, rName, nKey );
+        Add_( rPrefix, rName, nKey );
     }
 }
 
@@ -425,7 +425,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName(
                             OUString *pLocalName,
                             sal_uInt16 /*nIdxGuess*/) const
 {
-    return _GetKeyByAttrName( rAttrName, nullptr, pLocalName );
+    return GetKeyByAttrName_( rAttrName, nullptr, pLocalName );
 }
 
 sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
@@ -434,7 +434,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
                                             OUString *pNamespace,
                                             sal_uInt16 /*nIdxGuess*/ ) const
 {
-    return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace );
+    return GetKeyByAttrName_ ( rAttrName, pPrefix, pLocalName, pNamespace );
 }
 
 bool SvXMLNamespaceMap::NormalizeURI( OUString& rName )
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 531018522e90..dacacdbb7251 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -301,7 +301,7 @@ void SvXMLExport::SetDocHandler( const uno::Reference< xml::sax::XDocumentHandle
     mxExtHandler.set( mxHandler, UNO_QUERY );
 }
 
-void SvXMLExport::_InitCtor()
+void SvXMLExport::InitCtor_()
 {
     // note: it is not necessary to add XML_NP_XML (it is declared implicitly)
     if( getExportFlags() & ~SvXMLExportFlags::OASIS )
@@ -411,7 +411,7 @@ void SvXMLExport::_InitCtor()
     }
 
     // Determine model type (#i51726#)
-    _DetermineModelType();
+    DetermineModelType_();
 
     // cl: but only if we do export to current oasis format, old openoffice format *must* always be compatible
     if( getExportFlags() & SvXMLExportFlags::OASIS )
@@ -423,7 +423,7 @@ void SvXMLExport::_InitCtor()
 }
 
 // Shapes in Writer cannot be named via context menu (#i51726#)
-void SvXMLExport::_DetermineModelType()
+void SvXMLExport::DetermineModelType_()
 {
     meModelType = SvtModuleOptions::EFactory::UNKNOWN_FACTORY;
 
@@ -456,7 +456,7 @@ SvXMLExport::SvXMLExport(
     mbSaveLinkedSections(true)
 {
     SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" );
-    _InitCtor();
+    InitCtor_();
 }
 
 SvXMLExport::SvXMLExport(
@@ -487,7 +487,7 @@ SvXMLExport::SvXMLExport(
 {
     SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" );
     mpImpl->SetSchemeOf( msOrigFileName );
-    _InitCtor();
+    InitCtor_();
 
     if (mxNumberFormatsSupplier.is())
         mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
@@ -525,7 +525,7 @@ SvXMLExport::SvXMLExport(
 {
     SAL_WARN_IF(!xContext.is(), "xmloff.core", "got no service manager" );
     mpImpl->SetSchemeOf( msOrigFileName );
-    _InitCtor();
+    InitCtor_();
 
     if (mxNumberFormatsSupplier.is())
         mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
@@ -662,7 +662,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
                     for( nIndex = 0; nIndex < nCount; ++nIndex, ++pPrefix )
                     {
                         if( xNamespaceMap->getByName( *pPrefix ) >>= aURL )
-                            _GetNamespaceMap().Add( *pPrefix, aURL );
+                            GetNamespaceMap_().Add( *pPrefix, aURL );
                     }
                 }
             }
@@ -673,7 +673,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
     }
 
     // Determine model type (#i51726#)
-    _DetermineModelType();
+    DetermineModelType_();
 }
 
 // XInitialize
@@ -903,13 +903,13 @@ SvXMLExport::EnsureNamespace(OUString const & i_rNamespace)
 {
     OUString const aPreferredPrefix("gen");
     OUString sPrefix;
-    sal_uInt16 nKey( _GetNamespaceMap().GetKeyByName( i_rNamespace ) );
+    sal_uInt16 nKey( GetNamespaceMap_().GetKeyByName( i_rNamespace ) );
     if( XML_NAMESPACE_UNKNOWN == nKey )
     {
         // There is no prefix for the namespace, so
         // we have to generate one and have to add it.
         sPrefix = aPreferredPrefix;
-        nKey = _GetNamespaceMap().GetKeyByPrefix( sPrefix );
+        nKey = GetNamespaceMap_().GetKeyByPrefix( sPrefix );
         sal_Int32 n( 0 );
         OUStringBuffer buf;
         while( nKey != USHRT_MAX )
@@ -917,7 +917,7 @@ SvXMLExport::EnsureNamespace(OUString const & i_rNamespace)
             buf.append( aPreferredPrefix );
             buf.append( ++n );
             sPrefix = buf.makeStringAndClear();
-            nKey = _GetNamespaceMap().GetKeyByPrefix( sPrefix );
+            nKey = GetNamespaceMap_().GetKeyByPrefix( sPrefix );
         }
 
         if (mpImpl->mNamespaceMaps.empty()
@@ -939,7 +939,7 @@ SvXMLExport::EnsureNamespace(OUString const & i_rNamespace)
     else
     {
         // If there is a prefix for the namespace, reuse that.
-        sPrefix = _GetNamespaceMap().GetPrefixByKey( nKey );
+        sPrefix = GetNamespaceMap_().GetPrefixByKey( nKey );
     }
     return sPrefix;
 }
@@ -952,7 +952,7 @@ void SvXMLExport::AddAttributeASCII( sal_uInt16 nPrefixKey,
     OUString sValue( OUString::createFromAscii( pValue ) );
 
     mpAttrList->AddAttribute(
-        _GetNamespaceMap().GetQNameByKey( nPrefixKey, sName ), sValue );
+        GetNamespaceMap_().GetQNameByKey( nPrefixKey, sName ), sValue );
 }
 
 void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, const sal_Char *pName,
@@ -961,14 +961,14 @@ void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, const sal_Char *pName,
     OUString sName( OUString::createFromAscii( pName ) );
 
     mpAttrList->AddAttribute(
-        _GetNamespaceMap().GetQNameByKey( nPrefixKey, sName ), rValue );
+        GetNamespaceMap_().GetQNameByKey( nPrefixKey, sName ), rValue );
 }
 
 void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey, const OUString& rName,
                               const OUString& rValue )
 {
     mpAttrList->AddAttribute(
-        _GetNamespaceMap().GetQNameByKey( nPrefixKey, rName ), rValue );
+        GetNamespaceMap_().GetQNameByKey( nPrefixKey, rName ), rValue );
 }
 
 void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey,
@@ -976,7 +976,7 @@ void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey,
                                 const OUString& rValue )
 {
     mpAttrList->AddAttribute(
-        _GetNamespaceMap().GetQNameByKey( nPrefixKey, GetXMLToken(eName) ),
+        GetNamespaceMap_().GetQNameByKey( nPrefixKey, GetXMLToken(eName) ),
         rValue );
 }
 
@@ -985,7 +985,7 @@ void SvXMLExport::AddAttribute( sal_uInt16 nPrefixKey,
                                 enum XMLTokenEnum eValue)
 {
     mpAttrList->AddAttribute(
-        _GetNamespaceMap().GetQNameByKey( nPrefixKey, GetXMLToken(eName) ),
+        GetNamespaceMap_().GetQNameByKey( nPrefixKey, GetXMLToken(eName) ),
         GetXMLToken(eValue) );
 }
 
@@ -1086,7 +1086,7 @@ void SvXMLExport::ImplExportMeta()
 {
     CheckAttrList();
 
-    _ExportMeta();
+    ExportMeta_();
 }
 
 void SvXMLExport::ImplExportSettings()
@@ -1144,7 +1144,7 @@ void SvXMLExport::ImplExportStyles()
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_STYLES,
                                 true, true );
 
-        _ExportStyles( false );
+        ExportStyles_( false );
     }
 
     // transfer style names (+ families) TO other components (if appropriate)
@@ -1187,7 +1187,7 @@ void SvXMLExport::ImplExportAutoStyles()
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
                                   XML_AUTOMATIC_STYLES, true, true );
 
-        _ExportAutoStyles();
+        ExportAutoStyles_();
     }
 }
 
@@ -1198,7 +1198,7 @@ void SvXMLExport::ImplExportMasterStyles()
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,
                                 true, true );
 
-        _ExportMasterStyles();
+        ExportMasterStyles_();
     }
 
 }
@@ -1228,7 +1228,7 @@ void SvXMLExport::ImplExportContent()
                                       XML_NAMESPACE_OFFICE, eClass,
                                         true, true );
 
-            _ExportContent();
+            ExportContent_();
         }
     }
 }
@@ -1434,11 +1434,11 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
 
         // scripts
         if( mnExportFlags & SvXMLExportFlags::SCRIPTS )
-            _ExportScripts();
+            ExportScripts_();
 
         // font declarations
         if( mnExportFlags & SvXMLExportFlags::FONTDECLS )
-            _ExportFontDecls();
+            ExportFontDecls_();
 
         // styles
         if( mnExportFlags & SvXMLExportFlags::STYLES )
@@ -1489,7 +1489,7 @@ OUString SvXMLExport::GetDestinationShellID() const
     return mpImpl->maDestShellID;
 }
 
-void SvXMLExport::_ExportMeta()
+void SvXMLExport::ExportMeta_()
 {
     OUString generator( ::utl::DocInfoHelper::GetGeneratorString() );
     Reference< XDocumentPropertiesSupplier > xDocPropsSupplier(mxModel,
@@ -1517,7 +1517,7 @@ void SvXMLExport::_ExportMeta()
     }
 }
 
-void SvXMLExport::_ExportScripts()
+void SvXMLExport::ExportScripts_()
 {
     SvXMLElementExport aElement( *this, XML_NAMESPACE_OFFICE, XML_SCRIPTS, true, true );
 
@@ -1552,13 +1552,13 @@ void SvXMLExport::_ExportScripts()
     GetEventExport().Export( xEvents );
 }
 
-void SvXMLExport::_ExportFontDecls()
+void SvXMLExport::ExportFontDecls_()
 {
     if( mxFontAutoStylePool.is() )
         mxFontAutoStylePool->exportXML();
 }
 
-void SvXMLExport::_ExportStyles( bool )
+void SvXMLExport::ExportStyles_( bool )
 {
     uno::Reference< lang::XMultiServiceFactory > xFact( GetModel(), uno::UNO_QUERY );
     if( xFact.is())
@@ -2182,7 +2182,7 @@ void SvXMLExport::StartElement(sal_uInt16 nPrefix,
                         enum ::xmloff::token::XMLTokenEnum eName,
                         bool bIgnWSOutside )
 {
-    StartElement(_GetNamespaceMap().GetQNameByKey( nPrefix,
+    StartElement(GetNamespaceMap_().GetQNameByKey( nPrefix,
         GetXMLToken(eName) ), bIgnWSOutside);
 }
 
@@ -2239,7 +2239,7 @@ void SvXMLExport::EndElement(sal_uInt16 nPrefix,
                         enum ::xmloff::token::XMLTokenEnum eName,
                         bool bIgnWSInside )
 {
-    EndElement(_GetNamespaceMap().GetQNameByKey( nPrefix, GetXMLToken(eName) ),
+    EndElement(GetNamespaceMap_().GetQNameByKey( nPrefix, GetXMLToken(eName) ),
         bIgnWSInside);
 }
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 483cc02cb51f..d5fcb949741c 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -72,38 +72,38 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
 using namespace ::xmloff::token;
 
-sal_Char const sXML_np__office[] = "_office";
-sal_Char const sXML_np__office_ext[] = "_office_ooo";
-sal_Char const sXML_np__ooo[] = "_ooo";
-sal_Char const sXML_np__ooow[] = "_ooow";
-sal_Char const sXML_np__oooc[] = "_oooc";
-sal_Char const sXML_np__of[] = "_of";
-sal_Char const sXML_np__style[] = "_style";
-sal_Char const sXML_np__text[] = "_text";
-sal_Char const sXML_np__table[] = "_table";
-sal_Char const sXML_np__table_ext[] = "_table_ooo";
-sal_Char const sXML_np__draw[] = "_draw";
-sal_Char const sXML_np__draw_ext[] = "_draw_ooo";
-sal_Char const sXML_np__dr3d[] = "_dr3d";
-sal_Char const sXML_np__fo[] = "_fo";
-sal_Char const sXML_np__xlink[] = "_xlink";
-sal_Char const sXML_np__dc[] = "_dc";
-sal_Char const sXML_np__dom[] = "_dom";
-sal_Char const sXML_np__meta[] = "_meta";
-sal_Char const sXML_np__number[] = "_number";
-sal_Char const sXML_np__svg[] = "_svg";
-sal_Char const sXML_np__chart[] = "_chart";
-sal_Char const sXML_np__math[] = "_math";
-sal_Char const sXML_np__form[] = "_form";
-sal_Char const sXML_np__script[] = "_script";
-sal_Char const sXML_np__config[] = "_config";
-sal_Char const sXML_np__xforms[] = "_xforms";
-sal_Char const sXML_np__formx[] = "_formx";
-sal_Char const sXML_np__xsd[] = "_xsd";
-sal_Char const sXML_np__xsi[] = "_xsi";
-sal_Char const sXML_np__field[] = "_field";
-sal_Char const sXML_np__xhtml[] = "_xhtml";
-sal_Char const sXML_np__css3text[] = "_css3text";
+sal_Char const sXML_np_office[] = "_office";
+sal_Char const sXML_np_office_ext[] = "_office_ooo";
+sal_Char const sXML_np_ooo[] = "_ooo";
+sal_Char const sXML_np_ooow[] = "_ooow";
+sal_Char const sXML_np_oooc[] = "_oooc";
+sal_Char const sXML_np_of[] = "_of";
+sal_Char const sXML_np_style[] = "_style";
+sal_Char const sXML_np_text[] = "_text";
+sal_Char const sXML_np_table[] = "_table";
+sal_Char const sXML_np_table_ext[] = "_table_ooo";
+sal_Char const sXML_np_draw[] = "_draw";
+sal_Char const sXML_np_draw_ext[] = "_draw_ooo";
+sal_Char const sXML_np_dr3d[] = "_dr3d";
+sal_Char const sXML_np_fo[] = "_fo";
+sal_Char const sXML_np_xlink[] = "_xlink";
+sal_Char const sXML_np_dc[] = "_dc";
+sal_Char const sXML_np_dom[] = "_dom";
+sal_Char const sXML_np_meta[] = "_meta";
+sal_Char const sXML_np_number[] = "_number";
+sal_Char const sXML_np_svg[] = "_svg";
+sal_Char const sXML_np_chart[] = "_chart";
+sal_Char const sXML_np_math[] = "_math";
+sal_Char const sXML_np_form[] = "_form";
+sal_Char const sXML_np_script[] = "_script";
+sal_Char const sXML_np_config[] = "_config";
+sal_Char const sXML_np_xforms[] = "_xforms";
+sal_Char const sXML_np_formx[] = "_formx";
+sal_Char const sXML_np_xsd[] = "_xsd";
+sal_Char const sXML_np_xsi[] = "_xsi";
+sal_Char const sXML_np_field[] = "_field";
+sal_Char const sXML_np_xhtml[] = "_xhtml";
+sal_Char const sXML_np_css3text[] = "_css3text";
 
 class SvXMLImportEventListener : public cppu::WeakImplHelper< css::lang::XEventListener >
 {
@@ -359,44 +359,44 @@ SvXMLImportContext *SvXMLImport::CreateFastContext( sal_Int32 /*Element*/,
     return new SvXMLImportContext( *this );
 }
 
-void SvXMLImport::_InitCtor()
+void SvXMLImport::InitCtor_()
 {
     if( mnImportFlags != SvXMLImportFlags::NONE )
     {
         // implicit "xml" namespace prefix
         mpNamespaceMap->Add( GetXMLToken(XML_XML), GetXMLToken(XML_N_XML), XML_NAMESPACE_XML );
-        mpNamespaceMap->Add( sXML_np__office, GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
-        mpNamespaceMap->Add( sXML_np__office_ext, GetXMLToken(XML_N_OFFICE_EXT), XML_NAMESPACE_OFFICE_EXT );
-        mpNamespaceMap->Add( sXML_np__ooo, GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
-        mpNamespaceMap->Add( sXML_np__style, GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
-        mpNamespaceMap->Add( sXML_np__text, GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT );
-        mpNamespaceMap->Add( sXML_np__table, GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE );
-        mpNamespaceMap->Add( sXML_np__table_ext, GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT );
-        mpNamespaceMap->Add( sXML_np__draw, GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
-        mpNamespaceMap->Add( sXML_np__draw_ext, GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT );
-        mpNamespaceMap->Add( sXML_np__dr3d, GetXMLToken(XML_N_DR3D), XML_NAMESPACE_DR3D );
-        mpNamespaceMap->Add( sXML_np__fo, GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO );
-        mpNamespaceMap->Add( sXML_np__xlink, GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
-        mpNamespaceMap->Add( sXML_np__dc, GetXMLToken(XML_N_DC), XML_NAMESPACE_DC );
-        mpNamespaceMap->Add( sXML_np__dom, GetXMLToken(XML_N_DOM), XML_NAMESPACE_DOM );
-        mpNamespaceMap->Add( sXML_np__meta, GetXMLToken(XML_N_META), XML_NAMESPACE_META );
-        mpNamespaceMap->Add( sXML_np__number, GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER );
-        mpNamespaceMap->Add( sXML_np__svg, GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG );
-        mpNamespaceMap->Add( sXML_np__chart, GetXMLToken(XML_N_CHART), XML_NAMESPACE_CHART );
-        mpNamespaceMap->Add( sXML_np__math, GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH );
-        mpNamespaceMap->Add(sXML_np__form, GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM );
-        mpNamespaceMap->Add( sXML_np__script, GetXMLToken(XML_N_SCRIPT), XML_NAMESPACE_SCRIPT );
-        mpNamespaceMap->Add( sXML_np__config, GetXMLToken(XML_N_CONFIG), XML_NAMESPACE_CONFIG );
-        mpNamespaceMap->Add( sXML_np__xforms, GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS );
-        mpNamespaceMap->Add( sXML_np__formx, GetXMLToken( XML_N_FORMX ), XML_NAMESPACE_FORMX );
-        mpNamespaceMap->Add( sXML_np__xsd, GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
-        mpNamespaceMap->Add( sXML_np__xsi, GetXMLToken(XML_N_XSI), XML_NAMESPACE_XFORMS );
-        mpNamespaceMap->Add( sXML_np__ooow, GetXMLToken(XML_N_OOOW), XML_NAMESPACE_OOOW );
-        mpNamespaceMap->Add( sXML_np__oooc, GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC );
-        mpNamespaceMap->Add( sXML_np__field, GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
-        mpNamespaceMap->Add( sXML_np__of, GetXMLToken(XML_N_OF), XML_NAMESPACE_OF );
-        mpNamespaceMap->Add( sXML_np__xhtml, GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
-        mpNamespaceMap->Add( sXML_np__css3text, GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT );
+        mpNamespaceMap->Add( sXML_np_office, GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
+        mpNamespaceMap->Add( sXML_np_office_ext, GetXMLToken(XML_N_OFFICE_EXT), XML_NAMESPACE_OFFICE_EXT );
+        mpNamespaceMap->Add( sXML_np_ooo, GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
+        mpNamespaceMap->Add( sXML_np_style, GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
+        mpNamespaceMap->Add( sXML_np_text, GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT );
+        mpNamespaceMap->Add( sXML_np_table, GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE );
+        mpNamespaceMap->Add( sXML_np_table_ext, GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT );
+        mpNamespaceMap->Add( sXML_np_draw, GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
+        mpNamespaceMap->Add( sXML_np_draw_ext, GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT );
+        mpNamespaceMap->Add( sXML_np_dr3d, GetXMLToken(XML_N_DR3D), XML_NAMESPACE_DR3D );
+        mpNamespaceMap->Add( sXML_np_fo, GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO );
+        mpNamespaceMap->Add( sXML_np_xlink, GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
+        mpNamespaceMap->Add( sXML_np_dc, GetXMLToken(XML_N_DC), XML_NAMESPACE_DC );
+        mpNamespaceMap->Add( sXML_np_dom, GetXMLToken(XML_N_DOM), XML_NAMESPACE_DOM );
+        mpNamespaceMap->Add( sXML_np_meta, GetXMLToken(XML_N_META), XML_NAMESPACE_META );
+        mpNamespaceMap->Add( sXML_np_number, GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER );
+        mpNamespaceMap->Add( sXML_np_svg, GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG );
+        mpNamespaceMap->Add( sXML_np_chart, GetXMLToken(XML_N_CHART), XML_NAMESPACE_CHART );
+        mpNamespaceMap->Add( sXML_np_math, GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH );
+        mpNamespaceMap->Add(sXML_np_form, GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM );
+        mpNamespaceMap->Add( sXML_np_script, GetXMLToken(XML_N_SCRIPT), XML_NAMESPACE_SCRIPT );
+        mpNamespaceMap->Add( sXML_np_config, GetXMLToken(XML_N_CONFIG), XML_NAMESPACE_CONFIG );
+        mpNamespaceMap->Add( sXML_np_xforms, GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS );
+        mpNamespaceMap->Add( sXML_np_formx, GetXMLToken( XML_N_FORMX ), XML_NAMESPACE_FORMX );
+        mpNamespaceMap->Add( sXML_np_xsd, GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
+        mpNamespaceMap->Add( sXML_np_xsi, GetXMLToken(XML_N_XSI), XML_NAMESPACE_XFORMS );
+        mpNamespaceMap->Add( sXML_np_ooow, GetXMLToken(XML_N_OOOW), XML_NAMESPACE_OOOW );
+        mpNamespaceMap->Add( sXML_np_oooc, GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC );
+        mpNamespaceMap->Add( sXML_np_field, GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
+        mpNamespaceMap->Add( sXML_np_of, GetXMLToken(XML_N_OF), XML_NAMESPACE_OF );
+        mpNamespaceMap->Add( sXML_np_xhtml, GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
+        mpNamespaceMap->Add( sXML_np_css3text, GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT );
 
         mpNamespaceMap->Add( "_calc_libo", GetXMLToken(XML_N_CALC_EXT), XML_NAMESPACE_CALC_EXT);
         mpNamespaceMap->Add( "_office_libo",
@@ -441,7 +441,7 @@ SvXMLImport::SvXMLImport(
     mbIsGraphicLoadOnDemandSupported( true )
 {
     SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" );
-    _InitCtor();
+    InitCtor_();
 }
 
 SvXMLImport::~SvXMLImport() throw ()
@@ -1719,7 +1719,7 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion )
     return bResult;
 }
 
-void SvXMLImport::_CreateNumberFormatsSupplier()
+void SvXMLImport::CreateNumberFormatsSupplier_()
 {
     SAL_WARN_IF( mxNumberFormatsSupplier.is(), "xmloff.core", "number formats supplier already exists!" );
     if(mxModel.is())
@@ -1727,7 +1727,7 @@ void SvXMLImport::_CreateNumberFormatsSupplier()
             uno::Reference< util::XNumberFormatsSupplier> (mxModel, uno::UNO_QUERY);
 }
 
-void SvXMLImport::_CreateDataStylesImport()
+void SvXMLImport::CreateDataStylesImport_()
 {
     SAL_WARN_IF( mpNumImport != nullptr, "xmloff.core", "data styles import already exists!" );
     uno::Reference<util::XNumberFormatsSupplier> xNum =
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index b362ea8045e4..cfe68c9228bb 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -184,7 +184,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
         }
     }
 
-    struct _ContextID_Index_Pair aContextIDs[] =
+    struct ContextID_Index_Pair aContextIDs[] =
     {
         { CTF_DASHNAME , -1 },
         { CTF_LINESTARTNAME , -1 },
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 04e257eab344..fdd11324766c 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -593,24 +593,24 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
     }
 
     // add namespaces
-    _GetNamespaceMap().Add(
+    GetNamespaceMap_().Add(
         GetXMLToken(XML_NP_PRESENTATION),
         GetXMLToken(XML_N_PRESENTATION),
         XML_NAMESPACE_PRESENTATION);
 
-    _GetNamespaceMap().Add(
+    GetNamespaceMap_().Add(
         GetXMLToken(XML_NP_SMIL),
         GetXMLToken(XML_N_SMIL_COMPAT),
         XML_NAMESPACE_SMIL);
 
-    _GetNamespaceMap().Add(
+    GetNamespaceMap_().Add(
         GetXMLToken(XML_NP_ANIMATION),
         GetXMLToken(XML_N_ANIMATION),
         XML_NAMESPACE_ANIMATION);
 
     if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
     {
-        _GetNamespaceMap().Add(
+        GetNamespaceMap_().Add(
             GetXMLToken(XML_NP_OFFICE_EXT),
             GetXMLToken(XML_N_OFFICE_EXT),
             XML_NAMESPACE_OFFICE_EXT);
@@ -1739,7 +1739,7 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
 }
 
 
-void SdXMLExport::_ExportMeta()
+void SdXMLExport::ExportMeta_()
 {
     uno::Sequence<beans::NamedValue> stats { { "ObjectCount", uno::makeAny(mnObjectCount) } };
 
@@ -1753,16 +1753,16 @@ void SdXMLExport::_ExportMeta()
     }
 
     // call parent
-    SvXMLExport::_ExportMeta();
+    SvXMLExport::ExportMeta_();
 }
 
-void SdXMLExport::_ExportFontDecls()
+void SdXMLExport::ExportFontDecls_()
 {
     GetFontAutoStylePool(); // make sure the pool is created
-    SvXMLExport::_ExportFontDecls();
+    SvXMLExport::ExportFontDecls_();
 }
 
-void SdXMLExport::_ExportContent()
+void SdXMLExport::ExportContent_()
 {
     // export <pres:header-decl>, <pres:footer-decl> and <pres:date-time-decl> elements
     ImpWriteHeaderFooterDecls();
@@ -2128,12 +2128,12 @@ void SdXMLExport::exportPresentationSettings()
     }
 }
 
-void SdXMLExport::_ExportStyles(bool bUsed)
+void SdXMLExport::ExportStyles_(bool bUsed)
 {
     GetPropertySetMapper()->SetAutoStyles( false );
 
     // export fill styles
-    SvXMLExport::_ExportStyles( bUsed );
+    SvXMLExport::ExportStyles_( bUsed );
 
     // write draw:style-name for object graphic-styles
     GetShapeExport()->ExportGraphicDefaults();
@@ -2166,7 +2166,7 @@ void SdXMLExport::_ExportStyles(bool bUsed)
     }
 }
 
-void SdXMLExport::_ExportAutoStyles()
+void SdXMLExport::ExportAutoStyles_()
 {
     Reference< beans::XPropertySet > xInfoSet( getExportInfo() );
     if( xInfoSet.is() )
@@ -2361,7 +2361,7 @@ void SdXMLExport::_ExportAutoStyles()
     GetTextParagraphExport()->exportTextAutoStyles();
 }
 
-void SdXMLExport::_ExportMasterStyles()
+void SdXMLExport::ExportMasterStyles_()
 {
     // export layer
     SdXMLayerExporter::exportLayer( *this );
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index b6a32c9c5d15..49c3ebd7ace0 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -117,12 +117,12 @@ class SdXMLExport : public SvXMLExport
 
     const OUString         msPageLayoutNames;
 
-    virtual void _ExportStyles(bool bUsed) override;
-    virtual void _ExportAutoStyles() override;
-    virtual void _ExportFontDecls() override;
-    virtual void _ExportMasterStyles() override;
-    virtual void _ExportContent() override;
-    virtual void _ExportMeta() override;
+    virtual void ExportStyles_(bool bUsed) override;
+    virtual void ExportAutoStyles_() override;
+    virtual void ExportFontDecls_() override;
+    virtual void ExportMasterStyles_() override;
+    virtual void ExportContent_() override;
+    virtual void ExportMeta_() override;
 
     ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( css::uno::Reference< css::drawing::XDrawPage > xMasterPage );
     void ImpPrepPageMasterInfos();
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 09cc9008331b..2158b8ff6e9d 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -236,7 +236,7 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
     const Reference< beans::XPropertySet > & rPropSet )
 {
     static const sal_uInt16 MAX_SPECIAL_DRAW_STYLES = 7;
-    struct _ContextID_Index_Pair aContextIDs[MAX_SPECIAL_DRAW_STYLES+1] =
+    struct ContextID_Index_Pair aContextIDs[MAX_SPECIAL_DRAW_STYLES+1] =
     {
         { CTF_DASHNAME , -1 },
         { CTF_LINESTARTNAME , -1 },
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index cef777e6bf46..65161eb13b8e 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -155,13 +155,13 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
                     true, true );
 
         // NB: office:meta is now written by _ExportMeta
-        _ExportMeta();
+        ExportMeta_();
     }
     xDocHandler->endDocument();
     return 0;
 }
 
-void XMLMetaExportComponent::_ExportMeta()
+void XMLMetaExportComponent::ExportMeta_()
 {
     if (mxDocProps.is()) {
         OUString generator( ::utl::DocInfoHelper::GetGeneratorString() );
@@ -171,14 +171,14 @@ void XMLMetaExportComponent::_ExportMeta()
         uno::Reference<xml::sax::XDocumentHandler> xMeta(pMeta);
         pMeta->Export();
     } else {
-        SvXMLExport::_ExportMeta();
+        SvXMLExport::ExportMeta_();
     }
 }
 
 // methods without content:
-void XMLMetaExportComponent::_ExportAutoStyles() {}
-void XMLMetaExportComponent::_ExportMasterStyles() {}
-void XMLMetaExportComponent::_ExportContent() {}
+void XMLMetaExportComponent::ExportAutoStyles_() {}
+void XMLMetaExportComponent::ExportMasterStyles_() {}
+void XMLMetaExportComponent::ExportContent_() {}
 
 uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames()
     throw()
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index e9e90bde5a34..315c9f9048d7 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -93,7 +93,7 @@ void SvXMLMetaExport::SimpleDateTimeElement( const util::DateTime & rDate,
     }
 }
 
-void SvXMLMetaExport::_MExport()
+void SvXMLMetaExport::MExport_()
 {
     //  generator
     {
@@ -342,7 +342,7 @@ void SvXMLMetaExport::Export()
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_OFFICE, XML_META,
                                   true, true );
         // fall back to using public interface of XDocumentProperties
-        _MExport();
+        MExport_();
     }
 }
 
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 1e3eb896505d..766b71c989c2 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -47,9 +47,9 @@ XMLVersionListExport::XMLVersionListExport(
 :   SvXMLExport( rContext, "", rFileName, util::MeasureUnit::CM, rHandler ),
     maVersions( rVersions )
 {
-    _GetNamespaceMap().AddAtIndex( XML_NAMESPACE_DC_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_DC),
+    GetNamespaceMap_().AddAtIndex( XML_NAMESPACE_DC_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_DC),
                                    xmloff::token::GetXMLToken(xmloff::token::XML_N_DC), XML_NAMESPACE_DC );
-    _GetNamespaceMap().AddAtIndex( XML_NAMESPACE_FRAMEWORK_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
+    GetNamespaceMap_().AddAtIndex( XML_NAMESPACE_FRAMEWORK_IDX, xmloff::token::GetXMLToken(xmloff::token::XML_NP_VERSIONS_LIST),
                                    xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK );
 }
 
@@ -61,12 +61,12 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
 
     sal_uInt16 nPos = SvXMLNamespaceMap::GetIndexByKey( XML_NAMESPACE_DC );
 
-    AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
-                             _GetNamespaceMap().GetNameByIndex ( nPos ) );
+    AddAttribute( XML_NAMESPACE_NONE, GetNamespaceMap_().GetAttrNameByIndex( nPos ),
+                             GetNamespaceMap_().GetNameByIndex ( nPos ) );
 
     nPos = SvXMLNamespaceMap::GetIndexByKey( XML_NAMESPACE_FRAMEWORK );
-    AddAttribute( XML_NAMESPACE_NONE, _GetNamespaceMap().GetAttrNameByIndex( nPos ),
-                             _GetNamespaceMap().GetNameByIndex ( nPos ) );
+    AddAttribute( XML_NAMESPACE_NONE, GetNamespaceMap_().GetAttrNameByIndex( nPos ),
+                             GetNamespaceMap_().GetNameByIndex ( nPos ) );
 
     {
         // the following object will write all collected attributes in its dtor
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 7934a17e556e..8b93b7b5cf88 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -194,7 +194,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
     if(xImpPrMap.is())
     {
         // properties that need special handling because they need the used name to be translated first
-        struct _ContextID_Index_Pair aContextIDs[] =
+        struct ContextID_Index_Pair aContextIDs[] =
         {
             { CTF_PM_FILLGRADIENTNAME, -1 },
             { CTF_PM_FILLTRANSNAME, -1 },
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 870e19cbdcfc..5c8f673f77a2 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -572,16 +572,16 @@ void SvXMLExportPropertyMapper::ChainExportMapper(
 std::vector<XMLPropertyState> SvXMLExportPropertyMapper::Filter(
     const uno::Reference<beans::XPropertySet>& rPropSet, bool bEnableFoFontFamily ) const
 {
-    return _Filter(rPropSet, false, bEnableFoFontFamily);
+    return Filter_(rPropSet, false, bEnableFoFontFamily);
 }
 
 std::vector<XMLPropertyState> SvXMLExportPropertyMapper::FilterDefaults(
     const uno::Reference<beans::XPropertySet>& rPropSet ) const
 {
-    return _Filter(rPropSet, true, false/*bEnableFoFontFamily*/);
+    return Filter_(rPropSet, true, false/*bEnableFoFontFamily*/);
 }
 
-vector<XMLPropertyState> SvXMLExportPropertyMapper::_Filter(
+vector<XMLPropertyState> SvXMLExportPropertyMapper::Filter_(
     const Reference<XPropertySet>& xPropSet, bool bDefault, bool bEnableFoFontFamily ) const
 {
     vector< XMLPropertyState > aPropStateArray;
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index fd11c9c54d8e..21cc05987bde 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -366,7 +366,7 @@ void SvXMLImportPropertyMapper::FillPropertySequence(
 void SvXMLImportPropertyMapper::CheckSpecialContext(
             const ::std::vector< XMLPropertyState >& aProperties,
             const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
-            _ContextID_Index_Pair* pSpecialContextIds ) const
+            ContextID_Index_Pair* pSpecialContextIds ) const
 {
     OSL_ENSURE( rPropSet.is(), "need an XPropertySet" );
     sal_Int32 nCount = aProperties.size();
@@ -411,13 +411,13 @@ void SvXMLImportPropertyMapper::CheckSpecialContext(
 bool SvXMLImportPropertyMapper::FillPropertySet(
             const vector< XMLPropertyState >& aProperties,
             const Reference< XPropertySet >& rPropSet,
-            _ContextID_Index_Pair* pSpecialContextIds ) const
+            ContextID_Index_Pair* pSpecialContextIds ) const
 {
     bool bSet = false;
 
     Reference< XTolerantMultiPropertySet > xTolPropSet( rPropSet, UNO_QUERY );
     if (xTolPropSet.is())
-        bSet = _FillTolerantMultiPropertySet( aProperties, xTolPropSet, maPropMapper, rImport,
+        bSet = FillTolerantMultiPropertySet_( aProperties, xTolPropSet, maPropMapper, rImport,
                                             pSpecialContextIds );
 
     if (!bSet)
@@ -430,16 +430,16 @@ bool SvXMLImportPropertyMapper::FillPropertySet(
         if ( xMultiPropSet.is() )
         {
             // Try XMultiPropertySet. If that fails, try the regular route.
-            bSet = _FillMultiPropertySet( aProperties, xMultiPropSet,
+            bSet = FillMultiPropertySet_( aProperties, xMultiPropSet,
                                         xInfo, maPropMapper,
                                         pSpecialContextIds );
             if ( !bSet )
-                bSet = _FillPropertySet( aProperties, rPropSet,
+                bSet = FillPropertySet_( aProperties, rPropSet,
                                         xInfo, maPropMapper, rImport,
                                         pSpecialContextIds);
         }
         else
-            bSet = _FillPropertySet( aProperties, rPropSet, xInfo,
+            bSet = FillPropertySet_( aProperties, rPropSet, xInfo,
                                     maPropMapper, rImport,
                                     pSpecialContextIds );
     }
@@ -447,13 +447,13 @@ bool SvXMLImportPropertyMapper::FillPropertySet(
     return bSet;
 }
 
-bool SvXMLImportPropertyMapper::_FillPropertySet(
+bool SvXMLImportPropertyMapper::FillPropertySet_(
     const vector<XMLPropertyState> & rProperties,
     const Reference<XPropertySet> & rPropSet,
     const Reference<XPropertySetInfo> & rPropSetInfo,
     const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
     SvXMLImport& rImport,
-    _ContextID_Index_Pair* pSpecialContextIds )
+    ContextID_Index_Pair* pSpecialContextIds )
 {
     OSL_ENSURE( rPropSet.is(), "need an XPropertySet" );
     OSL_ENSURE( rPropSetInfo.is(), "need an XPropertySetInfo" );
@@ -561,11 +561,11 @@ struct PropertyPairLessFunctor :
     }
 };
 
-void SvXMLImportPropertyMapper::_PrepareForMultiPropertySet(
+void SvXMLImportPropertyMapper::PrepareForMultiPropertySet_(
     const vector<XMLPropertyState> & rProperties,
     const Reference<XPropertySetInfo> & rPropSetInfo,
     const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
-    _ContextID_Index_Pair* pSpecialContextIds,
+    ContextID_Index_Pair* pSpecialContextIds,
     Sequence<OUString>& rNames,
     Sequence<Any>& rValues)
 {
@@ -643,12 +643,12 @@ void SvXMLImportPropertyMapper::_PrepareForMultiPropertySet(
     }
 }
 
-bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
+bool SvXMLImportPropertyMapper::FillMultiPropertySet_(
     const vector<XMLPropertyState> & rProperties,
     const Reference<XMultiPropertySet> & rMultiPropSet,
     const Reference<XPropertySetInfo> & rPropSetInfo,
     const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
-    _ContextID_Index_Pair* pSpecialContextIds )
+    ContextID_Index_Pair* pSpecialContextIds )
 {
     OSL_ENSURE( rMultiPropSet.is(), "Need multi property set. ");
     OSL_ENSURE( rPropSetInfo.is(), "Need property set info." );
@@ -658,7 +658,7 @@ bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
     Sequence<OUString> aNames;
     Sequence<Any> aValues;
 
-    _PrepareForMultiPropertySet(rProperties, rPropSetInfo, rPropMapper, pSpecialContextIds,
+    PrepareForMultiPropertySet_(rProperties, rPropSetInfo, rPropMapper, pSpecialContextIds,
         aNames, aValues);
 
     // and, finally, try to set the values
@@ -675,12 +675,12 @@ bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
     return bSuccessful;
 }
 
-bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
+bool SvXMLImportPropertyMapper::FillTolerantMultiPropertySet_(
     const vector<XMLPropertyState> & rProperties,
     const Reference<XTolerantMultiPropertySet> & rTolMultiPropSet,
     const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
     SvXMLImport& rImport,
-    _ContextID_Index_Pair* pSpecialContextIds )
+    ContextID_Index_Pair* pSpecialContextIds )
 {
     OSL_ENSURE( rTolMultiPropSet.is(), "Need tolerant multi property set. ");
 
@@ -689,7 +689,7 @@ bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet(
     Sequence<OUString> aNames;
     Sequence<Any> aValues;
 
-    _PrepareForMultiPropertySet(rProperties, Reference<XPropertySetInfo>(nullptr), rPropMapper, pSpecialContextIds,
+    PrepareForMultiPropertySet_(rProperties, Reference<XPropertySetInfo>(nullptr), rPropMapper, pSpecialContextIds,
         aNames, aValues);
 
     // and, finally, try to set the values
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 99c3a2fed640..b0cfa14a060b 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -196,13 +196,13 @@ void XMLAutoTextEventExport::exportEvents()
 
 // methods without content:
 
-void XMLAutoTextEventExport::_ExportMeta() {}
-void XMLAutoTextEventExport::_ExportScripts() {}
-void XMLAutoTextEventExport::_ExportFontDecls() {}
-void XMLAutoTextEventExport::_ExportStyles( bool ) {}
-void XMLAutoTextEventExport::_ExportAutoStyles() {}
-void XMLAutoTextEventExport::_ExportMasterStyles() {}
-void XMLAutoTextEventExport::_ExportContent() {}
+void XMLAutoTextEventExport::ExportMeta_() {}
+void XMLAutoTextEventExport::ExportScripts_() {}
+void XMLAutoTextEventExport::ExportFontDecls_() {}
+void XMLAutoTextEventExport::ExportStyles_( bool ) {}
+void XMLAutoTextEventExport::ExportAutoStyles_() {}
+void XMLAutoTextEventExport::ExportMasterStyles_() {}
+void XMLAutoTextEventExport::ExportContent_() {}
 
 
 // methods to support the component registration
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 4ee3b518f212..53f2c2fdc712 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -82,13 +82,13 @@ protected:
 
 
     // methods without content:
-    virtual void _ExportMeta() override;
-    virtual void _ExportScripts() override;
-    virtual void _ExportFontDecls() override;
-    virtual void _ExportStyles( bool bUsed ) override ;
-    virtual void _ExportAutoStyles() override;
-    virtual void _ExportMasterStyles() override;
-    virtual void _ExportContent() override;
+    virtual void ExportMeta_() override;
+    virtual void ExportScripts_() override;
+    virtual void ExportFontDecls_() override;
+    virtual void ExportStyles_( bool bUsed ) override ;
+    virtual void ExportAutoStyles_() override;
+    virtual void ExportMasterStyles_() override;
+    virtual void ExportContent_() override;
 };
 
 #endif
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 7332be96c17d..059259ec1e66 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -275,7 +275,7 @@ void XMLSectionImportContext::ProcessAttributes(
                 {
                     OUString sTmp;
                     sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                                    _GetKeyByAttrName( sAttr, &sTmp );
+                                    GetKeyByAttrName_( sAttr, &sTmp );
                     if( XML_NAMESPACE_OOOW == nPrefix )
                     {
                         sCond = sTmp;
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 13ccc015f1c3..ac943f62f8fd 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1421,7 +1421,7 @@ void XMLDatabaseNextImportContext::ProcessAttribute(
     if (XML_TOK_TEXTFIELD_CONDITION == nAttrToken)
     {
         OUString sTmp;
-        sal_uInt16 nPrefix = GetImport().GetNamespaceMap()._GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName_(
                                     sAttrValue, &sTmp );
         if( XML_NAMESPACE_OOOW == nPrefix )
         {
@@ -1965,7 +1965,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute(
     if (XML_TOK_TEXTFIELD_CONDITION == nAttrToken)
     {
         OUString sTmp;
-        sal_uInt16 nPrefix = GetImport().GetNamespaceMap()._GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName_(
                                     sAttrValue, &sTmp );
         if( XML_NAMESPACE_OOOW == nPrefix )
         {
@@ -2027,7 +2027,7 @@ void XMLConditionalTextImportContext::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                        _GetKeyByAttrName( sAttrValue, &sTmp );
+                        GetKeyByAttrName_( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sCondition = sTmp;
@@ -2108,7 +2108,7 @@ void XMLHiddenTextImportContext::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                                        _GetKeyByAttrName( sAttrValue, &sTmp );
+                                        GetKeyByAttrName_( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sCondition = sTmp;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 4b8ff8272bdc..0c4cc551422c 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1218,7 +1218,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
 
                 if( pStyle )
                 {
-                    sal_Int32 nCount = pStyle->_GetProperties().size();
+                    sal_Int32 nCount = pStyle->GetProperties_().size();
                     if( nCount )
                     {
                         rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap =
@@ -1230,7 +1230,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
                                 xImpPrMap->getPropertySetMapper();
                             for( sal_Int32 i=0; i < nCount; i++ )
                             {
-                                const XMLPropertyState& rProp = pStyle->_GetProperties()[i];
+                                const XMLPropertyState& rProp = pStyle->GetProperties_()[i];
                                 sal_Int32 nIdx = rProp.mnIndex;
                                 sal_uInt32 nContextId = rPropMapper->GetEntryContextId(nIdx);
                                 if( CTF_FONTFAMILYNAME == nContextId )
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 148e85390dce..e0557519e2be 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -413,7 +413,7 @@ void XMLTextStyleContext::FillPropertySet(
         // but instead we chose to insert the code into this
         // iteration. I haven't been able to come up with a much more
         // intelligent solution.
-        struct _ContextID_Index_Pair aContextIDs[] =
+        struct ContextID_Index_Pair aContextIDs[] =
         {
             { CTF_COMBINED_CHARACTERS_FIELD, -1 },
             { CTF_KEEP_TOGETHER, -1 },
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 3c3b3ff8f91c..72e3252b545c 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -158,7 +158,7 @@ void XMLVarFieldImportContext::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                        _GetKeyByAttrName( sAttrValue, &sTmp );
+                        GetKeyByAttrName_( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sFormula = sTmp;
@@ -1311,7 +1311,7 @@ void XMLValueImportHelper::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = rImport.GetNamespaceMap().
-                        _GetKeyByAttrName( sAttrValue, &sTmp );
+                        GetKeyByAttrName_( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sFormula = sTmp;
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 4a237834c4c6..6f22f9c64dd4 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1240,7 +1240,7 @@ bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName,
 {
     OUString aLocalName;
     sal_uInt16 nPrefix =
-        GetNamespaceMap()._GetKeyByAttrName( rName, &aLocalName );
+        GetNamespaceMap().GetKeyByAttrName_( rName, &aLocalName );
     bool bRet = XML_NAMESPACE_UNKNOWN != nPrefix &&
                     (USHRT_MAX == nPrefixOnly || nPrefix == nPrefixOnly);
     if( bRet )