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 /svl | |
| parent | ae0fa7cc62e1f57d22e68b2ef45086aeb1dfe41c (diff) | |
remove legacy String svl's Put*Entry family of function and convert users
Change-Id: Iebf4017ce4c2c48389716eac1bbf7f386ac7a296
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/zforlist.hxx | 11 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 48 |
2 files changed, 0 insertions, 59 deletions
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 2b2d2586cbdd..b20d89c5b496 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -389,19 +389,12 @@ public: nType contains the type of the format. nKey contains the index key of the format. */ - bool PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, - LanguageType eLnge = LANGUAGE_DONTKNOW ); - bool PutEntry( OUString& rString, sal_Int32& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge = LANGUAGE_DONTKNOW ); /** Same as <method>PutEntry</method> but the format code string is considered to be of language/country eLnge and is converted to language/country eNewLnge */ - bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos, - short& nType, sal_uInt32& nKey, - LanguageType eLnge, LanguageType eNewLnge ); - bool PutandConvertEntry( OUString& rString, sal_Int32& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); @@ -414,10 +407,6 @@ public: short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); - bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos, - short& nType, sal_uInt32& nKey, - LanguageType eLnge, LanguageType eNewLnge ); - /** Similar to <method>PutEntry</method> and <method>PutandConvertEntry</method> or <method>PutandConvertEntrySystem</method>, the format code string diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 8592ebab702e..0440835e9214 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -562,36 +562,6 @@ bool SvNumberFormatter::PutEntry(OUString& rString, return bCheck; } -bool SvNumberFormatter::PutEntry(String& rString, xub_StrLen& nCheckPos, - short& nType, sal_uInt32& nKey, - LanguageType eLnge) -{ - // Wrapper to allow String to be used. - OUString aStr(rString); - sal_Int32 nPos = (nCheckPos == (xub_StrLen)0xFFFF) ? -1 : (sal_Int32)nCheckPos; - bool bRet = PutEntry(aStr, nPos, nType, nKey, eLnge); - rString = aStr; - nCheckPos = nPos < 0 ? (xub_StrLen)0xFFFF : (xub_StrLen)nPos; - return bRet; -} - -bool SvNumberFormatter::PutandConvertEntry(String& rString, - xub_StrLen& nCheckPos, - short& nType, - sal_uInt32& nKey, - LanguageType eLnge, - LanguageType eNewLnge) -{ - bool bRes; - if (eNewLnge == LANGUAGE_DONTKNOW) - eNewLnge = IniLnge; - - pFormatScanner->SetConvertMode(eLnge, eNewLnge); - bRes = PutEntry(rString, nCheckPos, nType, nKey, eLnge); - pFormatScanner->SetConvertMode(false); - return bRes; -} - bool SvNumberFormatter::PutandConvertEntry(OUString& rString, sal_Int32& nCheckPos, short& nType, @@ -628,24 +598,6 @@ bool SvNumberFormatter::PutandConvertEntrySystem(OUString& rString, return bRes; } -bool SvNumberFormatter::PutandConvertEntrySystem(String& rString, - xub_StrLen& nCheckPos, - short& nType, - sal_uInt32& nKey, - LanguageType eLnge, - LanguageType eNewLnge) -{ - bool bRes; - if (eNewLnge == LANGUAGE_DONTKNOW) - { - eNewLnge = IniLnge; - } - pFormatScanner->SetConvertMode(eLnge, eNewLnge, true); - bRes = PutEntry(rString, nCheckPos, nType, nKey, eLnge); - pFormatScanner->SetConvertMode(false); - return bRes; -} - sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString, LanguageType eLnge, LanguageType eSysLnge, short & rType, bool & rNewInserted, xub_StrLen & rCheckPos ) |