summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-07 17:34:55 +0200
committerMichael Stahl <mstahl@redhat.com>2014-04-08 12:12:24 +0200
commit6c59177ba3a4f005c79f086b28cafd63332bf3de (patch)
tree09756af76de1269f9622163b86099356539906f8 /sw/source/core
parente89caa7db17676e6f5889fa9ac3ef3592ef2e9b4 (diff)
rename misleading SwScanner::rConversionMap
Change-Id: I6f93eae5377c95ec47348b01b3414855b05a525e
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/txtnode/txtedt.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 3c8adbec8b3b..417c3cf5c481 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/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 );
}