diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-01 13:39:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-01 14:19:25 +0100 |
| commit | d05a9ae25e4a397834330d868b68d92ca919e33b (patch) | |
| tree | 3a9702d4c56ef0bd995f97dc3cfb382953d1f6d3 /sw/source/filter/ww8/writerwordglue.cxx | |
| parent | 2655ef2d03b786b683723e92f3c76838fa012ab6 (diff) | |
Related: fdo#38838 remove UniString::AssignAscii
Change-Id: I263ef2594080ff7d47d5499c2b62e60e1689d2d6
Diffstat (limited to 'sw/source/filter/ww8/writerwordglue.cxx')
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index a4e6d9618661..8f879f3cfd5b 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -48,8 +48,6 @@ #include <breakit.hxx> #include <i18nlangtag/mslangid.hxx> -#define ASSIGN_CONST_ASC(s) AssignAscii(s) - using namespace css; namespace myImplHelpers @@ -314,14 +312,11 @@ namespace myImplHelpers return pColl ? 0 : maHelper.MakeStyle(aName); } - String FindBestMSSubstituteFont(const String &rFont) + OUString FindBestMSSubstituteFont(const OUString &rFont) { - String sRet; - if ( IsStarSymbol(rFont) ) - sRet.ASSIGN_CONST_ASC("Arial Unicode MS"); - else - sRet = GetSubsFontName(rFont, SUBSFONT_ONLYONE | SUBSFONT_MS); - return sRet; + if (IsStarSymbol(rFont)) + return OUString("Arial Unicode MS"); + return GetSubsFontName(rFont, SUBSFONT_ONLYONE | SUBSFONT_MS); } //Utility to remove entries before a given starting position |