diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 10:26:35 +0100 |
|---|---|---|
| committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 10:26:35 +0100 |
| commit | 1649af2e208f82b7625537c149a0ee8e72a85c51 (patch) | |
| tree | 0d5195e0b0abfa6fada41313bdf9213e3d37a538 /writerfilter/source/dmapper/ConversionHelper.cxx | |
| parent | 36c323e365c3b480f10a2bb6c6227a4592f70c2a (diff) | |
RTL_CONSTASCII_USTRINGPARAM in filters 5
Diffstat (limited to 'writerfilter/source/dmapper/ConversionHelper.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 3d7c35052db2..1b98712beebd 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -418,7 +418,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) //todo: this cannot be the right way to replace a part of the string! aNewFormat.setCharAt( nI, 'Y' ); aNewFormat.setCharAt( nI + 1, 'Y' ); - aNewFormat.insert(nI + 2, ::rtl::OUString::createFromAscii("YY")); + aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YY"))); nLen+=2; nI+=3; } @@ -431,7 +431,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) //todo: this cannot be the right way to replace a part of the string! aNewFormat.setCharAt( nI, 'y' ); aNewFormat.setCharAt( nI + 1, 'y' ); - aNewFormat.insert(nI + 2, ::rtl::OUString::createFromAscii("yy")); + aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("yy"))); nLen+=2; nI+=3; } @@ -442,7 +442,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) // MM We have to escape '/' in case it's used as a char //todo: this cannot be the right way to replace a part of the string! aNewFormat.setCharAt( nI, '\\' ); - aNewFormat.insert(nI + 1, ::rtl::OUString::createFromAscii("/")); + aNewFormat.insert(nI + 1, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))); nI++; nLen++; } @@ -455,18 +455,18 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) if (bForceJapanese) { - rLocale.Language = ::rtl::OUString::createFromAscii("ja"); - rLocale.Country = ::rtl::OUString::createFromAscii("JP"); + rLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja")); + rLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP")); } if (bForceNatNum) { - aNewFormat.insert( 0, ::rtl::OUString::createFromAscii("[NatNum1][$-411]")); + aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[NatNum1][$-411]"))); } if (bHijri) { - aNewFormat.insert( 0, ::rtl::OUString::createFromAscii("[~hijri]")); + aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[~hijri]"))); } return aNewFormat.makeStringAndClear(); |