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>

1 files changed, 11 insertions, 11 deletions

diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index de1908f2d8bc..640d7bbf4c1c 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -45,7 +45,7 @@ class SvXMLImport;
  *
  * It should not be used in any other context.
  */
-struct _ContextID_Index_Pair
+struct ContextID_Index_Pair
 {
     sal_Int16 nContextID;
     sal_Int32 nIndex;
@@ -106,12 +106,12 @@ public:
     void CheckSpecialContext(
             const ::std::vector< XMLPropertyState >& rProperties,
             const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
-            _ContextID_Index_Pair* pSpecialContextIds ) const;
+            ContextID_Index_Pair* pSpecialContextIds ) const;
 
     bool FillPropertySet(
             const ::std::vector< XMLPropertyState >& rProperties,
             const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
-            _ContextID_Index_Pair* pSpecialContextIds = nullptr ) const;
+            ContextID_Index_Pair* pSpecialContextIds = nullptr ) const;
 
     void FillPropertySequence(
             const ::std::vector< XMLPropertyState >& aProperties,
@@ -124,7 +124,7 @@ public:
 
     /** implementation helper for FillPropertySet: fill an XPropertySet.
      * Exceptions will be asserted. */
-    static bool _FillPropertySet(
+    static bool FillPropertySet_(
         const ::std::vector<XMLPropertyState> & rProperties,
         const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
         const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo,
@@ -133,11 +133,11 @@ public:
 
         // parameter for use by txtstyli.cxx; allows efficient
         // catching the combined characters property
-        _ContextID_Index_Pair* pSpecialContextIds = nullptr );
+        ContextID_Index_Pair* pSpecialContextIds = nullptr );
 
     /** implementation helper for FillPropertySet: fill an XMultiPropertySet.
      * If unsuccessul, set return value. */
-    static bool _FillMultiPropertySet(
+    static bool FillMultiPropertySet_(
         const ::std::vector<XMLPropertyState> & rProperties,
         const css::uno::Reference< css::beans::XMultiPropertySet> & rMultiPropSet,
         const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo,
@@ -145,11 +145,11 @@ public:
 
         // parameters for use by txtstyli.cxx; allows efficient
         // catching the combined characters property
-        _ContextID_Index_Pair* pSpecialContextIds = nullptr );
+        ContextID_Index_Pair* pSpecialContextIds = nullptr );
 
     /** implementation helper for FillPropertySet: fill an XTolerantMultiPropertySet.
      * If unsuccessul, set return value. */
-    static bool _FillTolerantMultiPropertySet(
+    static bool FillTolerantMultiPropertySet_(
         const ::std::vector<XMLPropertyState> & rProperties,
         const css::uno::Reference< css::beans::XTolerantMultiPropertySet> & rTolPropSet,
         const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
@@ -157,14 +157,14 @@ public:
 
         // parameters for use by txtstyli.cxx; allows efficient
         // catching the combined characters property
-        _ContextID_Index_Pair* pSpecialContextIds = nullptr );
+        ContextID_Index_Pair* pSpecialContextIds = nullptr );
 
 
-    static void _PrepareForMultiPropertySet(
+    static void PrepareForMultiPropertySet_(
         const ::std::vector<XMLPropertyState> & rProperties,
         const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo,
         const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
-        _ContextID_Index_Pair* pSpecialContextIds,
+        ContextID_Index_Pair* pSpecialContextIds,
         css::uno::Sequence< OUString >& rNames,
         css::uno::Sequence< css::uno::Any >& rValues);
 };