rename misleading SwScanner::rConversionMap

Change-Id: I6f93eae5377c95ec47348b01b3414855b05a525e

sw/inc/swscanner.hxx

@@ -38,7 +38,7 @@ class SwScanner
     const OUString aPreDashReplacementText;
     OUString aText;
     const LanguageType* pLanguage;
-    const ModelToViewHelper rConversionMap;
+    const ModelToViewHelper m_ModelToView;
     sal_Int32 nStartPos;
     sal_Int32 nEndPos;
     sal_Int32 nBegin;

sw/source/core/txtnode/txtedt.cxx

@@ -705,7 +705,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
     : rNode( rNd )
     , aPreDashReplacementText(rTxt)
     , pLanguage( pLang )
-    , rConversionMap( rConvMap )
+    , m_ModelToView( rConvMap )
     , nLen( 0 )
     , nOverriddenDashCount( 0 )
     , nWordType( nType )
@@ -746,7 +746,8 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
     }
     else
     {
-        ModelToViewHelper::ModelPosition aModelBeginPos = rConversionMap.ConvertToModelPosition( nBegin );
+        ModelToViewHelper::ModelPosition aModelBeginPos =
+            m_ModelToView.ConvertToModelPosition( nBegin );
         aCurrLang = rNd.GetLang( aModelBeginPos.mnPos );
     }
 }
@@ -807,7 +808,8 @@ sal_Bool SwScanner::NextWord()
                 if ( !pLanguage )
                 {
                     const sal_uInt16 nNextScriptType = g_pBreakIt->GetBreakIter()->getScriptType( aText, nBegin );
-                    ModelToViewHelper::ModelPosition aModelBeginPos = rConversionMap.ConvertToModelPosition( nBegin );
+                    ModelToViewHelper::ModelPosition aModelBeginPos =
+                        m_ModelToView.ConvertToModelPosition( nBegin );
                     aCurrLang = rNode.GetLang( aModelBeginPos.mnPos, 1, nNextScriptType );
                 }