Avoid reserved identifiers

Change-Id: Ie1830e7645b8bb8b8020fdb384471801a1aaca31

8 files changed, 28 insertions, 28 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 3633dbbc89e6..6a9cc8f0d8c0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -82,7 +82,7 @@ namespace writerfilter {
 
 namespace dmapper{
 
-struct _PageSz
+struct
 {
     sal_Int32 code;
     sal_Int32 h;
@@ -1958,7 +1958,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
         OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
         if(pSectionContext)
         {
-            const _PageMar& rPageMar = m_pImpl->GetPageMargins();
+            const PageMar& rPageMar = m_pImpl->GetPageMargins();
             pSectionContext->SetTopMargin( rPageMar.top );
             pSectionContext->SetRightMargin( rPageMar.right );
             pSectionContext->SetBottomMargin( rPageMar.bottom );
@@ -1990,7 +1990,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
                     pSectionContext->SetEvenlySpaced( false );
                     pSectionContext->SetColumnDistance( pSectHdl->GetSpace() );
                     pSectionContext->SetColumnCount( (sal_Int16)(pSectHdl->GetColumns().size() -1));
-                    std::vector<_Column>::const_iterator tmpIter = pSectHdl->GetColumns().begin();
+                    std::vector<Column_>::const_iterator tmpIter = pSectHdl->GetColumns().begin();
                     for (; tmpIter != pSectHdl->GetColumns().end(); ++tmpIter)
                     {
                         pSectionContext->AppendColumnWidth( tmpIter->nWidth );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 92d27425fc90..099ed6cbe0c3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4815,7 +4815,7 @@ void DomainMapper_Impl::SetPageMarginTwip( PageMarElement eElement, sal_Int32 nV
 }
 
 
-_PageMar::_PageMar()
+PageMar::PageMar()
 {
     header = footer = ConversionHelper::convertTwipToMM100(sal_Int32(720));
     top = bottom = ConversionHelper::convertTwipToMM100( sal_Int32(1440));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 82d1ce620219..4567e624992f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -75,7 +75,7 @@ namespace dmapper {
 
 class SdtHelper;
 
-struct _PageMar
+struct PageMar
 {
     sal_Int32 top;
     sal_Int32 right;
@@ -85,7 +85,7 @@ struct _PageMar
     sal_Int32 footer;
     sal_Int32 gutter;
     public:
-        _PageMar();
+        PageMar();
 };
 enum PageMarElement
 {
@@ -380,7 +380,7 @@ private:
     OUString                                                                        m_sCurrentBkmkId;
     OUString                                                                        m_sCurrentBkmkName;
 
-    _PageMar                                                                        m_aPageMargins;
+    PageMar                                                                        m_aPageMargins;
     SymbolData                                                                      m_aSymbolData;
 
     // TableManagers are stacked: one for each stream to avoid any confusion
@@ -733,9 +733,9 @@ public:
 
     bool IsRTFImport() const { return m_eDocumentType == SourceDocumentType::RTF; }
 
-    void InitPageMargins() { m_aPageMargins = _PageMar(); }
+    void InitPageMargins() { m_aPageMargins = PageMar(); }
     void SetPageMarginTwip( PageMarElement eElement, sal_Int32 nValue );
-    const _PageMar& GetPageMargins() const {return m_aPageMargins;}
+    const PageMar& GetPageMargins() const {return m_aPageMargins;}
 
     const LineNumberSettings& GetLineNumberSettings() const { return m_aLineNumberSettings;}
     void SetLineNumberSettings(const LineNumberSettings& rSet) { m_aLineNumberSettings = rSet;}
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index f0790ea41ad2..a140a754f648 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -24,14 +24,14 @@
 namespace writerfilter {
 namespace dmapper {
 
-_PgBorder::_PgBorder( ) :
+PgBorder::PgBorder( ) :
     m_nDistance( 0 ),
     m_ePos( BORDER_RIGHT ),
     m_bShadow(false)
 {
 }
 
-_PgBorder::~_PgBorder( )
+PgBorder::~PgBorder( )
 {
 }
 
@@ -118,7 +118,7 @@ void PageBordersHandler::lcl_sprm( Sprm& rSprm )
                     default:;
                 }
 
-                _PgBorder aPgBorder;
+                PgBorder aPgBorder;
                 aPgBorder.m_rLine = pBorderHandler->getBorderLine( );
                 aPgBorder.m_nDistance = pBorderHandler->getLineDistance( );
                 aPgBorder.m_ePos = ePos;
@@ -135,7 +135,7 @@ void PageBordersHandler::SetBorders( SectionPropertyMap* pSectContext )
 {
     for ( int i = 0, length = m_aBorders.size( ); i < length; i++ )
     {
-        _PgBorder aBorder = m_aBorders[i];
+        PgBorder aBorder = m_aBorders[i];
         pSectContext->SetBorder( aBorder.m_ePos, aBorder.m_nDistance, aBorder.m_rLine, aBorder.m_bShadow );
     }
 }
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 669e5f0e972f..ef699ca8df42 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -33,7 +33,7 @@
 namespace writerfilter {
 namespace dmapper {
 
-class _PgBorder
+class PgBorder
 {
 public:
     css::table::BorderLine2 m_rLine;
@@ -41,8 +41,8 @@ public:
     BorderPosition m_ePos;
     bool m_bShadow;
 
-    _PgBorder( );
-    ~_PgBorder( );
+    PgBorder( );
+    ~PgBorder( );
 };
 
 class PageBordersHandler : public LoggedProperties
@@ -52,7 +52,7 @@ private:
     // See implementation of SectionPropertyMap::ApplyBorderToPageStyles
     sal_Int32 m_nDisplay;
     sal_Int32 m_nOffset;
-    std::vector<_PgBorder> m_aBorders;
+    std::vector<PgBorder> m_aBorders;
 
     // Properties
     virtual void lcl_attribute( Id eName, Value& rVal ) override;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 9dfdc94828b7..f4655817fd92 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1160,7 +1160,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                     uno::Reference<beans::XPropertySet> xPageStyle (rDM_Impl.GetPageStyles()->getByName(aName), uno::UNO_QUERY_THROW);
                     HandleMarginsHeaderFooter(rDM_Impl);
                     if (rDM_Impl.IsNewDoc())
-                        _ApplyProperties(xPageStyle);
+                        ApplyProperties_(xPageStyle);
                 }
                 catch( const uno::Exception& )
                 {
@@ -1294,7 +1294,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
         }
 
         if (rDM_Impl.IsNewDoc())
-            _ApplyProperties( xFollowPageStyle );
+            ApplyProperties_( xFollowPageStyle );
 
         //todo: creating a "First Page" style depends on HasTitlePage und _fFacingPage_
         if( m_bTitlePage )
@@ -1304,7 +1304,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
             uno::Reference< beans::XPropertySet > xFirstPageStyle = GetPageStyle(
                                 rDM_Impl.GetPageStyles(), rDM_Impl.GetTextFactory(), true );
             if (rDM_Impl.IsNewDoc())
-                _ApplyProperties( xFirstPageStyle );
+                ApplyProperties_( xFirstPageStyle );
 
             sal_Int32 nPaperBin = m_nFirstPaperBin >= 0 ? m_nFirstPaperBin : m_nPaperBin >= 0 ? m_nPaperBin : 0;
             if( nPaperBin )
@@ -1408,7 +1408,7 @@ public:
     bool operator() (beans::PropertyValue& aVal)
     {   return aVal.Name == m_aName;    }
 };
-void SectionPropertyMap::_ApplyProperties(
+void SectionPropertyMap::ApplyProperties_(
         uno::Reference< beans::XPropertySet > const& xStyle)
 {
     uno::Reference<beans::XMultiPropertySet> const xMultiSet(xStyle,
@@ -1456,7 +1456,7 @@ void SectionPropertyMap::_ApplyProperties(
         }
         catch( const uno::Exception& )
         {
-            OSL_FAIL( "Exception in SectionPropertyMap::_ApplyProperties");
+            OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_");
         }
         return;
     }
@@ -1469,7 +1469,7 @@ void SectionPropertyMap::_ApplyProperties(
         }
         catch( const uno::Exception& )
         {
-            OSL_FAIL( "Exception in SectionPropertyMap::_ApplyProperties");
+            OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_");
         }
     }
 }
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 603f4e8f9a13..9dc59c0efaff 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -245,7 +245,7 @@ class SectionPropertyMap : public PropertyMap
     bool                                    m_bEvenPageFooterLinkToPrevious;
     bool                                    m_bFirstPageFooterLinkToPrevious;
 
-    void _ApplyProperties(css::uno::Reference<css::beans::XPropertySet> const& xStyle);
+    void ApplyProperties_(css::uno::Reference<css::beans::XPropertySet> const& xStyle);
     css::uno::Reference<css::text::XTextColumns> ApplyColumnProperties(css::uno::Reference<css::beans::XPropertySet> const& xFollowPageStyle,
                                                                        DomainMapper_Impl& rDM_Impl);
     void CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl );
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index 372ea741de5c..ee7bc7f1d740 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -26,7 +26,7 @@
 namespace writerfilter {
 namespace dmapper
 {
-struct _Column
+struct Column_
 {
     sal_Int32 nWidth;
     sal_Int32 nSpace;
@@ -39,9 +39,9 @@ class SectionColumnHandler : public LoggedProperties
     sal_Int32   m_nSpace;
     sal_Int32   m_nNum;
     bool        m_bSep;
-    std::vector<_Column> m_aCols;
+    std::vector<Column_> m_aCols;
 
-    _Column   m_aTempColumn;
+    Column_   m_aTempColumn;
 
     // Properties
     virtual void lcl_attribute(Id Name, Value & val) override;
@@ -56,7 +56,7 @@ public:
     sal_Int32   GetNum() const { return m_nNum; }
     bool        IsSeparator() const { return m_bSep; }
 
-    const std::vector<_Column>& GetColumns() const { return m_aCols;}
+    const std::vector<Column_>& GetColumns() const { return m_aCols;}
 
 };