diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-19 11:33:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-19 13:26:09 +0200 |
| commit | cbe944e323edb20f958bb46ea644de659b75382e (patch) | |
| tree | c51e99e46e447f139fbbc48ff0d9aa8885e70a82 /lotuswordpro | |
| parent | 2f6af46dedcf3ad5ec3a40876dbf1120eec359b6 (diff) | |
Catch inadvertent uses of OUString(sal_Unicode) ctor
...with numeric values that are not meant to be characters. Inspired by
<https://gerrit.libreoffice.org/#/c/16339/> "OUString: add constructor from
single Unicode code point" and ecaf1cb3861c1b519a1495487fc796884cf37b92 "seems
to be what was meant." Found e46e8d19458fd64ff20b1013e5eeabd07e62379c "Shall
this produce a string representation of a number?" and
f2a0e4032734d6be635f14ade3dea499c29ec6c2 "Don't truncate a UTF-32 code point to
a UTF-16 code unit."
(LIBO_INTERNAL_ONLY mostly because it uses a C++11 delegating ctor for
simplicity, but also because it requires mild modifications to client code, see
additional changes in this commit and some other recent commits.)
Change-Id: I8a156f01d1b772c6052d7afaa088ae13ed234e2b
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfribmark.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx index 143a00f9365f..fa17d0110cd8 100644 --- a/lotuswordpro/source/filter/lwpfribmark.cxx +++ b/lotuswordpro/source/filter/lwpfribmark.cxx @@ -666,13 +666,13 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula) pDateStyle = new XFDateStyle; OUString sText; pDateStyle->AddYear(); - sText = OUString(0x5e74); + sText = OUString(sal_Unicode(0x5e74)); pDateStyle->AddText(sText); pDateStyle->AddMonth(false); - sText = OUString(0x6708); + sText = OUString(sal_Unicode(0x6708)); pDateStyle->AddText(sText); pDateStyle->AddMonthDay(false); - sText = OUString(0x65e5); + sText = OUString(sal_Unicode(0x65e5)); pDateStyle->AddText(sText); } else if (sFormula == "%FLoa" || sFormula == "%FLooaa" || sFormula == "%FLOA" ) @@ -680,10 +680,10 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula) pDateStyle = new XFDateStyle; OUString sText; pDateStyle->AddMonth(false); - sText = OUString(0x6708); + sText = OUString(sal_Unicode(0x6708)); pDateStyle->AddText(sText); pDateStyle->AddMonthDay(false); - sText = OUString(0x65e5); + sText = OUString(sal_Unicode(0x65e5)); pDateStyle->AddText(sText); } else if (sFormula == "%FLYYYY/M/D" || sFormula == "%FLGGGG/od/ad") @@ -973,10 +973,10 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula) pTimeStyle = new XFTimeStyle; pTimeStyle->AddHour(false); OUString sText; - sText = OUString(0x70b9); + sText = OUString(sal_Unicode(0x70b9)); pTimeStyle->AddText(sText); pTimeStyle->AddMinute(false); - sText = OUString(0x5206); + sText = OUString(sal_Unicode(0x5206)); pTimeStyle->AddText(sText); } else if (sFormula == "%FLjjjF" || sFormula == "%FLJJJFF" ) @@ -985,10 +985,10 @@ void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula) pTimeStyle->SetAmPm(true); pTimeStyle->AddHour(false); OUString sText; - sText = OUString(0x70b9); + sText = OUString(sal_Unicode(0x70b9)); pTimeStyle->AddText(sText); pTimeStyle->AddMinute(false); - sText = OUString(0x5206); + sText = OUString(sal_Unicode(0x5206)); pTimeStyle->AddText(sText); } //chinese version end |