strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TODO: get rid of this in another incompatible build with SW project

Browse source 
Change-Id: Ic3fb0c8eb37317d55bcdc6abc7ff9843ba11fac6
This commit is contained in:
Caolán McNamara 2012-06-25 10:07:55 +01:00
parent 9928fd7fc6
commit 4ce70ccc2d
7 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
oox/source/export/drawingml.cxx
View file

@ -1449,7 +1449,8 @@ static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, Str
let words own font substitution kick in
*/
rChrSet = RTL_TEXTENCODING_UNICODE;
rFontName = ::GetFontToken(rFontName, 0);
xub_StrLen nIndex = 0;
rFontName = ::GetNextFontToken(rFontName, nIndex);
}
else
{

3
sd/source/filter/eppt/pptx-text.cxx
View file

@ -768,7 +768,8 @@ static void lcl_SubstituteBullet(rtl::OUString& rNumStr, rtl_TextEncoding& rChrS
let words own font substitution kick in
*/
rChrSet = RTL_TEXTENCODING_UNICODE;
rFontName = ::GetFontToken(rFontName, 0);
xub_StrLen nIndex = 0;
rFontName = ::GetNextFontToken(rFontName, nIndex);
}
else
{

3
sw/source/filter/ww8/writerhelper.cxx
View file

@ -631,7 +631,8 @@ namespace sw
bool IsStarSymbol(const rtl::OUString &rFontName)
{
rtl::OUString sFamilyNm(GetFontToken(rFontName, 0));
xub_StrLen nIndex = 0;
rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") ||
sFamilyNm.equalsIgnoreAsciiCase("opensymbol"));
}

7
sw/source/filter/ww8/writerwordglue.cxx
View file

@ -458,10 +458,11 @@ namespace sw
FontMapExport::FontMapExport(const String &rFamilyName)
{
msPrimary = GetFontToken(rFamilyName, 0);
xub_StrLen nIndex = 0;
msPrimary = GetNextFontToken(rFamilyName, nIndex);
msSecondary = myImplHelpers::FindBestMSSubstituteFont(msPrimary);
if (!msSecondary.Len())
msSecondary = GetFontToken(rFamilyName, 1);
if (!msSecondary.Len() && nIndex != STRING_NOTFOUND)
msSecondary = GetNextFontToken(rFamilyName, nIndex);
}
bool ItemSort::operator()(sal_uInt16 nA, sal_uInt16 nB) const

3
sw/source/filter/ww8/wrtw8num.cxx
View file

@ -724,7 +724,8 @@ void MSWordExportBase::SubstituteBullet( String& rNumStr,
let words own font substitution kick in
*/
rChrSet = RTL_TEXTENCODING_UNICODE;
rFontName = ::GetFontToken(rFontName, 0);
xub_StrLen nIndex = 0;
rFontName = ::GetNextFontToken(rFontName, nIndex);
}
else
{

11
unotools/inc/unotools/fontdefs.hxx
View file

@ -39,17 +39,6 @@ namespace utl {
UNOTOOLS_DLLPUBLIC String GetSubsFontName( const String& rName, sal_uLong nFlags );
// -----------------
// - FontTokenName -
// -----------------
UNOTOOLS_DLLPUBLIC String GetFontToken( const String& rName, xub_StrLen nToken, xub_StrLen& rIndex );
inline String GetFontToken( const String& rName, xub_StrLen nToken )
{
xub_StrLen nTempIndex = 0;
return GetFontToken( rName, nToken, nTempIndex );
}
UNOTOOLS_DLLPUBLIC void AddTokenFontName( String& rName, const String& rNewToken );
struct UNOTOOLS_DLLPUBLIC FontNameHash { int operator()(const String&) const; };

11
unotools/source/misc/fontdefs.cxx
View file

@ -477,17 +477,6 @@ String GetNextFontToken( const String& rTokenStr, xub_StrLen& rIndex )
return String( rTokenStr, nTokenStart, nTokenLen );
}
// TODO: get rid of this in another incompatible build with SW project.
// SW's WW8 and RTF filters still use this (from fontcvt.hxx)
String GetFontToken( const String& rTokenStr, xub_StrLen nToken, xub_StrLen& rIndex )
{
// skip nToken Tokens
for( xub_StrLen i = 0; (i < nToken) && (rIndex != STRING_NOTFOUND); ++i )
GetNextFontToken( rTokenStr, rIndex );
return GetNextFontToken( rTokenStr, rIndex );
}
// =======================================================================
static bool ImplIsFontToken( const String& rName, const String& rToken )