summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/writerwordglue.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8/writerwordglue.cxx')
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index b4afcffff739..f5e1f530c31f 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -453,10 +453,10 @@ namespace sw
FontMapExport::FontMapExport(const String &rFamilyName)
{
- xub_StrLen nIndex = 0;
+ sal_Int32 nIndex = 0;
msPrimary = GetNextFontToken(rFamilyName, nIndex);
msSecondary = myImplHelpers::FindBestMSSubstituteFont(msPrimary);
- if (!msSecondary.Len() && nIndex != STRING_NOTFOUND)
+ if (!msSecondary.Len() && nIndex != -1)
msSecondary = GetNextFontToken(rFamilyName, nIndex);
}
@@ -735,14 +735,14 @@ namespace sw
SwapQuotesInField(rParams);
// Force to Japanese when finding one of 'geaE'
- rtl::OUString sJChars( "geE" );
+ OUString sJChars( "geE" );
bool bForceJapanese = ( STRING_NOTFOUND != rParams.SearchChar( sJChars.getStr() ) );
if ( bForceJapanese )
{
- rParams.SearchAndReplaceAll( rtl::OUString( "ee" ),
- rtl::OUString( "yyyy" ) );
- rParams.SearchAndReplaceAll( rtl::OUString( "EE" ),
- rtl::OUString( "YYYY" ) );
+ rParams.SearchAndReplaceAll( OUString( "ee" ),
+ OUString( "yyyy" ) );
+ rParams.SearchAndReplaceAll( OUString( "EE" ),
+ OUString( "YYYY" ) );
}
if (LANGUAGE_FRENCH != nDocLang)
{