From 48a4d615c85c58a06a50209bfbcc6e93145142fc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 6 Nov 2014 09:42:15 +0000 Subject: If XPersistObject support is dropped, all this unsupported old data can go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7000df307920b1b04b81cc4c436009cf6b6548e0 Reviewed-on: https://gerrit.libreoffice.org/12282 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svl/source/numbers/zforscan.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'svl/source/numbers/zforscan.cxx') diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 813dededb663..daf30c1f67f0 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -1241,14 +1241,14 @@ sal_Int32 ImpSvNumberformatScan::ScanType() if ( i < nAnzStrings-1 && nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && sStrArray[i+1][0] == '$' ) - { // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR + { eNewType = NUMBERFORMAT_CURRENCY; bMatchBracket = true; } else if ( i < nAnzStrings-1 && nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && sStrArray[i+1][0] == '~' ) - { // as of SV_NUMBERFORMATTER_VERSION_CALENDAR + { eNewType = NUMBERFORMAT_DATE; bMatchBracket = true; } @@ -1482,7 +1482,6 @@ int ImpSvNumberformatScan::FinalScanGetCalendar( sal_Int32& nPos, sal_uInt16& i, sStrArray[i+1][0] == '~' ) { // [~calendarID] - // as of SV_NUMBERFORMATTER_VERSION_CALENDAR nPos = nPos + sStrArray[i].getLength(); // [ nTypeArray[i] = NF_SYMBOLTYPE_CALDEL; nPos = nPos + sStrArray[++i].getLength(); // ~ @@ -2042,7 +2041,6 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString ) sStrArray[i+1][0] == '$' ) { // [$DM-xxx] - // As of SV_NUMBERFORMATTER_VERSION_NEW_CURR nPos = nPos + sStrArray[i].getLength(); // [ nTypeArray[i] = NF_SYMBOLTYPE_CURRDEL; nPos = nPos + sStrArray[++i].getLength(); // $ -- cgit v1.2.3