diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 08:07:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 07:11:31 +0000 |
| commit | 9b1307f790c550d91b062cbdf1e3fe41d7e7ea4a (patch) | |
| tree | 27c83c2ce3bf42b6f97c8dba74115e8ae3ded4ed /svx | |
| parent | df15d17fa54257019ed92fe65d3a4a200a5f6027 (diff) | |
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>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/inc/xmlxtexp.hxx | 6 | ||||
| -rw-r--r-- | svx/source/xml/xmlxtexp.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index 3755aa2288e1..7d5b60df3522 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -50,9 +50,9 @@ public: throw (css::uno::RuntimeException, std::exception); // 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: bool exportTable() throw(); diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 27d2b1a810c7..1903527a9a79 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -152,11 +152,11 @@ SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( mxTable( xTable ) { - _GetNamespaceMap().Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); - _GetNamespaceMap().Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); - _GetNamespaceMap().Add( GetXMLToken(XML_NP_DRAW), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); - _GetNamespaceMap().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); - _GetNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG ); + GetNamespaceMap_().Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); + GetNamespaceMap_().Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); + GetNamespaceMap_().Add( GetXMLToken(XML_NP_DRAW), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); + GetNamespaceMap_().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); + GetNamespaceMap_().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG ); SetGraphicResolver( xGrfResolver ); setExportFlags( SvXMLExportFlags::NONE ); } @@ -416,9 +416,9 @@ bool SvxXMLXTableExportComponent::exportTable() throw() } // methods without content: -void SvxXMLXTableExportComponent::_ExportAutoStyles() {} -void SvxXMLXTableExportComponent::_ExportMasterStyles() {} -void SvxXMLXTableExportComponent::_ExportContent() {} +void SvxXMLXTableExportComponent::ExportAutoStyles_() {} +void SvxXMLXTableExportComponent::ExportMasterStyles_() {} +void SvxXMLXTableExportComponent::ExportContent_() {} SvxXMLTableEntryExporter::~SvxXMLTableEntryExporter() |