summaryrefslogtreecommitdiff
path: root/svl/source/numbers/zforscan.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-06 09:42:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-06 15:56:13 +0000
commit48a4d615c85c58a06a50209bfbcc6e93145142fc (patch)
tree454e3743daa81261287a1c0acf9a721fdae5e108 /svl/source/numbers/zforscan.cxx
parent9e05e45452bfc98c39f589b3f3b90c6596a638c9 (diff)
If XPersistObject support is dropped, all this unsupported old data can go
Change-Id: I7000df307920b1b04b81cc4c436009cf6b6548e0 Reviewed-on: https://gerrit.libreoffice.org/12282 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svl/source/numbers/zforscan.cxx')
-rw-r--r--svl/source/numbers/zforscan.cxx6
1 files changed, 2 insertions, 4 deletions
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(); // $