From 4ce70ccc2d62769b138144de7798bf839ddd00f2 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 25 Jun 2012 10:07:55 +0100
Subject: TODO: get rid of this in another incompatible build with SW project

Change-Id: Ic3fb0c8eb37317d55bcdc6abc7ff9843ba11fac6
---
 sw/source/filter/ww8/writerhelper.cxx   | 3 ++-
 sw/source/filter/ww8/writerwordglue.cxx | 7 ++++---
 sw/source/filter/ww8/wrtw8num.cxx       | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'sw/source')

diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 97038a72856d..69114a4c8f67 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -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"));
         }
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index f731c5df0b77..8816e7b61bc8 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -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
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index bbcf2449c2f3..52a50cb975bb 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -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
      {
-- 
cgit