diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 22:58:50 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 23:00:06 -0600 |
| commit | c617be8307033394bde4255c05b72dbd01ae0056 (patch) | |
| tree | bda35b72f8b61d71f22517a197517ec3bbffa0b0 /sw/source/filter/ww8 | |
| parent | ae0fa7cc62e1f57d22e68b2ef45086aeb1dfe41c (diff) | |
remove legacy String svl's Put*Entry family of function and convert users
Change-Id: Iebf4017ce4c2c48389716eac1bbf7f386ac7a296
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index a515b2c44503..2e08a761ba68 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -734,7 +734,7 @@ namespace sw sal_uInt16 nDocLang) { // tell the Formatter about the new entry - sal_uInt16 nCheckPos = 0; + sal_Int32 nCheckPos = 0; short nType = NUMBERFORMAT_DEFINED; sal_uInt32 nKey = 0; @@ -949,7 +949,9 @@ namespace sw if (bHijri) rParams.Insert(rtl::OUString("[~hijri]"), 0); - pFormatter->PutEntry(rParams, nCheckPos, nType, nKey, rLang); + OUString sTemp(rParams); + pFormatter->PutEntry(sTemp, nCheckPos, nType, nKey, rLang); + rParams = sTemp; return nKey; } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 037c4bed7c8f..1075590ab09a 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -633,12 +633,14 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat, if (bHijri) sParams.Insert(rtl::OUString("[~hijri]"), 0); - sal_uInt16 nCheckPos = 0; - sal_Int16 nType = NUMBERFORMAT_DEFINED; + sal_Int32 nCheckPos = 0; + short nType = NUMBERFORMAT_DEFINED; rFormat = 0; - pFormatter->PutandConvertEntry(sParams, nCheckPos, nType, rFormat, - LANGUAGE_ENGLISH_US, rLang); + OUString sTemp(sParams); + pFormatter->PutandConvertEntry(sTemp, nCheckPos, nType, rFormat, + LANGUAGE_ENGLISH_US, rLang); + sParams = sTemp; return bHasTime ? NUMBERFORMAT_DATETIME : NUMBERFORMAT_DATE; } |