[Libreoffice-commits] core.git: svl/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Aug 3 20:00:28 UTC 2017
svl/source/numbers/zformat.cxx | 8 +++---
svl/source/numbers/zforscan.cxx | 48 ++++++++++++++++++++--------------------
svl/source/numbers/zforscan.hxx | 6 ++---
3 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit db76b6e4f0bab7670a401c1b7b8b2ce92ef08a03
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Aug 3 11:49:40 2017 +0200
rename nAnzResStrings->nResultStringsCnt
Change-Id: I631236b5750f1ddb9828ab5ebd4c59e7f1b81390
Reviewed-on: https://gerrit.libreoffice.org/40710
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 1cdf9ddfa7aa..314ab233168d 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1070,7 +1070,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
sStr = sInsertCalendar + sStr;
}
sal_Int32 nStrPos = pSc->ScanFormat( sStr);
- sal_uInt16 nAnz = pSc->GetAnzResStrings();
+ sal_uInt16 nAnz = pSc->GetResultStringsCnt();
if (nAnz == 0) // error
{
nStrPos = 1;
@@ -1199,7 +1199,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
OUString aAdd( pSc->GetStandardName() );
if ( !pSc->ScanFormat( aAdd ) )
{
- sal_uInt16 nAnz = pSc->GetAnzResStrings();
+ sal_uInt16 nAnz = pSc->GetResultStringsCnt();
if ( nAnz )
{
NumFor[0].Enlarge(nAnz);
@@ -1219,7 +1219,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
OUString aAdd( pSc->GetStandardName() );
if ( !pSc->ScanFormat( aAdd ) )
{
- sal_uInt16 nAnz = pSc->GetAnzResStrings();
+ sal_uInt16 nAnz = pSc->GetResultStringsCnt();
if ( nAnz )
{
NumFor[nIndex].Enlarge(nAnz);
@@ -1237,7 +1237,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
OUString aAdd( pSc->GetStandardName() );
if ( !pSc->ScanFormat( aAdd ) )
{
- sal_uInt16 nAnz = pSc->GetAnzResStrings();
+ sal_uInt16 nAnz = pSc->GetResultStringsCnt();
if ( nAnz )
{
NumFor[nIndex].Enlarge(nAnz);
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 02e2b210bf4c..bb5f04b21275 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1082,7 +1082,7 @@ bool ImpSvNumberformatScan::IsLastBlankBeforeFrac(sal_uInt16 i)
void ImpSvNumberformatScan::Reset()
{
nStringsCnt = 0;
- nAnzResStrings = 0;
+ nResultStringsCnt = 0;
eScannedType = css::util::NumberFormat::UNDEFINED;
bExp = false;
bThousand = false;
@@ -1481,7 +1481,7 @@ bool ImpSvNumberformatScan::InsertSymbol( sal_uInt16 & nPos, svt::NfSymbolType e
sStrArray[i] = sStrArray[i-1];
}
}
- ++nAnzResStrings;
+ ++nResultStringsCnt;
nTypeArray[nPos] = static_cast<short>(eType);
sStrArray[nPos] = rStr;
return true;
@@ -1590,7 +1590,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
sal_Int32 nPos = 0; // error correction position
sal_uInt16 i = 0; // symbol loop counter
sal_uInt16 nCounter = 0; // counts digits
- nAnzResStrings = nStringsCnt; // counts remaining symbols
+ nResultStringsCnt = nStringsCnt; // counts remaining symbols
bDecSep = false; // reset in case already used in TypeCheck
bool bThaiT = false; // Thai T NatNum modifier present
bool bTimePart = false;
@@ -1831,7 +1831,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
nCounter++;
i++;
}
@@ -1859,7 +1859,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
i++; // eat it
}
else
@@ -1880,7 +1880,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
}
// Eat it, will be reinserted at proper grouping positions further down.
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
i++;
}
else if (i > 0 && (cPre == '#' || cPre == '0')
@@ -1909,7 +1909,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
rStr += rSepF;
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
nThousand++;
i++;
@@ -1941,7 +1941,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
rStr += rSepF;
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
nThousand++;
}
@@ -1971,7 +1971,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
i++;
}
}
@@ -1986,7 +1986,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
i++; // eat it
}
else if (bDecSep) // any .
@@ -1999,7 +1999,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
i++;
}
}
@@ -2050,7 +2050,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
i++;
}
}
@@ -2098,7 +2098,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
nPos = nPos + sStrArray[++i].getLength(); // $
sStrArray[i-1] += sStrArray[i]; // [$
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
if ( ++i >= nStringsCnt )
{
return nPos; // Error
@@ -2115,7 +2115,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
*pStr += sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
else
{
@@ -2129,7 +2129,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
*pStr += sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
}
i++;
@@ -2262,7 +2262,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
if (nFirstGroupingSymbol < nFirstDigitSymbol)
{
nTypeArray[nFirstGroupingSymbol] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
}
// Combine digits into groups to save memory (Info will be copied
@@ -2276,7 +2276,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
rStr += sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
}
}
@@ -2304,7 +2304,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
}
i++;
}
- else if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 )
+ else if ( (nCalRet = FinalScanGetCalendar( nPos, i, nResultStringsCnt )) != 0 )
{
if ( nCalRet < 0 )
{
@@ -2422,7 +2422,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
nCounter++;
i++;
}
@@ -2547,7 +2547,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
i++;
break;
case NF_SYMBOLTYPE_DEL:
- if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 )
+ if ( (nCalRet = FinalScanGetCalendar( nPos, i, nResultStringsCnt )) != 0 )
{
if ( nCalRet < 0 )
{
@@ -2573,7 +2573,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
nCounter++;
i++;
}
@@ -2885,7 +2885,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
for ( ; i<j; i++ )
{
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
i = j - 1;
continue; // for
@@ -3013,7 +3013,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
sStrArray[iPos] += sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
i++;
}
@@ -3050,7 +3050,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
// Remove T from format code, will be replaced with a [NatNum1] prefix.
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
- nAnzResStrings--;
+ nResultStringsCnt--;
}
else
{
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 51998e7d65dd..3a0a384fff6a 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -51,7 +51,7 @@ public:
void CopyInfo(ImpSvNumberformatInfo* pInfo,
sal_uInt16 nAnz); // Copies the FormatInfo
- sal_uInt16 GetAnzResStrings() const { return nAnzResStrings; }
+ sal_uInt16 GetResultStringsCnt() const { return nResultStringsCnt; }
const CharClass& GetChrCls() const { return *pFormatter->GetCharClass(); }
const LocaleDataWrapper& GetLoc() const { return *pFormatter->GetLocaleData(); }
@@ -159,7 +159,7 @@ private: // Private section
OUString sStrArray[NF_MAX_FORMAT_SYMBOLS]; // Array of symbols
short nTypeArray[NF_MAX_FORMAT_SYMBOLS]; // Array of infos
// External Infos:
- sal_uInt16 nAnzResStrings; // Result symbol count
+ sal_uInt16 nResultStringsCnt; // Result symbol count
short eScannedType; // Type according to scan
bool bThousand; // With thousands marker
sal_uInt16 nThousand; // Counts .... series
@@ -234,7 +234,7 @@ private: // Private section
sal_Int32 FinalScan( OUString& rString ); // Final analysis with supplied type
// -1:= error, return nPos in FinalScan; 0:= no calendar, 1:= calendar found
- int FinalScanGetCalendar( sal_Int32& nPos, sal_uInt16& i, sal_uInt16& nAnzResStrings );
+ int FinalScanGetCalendar( sal_Int32& nPos, sal_uInt16& i, sal_uInt16& nResultStringsCnt );
/** Insert symbol into nTypeArray and sStrArray, e.g. grouping separator.
If at nPos-1 a symbol type NF_SYMBOLTYPE_EMPTY is present, that is
More information about the Libreoffice-commits
mailing list