diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-11 12:51:30 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-11 13:13:52 +0200 |
| commit | 4785fe1982837c0dc047158323e4c88701239790 (patch) | |
| tree | 3ece79d5019540e8f5af1ab59f798ba7a4e359db /sw | |
| parent | 8d92c5d1fa4216749c48e34e471f5362a0906a32 (diff) | |
MSWordExportBase::OutputTextNode: String -> OUString
Change-Id: I20da47b7a2aadd11199547673521332afbf23387
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 62b43a5d9d3e..e92b2ae9ee85 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1795,10 +1795,10 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) AppendWordBookmark( sBkmkName ); } - String aStr( rNode.GetTxt() ); + OUString aStr( rNode.GetTxt() ); - xub_StrLen nAktPos = 0; - xub_StrLen const nEnd = aStr.Len(); + sal_Int32 nAktPos = 0; + sal_Int32 const nEnd = aStr.getLength(); bool bRedlineAtEnd = false; int nOpenAttrWithRange = 0; @@ -1829,7 +1829,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) xub_StrLen nLen = nNextAttr - nAktPos; if ( !bTxtAtr && nLen ) { - sal_Unicode ch = aStr.GetChar( nAktPos ); + sal_Unicode ch = aStr[nAktPos]; int ofs = ( ch == CH_TXT_ATR_FIELDSTART || ch == CH_TXT_ATR_FIELDEND || ch == CH_TXT_ATR_FORMELEMENT? 1: 0 ); IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); @@ -1936,9 +1936,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) if ( isDropdownOrCheckbox ) AppendBookmark( pFieldmark->GetName(), false ); } - nLen -= static_cast< sal_uInt16 >( ofs ); + nLen -= static_cast< sal_Int32 >( ofs ); - String aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + static_cast< sal_uInt16 >( ofs ), nLen ) ); + String aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + static_cast< sal_Int32 >( ofs ), nLen ) ); if ( ( nTxtTyp == TXT_EDN || nTxtTyp == TXT_FTN ) && nAktPos == 0 && nLen > 0 ) { // Insert tab for aesthetic puposes #i24762# |