Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4331
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/4331/1
Translate German comments, correct some WS
Change-Id: Ied6c233cba113673f928c1a6b41a5217b9fff077
---
M svl/source/numbers/numfmuno.cxx
M svl/source/numbers/zforscan.cxx
2 files changed, 214 insertions(+), 235 deletions(-)
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 40f34e9..826d53d 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -34,14 +34,10 @@
using namespace com::sun::star;
-//------------------------------------------------------------------------
-
#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter"
#define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings"
#define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats"
#define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties"
-
-//------------------------------------------------------------------------
#define PROPERTYNAME_FMTSTR "FormatString"
#define PROPERTYNAME_LOCALE "Locale"
@@ -62,9 +58,7 @@
#define PROPERTYNAME_STDDEC "StandardDecimals"
#define PROPERTYNAME_TWODIGIT "TwoDigitDateStart"
-//------------------------------------------------------------------------
-
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// All without a Which-ID, Map only for PropertySetInfo
static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
{
@@ -101,8 +95,6 @@
return aNumberSettingsPropertyMap_Impl;
}
-//----------------------------------------------------------------------------------------
-
static LanguageType lcl_GetLanguage( const lang::Locale& rLocale )
{
// empty language -> LANGUAGE_SYSTEM
@@ -111,12 +103,10 @@
LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false );
if ( eRet == LANGUAGE_NONE )
- eRet = LANGUAGE_SYSTEM; //! or throw an exception?
+ eRet = LANGUAGE_SYSTEM; //! or throw an exception?
return eRet;
}
-
-//----------------------------------------------------------------------------------------
SvNumberFormatterServiceObj::SvNumberFormatterServiceObj()
:m_aMutex()
@@ -145,7 +135,7 @@
SvNumberFormatsSupplierObj* pNew = SvNumberFormatsSupplierObj::getImplementation(
_xSupplier );
if (!pNew)
- throw uno::RuntimeException(); // wrong object
+ throw uno::RuntimeException(); // wrong object
xAutoReleaseOld = xSupplier;
@@ -231,7 +221,7 @@
{
::osl::MutexGuard aGuard( m_aMutex );
- util::Color nRet = aDefaultColor; // color = sal_Int32
+ util::Color nRet = aDefaultColor; // color = sal_Int32
SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL;
if (pFormatter)
{
@@ -240,7 +230,7 @@
pFormatter->GetOutputString(fValue, nKey, aStr, &pColor);
if (pColor)
nRet = pColor->GetColor();
- // sonst Default behalten
+ // Else keep Default
}
else
throw uno::RuntimeException();
@@ -276,7 +266,7 @@
{
::osl::MutexGuard aGuard( m_aMutex );
- util::Color nRet = aDefaultColor; // color = sal_Int32
+ util::Color nRet = aDefaultColor; // color = sal_Int32
SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL;
if (pFormatter)
{
@@ -288,7 +278,7 @@
{
nRet = pColor->GetColor();
}
- // sonst Default behalten
+ // Else keep Default
}
else
{
@@ -354,7 +344,7 @@
{
::osl::MutexGuard aGuard( m_aMutex );
- util::Color nRet = aDefaultColor; // color = sal_Int32
+ util::Color nRet = aDefaultColor; // color = sal_Int32
SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL;
if (pFormatter)
{
@@ -372,7 +362,7 @@
{
if (pColor)
nRet = pColor->GetColor();
- // sonst Default behalten
+ // Else keep Default
}
else
throw util::MalformedNumberFormatException();
@@ -405,8 +395,6 @@
pArray[0] = SERVICENAME_NUMBERFORMATTER;
return aRet;
}
-
-//------------------------------------------------------------------------
SvNumberFormatsObj::SvNumberFormatsObj( SvNumberFormatsSupplierObj& _rParent,
::comphelper::SharedMutex& _rMutex )
:rSupplier( _rParent )
@@ -477,7 +465,7 @@
LanguageType eLang = lcl_GetLanguage( nLocale );
if (bScan)
{
- //! irgendwas muss hier noch passieren...
+ //! FIXME: Something still needs to happen here ...
}
nRet = pFormatter->GetEntryKey( aFormat, eLang );
}
@@ -507,10 +495,10 @@
nRet = nKey;
else if (nCheckPos)
{
- throw util::MalformedNumberFormatException(); // ungueltiges Format
+ throw util::MalformedNumberFormatException(); // Invalid Format
}
else
- throw uno::RuntimeException(); // anderer Fehler (z.B. schon
vorhanden)
+ throw uno::RuntimeException(); // Other error (e.g. already added)
}
else
throw uno::RuntimeException();
@@ -540,10 +528,10 @@
nRet = nKey;
else if (nCheckPos)
{
- throw util::MalformedNumberFormatException(); // ungueltiges Format
+ throw util::MalformedNumberFormatException(); // Invalid format
}
else
- throw uno::RuntimeException(); // anderer Fehler (z.B. schon
vorhanden)
+ throw uno::RuntimeException(); // Other error (e.g. already added)
}
else
throw uno::RuntimeException();
@@ -559,7 +547,7 @@
if (pFormatter)
{
pFormatter->DeleteEntry(nKey);
- rSupplier.NumberFormatDeleted(nKey); // Benachrichtigung fuers Dokument
+ rSupplier.NumberFormatDeleted(nKey); // Notification for the Document
}
}
@@ -615,8 +603,8 @@
if (pFormatter)
{
LanguageType eLang = lcl_GetLanguage( nLocale );
- // mask out "defined" bit, so type from an existing number format
- // can directly be used for getStandardFormat
+ // Mask out "defined" bit, so type from an existing number format
+ // can directly be used for getStandardFormat
nType &= ~NUMBERFORMAT_DEFINED;
nRet = pFormatter->GetStandardFormat(nType, eLang);
}
@@ -700,8 +688,6 @@
return aRet;
}
-//------------------------------------------------------------------------
-
SvNumberFormatObj::SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_uLong nK, const
::comphelper::SharedMutex& _rMutex )
:rSupplier( rParent )
,nKey( nK )
@@ -732,7 +718,7 @@
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
- throw beans::UnknownPropertyException(); // everything is read-only
+ throw beans::UnknownPropertyException(); // Everything is read-only
}
uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aPropertyName )
@@ -768,7 +754,7 @@
}
else if (aPropertyName.equalsAscii( PROPERTYNAME_STDFORM ))
{
- //! SvNumberformat Member bStandard rausreichen?
+ //! Pass through SvNumberformat Member bStandard?
sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
aRet.setValue( &bStandard, getBooleanCppuType() );
}
@@ -885,7 +871,7 @@
OUString aFmtStr = pFormat->GetFormatstring();
OUString aComment = pFormat->GetComment();
sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
- //! SvNumberformat Member bStandard rausreichen?
+ //! Pass through SvNumberformat Member bStandard?
sal_Bool bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 );
bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading;
@@ -933,7 +919,7 @@
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
- throw beans::UnknownPropertyException(); // everything is read-only
+ throw beans::UnknownPropertyException(); // Everything is read-only
}
// XServiceInfo
@@ -958,8 +944,6 @@
pArray[0] = SERVICENAME_NUMBERFORMAT;
return aRet;
}
-
-//------------------------------------------------------------------------
SvNumberFormatSettingsObj::SvNumberFormatSettingsObj( SvNumberFormatsSupplierObj& rParent, const
::comphelper::SharedMutex& _rMutex )
:rSupplier( rParent )
@@ -1119,6 +1103,5 @@
pArray[0] = SERVICENAME_NUMBERSETTINGS;
return aRet;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 87d518b..2c05559 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -86,8 +86,8 @@
sKeyword[NF_KEY_NNNN] = "NNNN"; // Day of week long incl. separator
sKeyword[NF_KEY_WW] = "WW"; // Week of year
sKeyword[NF_KEY_CCC] = "CCC"; // Currency abbreviation
- bKeywordsNeedInit = true; // locale dependent keywords
- bCompatCurNeedInit = true; // locale dependent compatibility currency strings
+ bKeywordsNeedInit = true; // locale dependent keywords
+ bCompatCurNeedInit = true; // locale dependent compatibility currency strings
StandardColor[0] = Color(COL_BLACK);
StandardColor[1] = Color(COL_LIGHTBLUE);
@@ -261,13 +261,13 @@
case LANGUAGE_GERMAN_LUXEMBOURG:
case LANGUAGE_GERMAN_LIECHTENSTEIN:
//! all capital letters
- sKeyword[NF_KEY_M] = "M"; // month 1
- sKeyword[NF_KEY_MM] = "MM"; // month 01
- sKeyword[NF_KEY_MMM] = "MMM"; // month Jan
- sKeyword[NF_KEY_MMMM] = "MMMM"; // month Januar
- sKeyword[NF_KEY_MMMMM] = "MMMMM";// month J
- sKeyword[NF_KEY_H] = "H"; // hour 2
- sKeyword[NF_KEY_HH] = "HH"; // hour 02
+ sKeyword[NF_KEY_M] = "M"; // month 1
+ sKeyword[NF_KEY_MM] = "MM"; // month 01
+ sKeyword[NF_KEY_MMM] = "MMM"; // month Jan
+ sKeyword[NF_KEY_MMMM] = "MMMM"; // month Januar
+ sKeyword[NF_KEY_MMMMM] = "MMMMM"; // month J
+ sKeyword[NF_KEY_H] = "H"; // hour 2
+ sKeyword[NF_KEY_HH] = "HH"; // hour 02
sKeyword[NF_KEY_D] = "T";
sKeyword[NF_KEY_DD] = "TT";
sKeyword[NF_KEY_DDD] = "TTT";
@@ -489,7 +489,7 @@
if (bConvertMode)
{
pFormatter->ChangeIntl(eNewLnge);
- sStr = GetKeywords()[NF_KEY_COLOR] + sStr; // Color -> FARBE
+ sStr = GetKeywords()[NF_KEY_COLOR] + sStr; // Color -> FARBE
pFormatter->ChangeIntl(eTmpLnge);
}
else
@@ -515,7 +515,7 @@
if (bConvertMode)
{
pFormatter->ChangeIntl(eNewLnge);
- sStr = GetKeywords()[NF_KEY_FIRSTCOLOR+i]; // red -> rot
+ sStr = GetKeywords()[NF_KEY_FIRSTCOLOR+i]; // red -> rot
pFormatter->ChangeIntl(eTmpLnge);
}
else
@@ -579,48 +579,49 @@
{
i = NF_KEY_THAI_T;
}
- return i; // 0 => not found
+ return i; // 0 => not found
}
-//---------------------------------------------------------------------------
-// Next_Symbol
-//---------------------------------------------------------------------------
-// Zerlegt die Eingabe in Symbole fuer die weitere
-// Verarbeitung (Turing-Maschine).
-//---------------------------------------------------------------------------
-// Ausgangs Zustand = SsStart
-//---------------+-------------------+-----------------------+---------------
-// Alter Zustand | gelesenes Zeichen | Aktion | Neuer Zustand
-//---------------+-------------------+-----------------------+---------------
-// SsStart | Buchstabe | Symbol=Zeichen | SsGetWord
-// | " | Typ = String | SsGetString
-// | \ | Typ = String | SsGetChar
-// | * | Typ = Star | SsGetStar
-// | _ | Typ = Blank | SsGetBlank
-// | @ # 0 ? / . , % [ | Symbol = Zeichen; |
-// | ] ' Blank | Typ = Steuerzeichen | SsStop
-// | $ - + ( ) : | Typ = String; |
-// | Sonst | Symbol = Zeichen | SsStop
-//---------------|-------------------+-----------------------+---------------
-// SsGetChar | Sonst | Symbol=Zeichen | SsStop
-//---------------+-------------------+-----------------------+---------------
-// GetString | " | | SsStop
-// | Sonst | Symbol+=Zeichen | GetString
-//---------------+-------------------+-----------------------+---------------
-// SsGetWord | Buchstabe | Symbol += Zeichen |
-// | + - (E+ E-)| Symbol += Zeichen | SsStop
-// | / (AM/PM)| Symbol += Zeichen |
-// | Sonst | Pos--, if Key Typ=Word| SsStop
-//---------------+-------------------+-----------------------+---------------
-// SsGetStar | Sonst | Symbol+=Zeichen | SsStop
-// | | markiere Sonderfall * |
-//---------------+-------------------+-----------------------+---------------
-// SsGetBlank | Sonst | Symbol+=Zeichen | SsStop
-// | | markiere Sonderfall _ |
-//---------------+-------------------+-----------------------+---------------
-// Wurde im State SsGetWord ein Schluesselwort erkannt (auch als
-// Anfangsteilwort des Symbols)
-// so werden die restlichen Buchstaben zurueckgeschrieben !!
+/**
+ * Next_Symbol
+ *
+ * Splits up the input for further processing (by the Turing machine).
+ *
+ * Starting state = SsStar
+ *
+ * ---------------+-------------------+---------------------------+---------------
+ * Old state | Character read | Event | New state
+ * ---------------+-------------------+---------------------------+---------------
+ * SsStart | Character | Symbol = Character | SsGetWord
+ * | " | Type = String | SsGetString
+ * | \ | Type = String | SsGetChar
+ * | * | Type = Star | SsGetStar
+ * | _ | Type = Blank | SsGetBlank
+ * | @ # 0 ? / . , % [ | Symbol = Character; |
+ * | ] ' Blank | Type = Control character | SsStop
+ * | $ - + ( ) : | Type = String; |
+ * | Else | Symbol = Character | SsStop
+ * ---------------|-------------------+---------------------------+---------------
+ * SsGetChar | Else | Symbol = Character | SsStop
+ * ---------------+-------------------+---------------------------+---------------
+ * GetString | " | | SsStop
+ * | Else | Symbol += Character | GetString
+ * ---------------+-------------------+---------------------------+---------------
+ * SsGetWord | Character | Symbol += Character |
+ * | + - (E+ E-)| Symbol += Character | SsStop
+ * | / (AM/PM)| Symbol += Character |
+ * | Else | Pos--, if Key Type = Word | SsStop
+ * ---------------+-------------------+---------------------------+---------------
+ * SsGetStar | Else | Symbol += Character | SsStop
+ * | | Mark special case * |
+ * ---------------+-------------------+---------------------------+---------------
+ * SsGetBlank | Else | Symbol + =Character | SsStop
+ * | | Mark special case _ |
+ * ---------------------------------------------------------------+--------------
+ *
+ * If we recognize a keyword in the state SsGetWord (even as the symbol's start text)
+ * we write back the rest of the characters!
+ */
enum ScanState
{
@@ -831,7 +832,7 @@
sal_Unicode cNext;
switch (cToken)
{
- case '/': // AM/PM, A/P
+ case '/': // AM/PM, A/P
cNext = rStr[nPos];
if ( cNext == 'P' || cNext == 'p' )
{
@@ -860,7 +861,7 @@
case SsGetStar:
eState = SsStop;
sSymbol += OUString(cToken);
- nRepPos = (nPos - nStart) - 1; // everytime > 0!!
+ nRepPos = (nPos - nStart) - 1; // everytime > 0!!
break;
case SsGetBlank:
eState = SsStop;
@@ -868,8 +869,8 @@
break;
default:
break;
- } // of switch
- } // of while
+ } // of switch
+ } // of while
if (eState == SsGetWord)
{
eType = NF_SYMBOLTYPE_STRING;
@@ -880,7 +881,7 @@
sal_Int32 ImpSvNumberformatScan::Symbol_Division(const OUString& rString)
{
nCurrPos = -1;
- // Ist Waehrung im Spiel?
+ // Do we have some sort of currency?
OUString sString = pFormatter->GetCharClass()->uppercase(rString);
sal_Int32 nCPos = 0;
while (nCPos >= 0)
@@ -888,31 +889,30 @@
nCPos = sString.indexOf(GetCurString(),nCPos);
if (nCPos >= 0)
{
- // in Quotes?
+ // In Quotes?
sal_Int32 nQ = SvNumberformat::GetQuoteEnd( sString, nCPos );
if ( nQ < 0 )
{
sal_Unicode c;
if ( nCPos == 0 ||
((c = sString[nCPos-1]) != '"'
- && c != '\\') ) // dm kann durch "dm
- { // \d geschuetzt werden
+ && c != '\\') ) // dm can be protected by "dm \d
nCurrPos = nCPos;
nCPos = -1;
}
else
{
- nCPos++; // weitersuchen
+ nCPos++; // Continue search
}
}
else
{
- nCPos = nQ + 1; // weitersuchen
+ nCPos = nQ + 1; // Continue search
}
}
}
nAnzStrings = 0;
- bool bStar = false; // wird bei '*'Detektion gesetzt
+ bool bStar = false; // Is set on detecting '*'
Reset();
sal_Int32 nPos = 0;
@@ -921,10 +921,10 @@
{
nTypeArray[nAnzStrings] = Next_Symbol(rString, nPos, sStrArray[nAnzStrings]);
if (nTypeArray[nAnzStrings] == NF_SYMBOLTYPE_STAR)
- { // Ueberwachung des '*'
+ { // Monitoring the '*'
if (bStar)
{
- return nPos; // Fehler: doppelter '*'
+ return nPos; // Error: double '*'
}
else
{
@@ -934,7 +934,7 @@
nAnzStrings++;
}
- return 0; // 0 => ok
+ return 0; // 0 => ok
}
void ImpSvNumberformatScan::SkipStrings(sal_uInt16& i, sal_Int32& nPos)
@@ -1063,14 +1063,14 @@
res = false;
}
}
- if (!bStop) // kein '/'{
+ if (!bStop) // no '/'{
{
res = false;
}
}
else
{
- res = false; // kein '/' mehr
+ res = false; // no '/' any more
}
return res;
}
@@ -1110,7 +1110,7 @@
return (nIndexPre == NF_KEY_S || nIndexPre == NF_KEY_SS) &&
(bHadDecSep ||
( i > 0 && nTypeArray[i-1] == NF_SYMBOLTYPE_STRING));
- // SS"any"00 take "any" as a valid decimal separator
+ // SS"any"00 take "any" as a valid decimal separator
}
sal_Int32 ImpSvNumberformatScan::ScanType()
@@ -1121,13 +1121,13 @@
sal_uInt16 i = 0;
short eNewType;
bool bMatchBracket = false;
- bool bHaveGeneral = false; // if General/Standard encountered
+ bool bHaveGeneral = false; // if General/Standard encountered
SkipStrings(i, nPos);
while (i < nAnzStrings)
{
if (nTypeArray[i] > 0)
- { // keyword
+ { // keyword
sal_uInt16 nIndexPre;
sal_uInt16 nIndexNex;
sal_Unicode cChar;
@@ -1151,50 +1151,50 @@
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
cChar = PreviousChar(i);
- if (nIndexPre == NF_KEY_H || // H
- nIndexPre == NF_KEY_HH || // HH
- nIndexNex == NF_KEY_S || // S
- nIndexNex == NF_KEY_SS || // SS
- cChar == '[' ) // [M
+ if (nIndexPre == NF_KEY_H || // H
+ nIndexPre == NF_KEY_HH || // HH
+ nIndexNex == NF_KEY_S || // S
+ nIndexNex == NF_KEY_SS || // SS
+ cChar == '[' ) // [M
{
eNewType = NUMBERFORMAT_TIME;
- nTypeArray[i] -= 2; // 6 -> 4, 7 -> 5
+ nTypeArray[i] -= 2; // 6 -> 4, 7 -> 5
}
else
{
eNewType = NUMBERFORMAT_DATE;
}
break;
- case NF_KEY_MMM: // MMM
- case NF_KEY_MMMM: // MMMM
- case NF_KEY_MMMMM: // MMMMM
- case NF_KEY_Q: // Q
- case NF_KEY_QQ: // QQ
- case NF_KEY_D: // D
- case NF_KEY_DD: // DD
- case NF_KEY_DDD: // DDD
- case NF_KEY_DDDD: // DDDD
- case NF_KEY_YY: // YY
- case NF_KEY_YYYY: // YYYY
- case NF_KEY_NN: // NN
- case NF_KEY_NNN: // NNN
- case NF_KEY_NNNN: // NNNN
- case NF_KEY_WW : // WW
- case NF_KEY_AAA : // AAA
- case NF_KEY_AAAA : // AAAA
- case NF_KEY_EC : // E
- case NF_KEY_EEC : // EE
- case NF_KEY_G : // G
- case NF_KEY_GG : // GG
- case NF_KEY_GGG : // GGG
- case NF_KEY_R : // R
- case NF_KEY_RR : // RR
+ case NF_KEY_MMM: // MMM
+ case NF_KEY_MMMM: // MMMM
+ case NF_KEY_MMMMM: // MMMMM
+ case NF_KEY_Q: // Q
+ case NF_KEY_QQ: // QQ
+ case NF_KEY_D: // D
+ case NF_KEY_DD: // DD
+ case NF_KEY_DDD: // DDD
+ case NF_KEY_DDDD: // DDDD
+ case NF_KEY_YY: // YY
+ case NF_KEY_YYYY: // YYYY
+ case NF_KEY_NN: // NN
+ case NF_KEY_NNN: // NNN
+ case NF_KEY_NNNN: // NNNN
+ case NF_KEY_WW : // WW
+ case NF_KEY_AAA : // AAA
+ case NF_KEY_AAAA : // AAAA
+ case NF_KEY_EC : // E
+ case NF_KEY_EEC : // EE
+ case NF_KEY_G : // G
+ case NF_KEY_GG : // GG
+ case NF_KEY_GGG : // GGG
+ case NF_KEY_R : // R
+ case NF_KEY_RR : // RR
eNewType = NUMBERFORMAT_DATE;
break;
- case NF_KEY_CCC: // CCC
+ case NF_KEY_CCC: // CCC
eNewType = NUMBERFORMAT_CURRENCY;
break;
- case NF_KEY_GENERAL: // Standard
+ case NF_KEY_GENERAL: // Standard
eNewType = NUMBERFORMAT_NUMBER;
bHaveGeneral = true;
break;
@@ -1204,7 +1204,7 @@
}
}
else
- { // control character
+ { // control character
switch ( sStrArray[i][0] )
{
case '#':
@@ -1272,7 +1272,7 @@
default:
if (pLoc->getTime100SecSep().equals(sStrArray[i]))
{
- bDecSep = true; // for SS,0
+ bDecSep = true; // for SS,0
}
eNewType = NUMBERFORMAT_UNDEFINED;
break;
@@ -1284,10 +1284,10 @@
}
else if (eScannedType == NUMBERFORMAT_TEXT || eNewType == NUMBERFORMAT_TEXT)
{
- eScannedType = NUMBERFORMAT_TEXT; // Text bleibt immer Text
+ eScannedType = NUMBERFORMAT_TEXT; // Text always remains text
}
else if (eNewType == NUMBERFORMAT_UNDEFINED)
- { // bleibt wie bisher
+ { // Remains as is
}
else if (eScannedType != eNewType)
{
@@ -1355,7 +1355,7 @@
case NUMBERFORMAT_PERCENT:
switch (eNewType)
{
- case NUMBERFORMAT_NUMBER: // nur Zahl nach Prozent
+ case NUMBERFORMAT_NUMBER: // Only number to percent
break;
default:
return nPos;
@@ -1364,7 +1364,7 @@
case NUMBERFORMAT_SCIENTIFIC:
switch (eNewType)
{
- case NUMBERFORMAT_NUMBER: // nur Zahl nach E
+ case NUMBERFORMAT_NUMBER: // Only number to E
break;
default:
return nPos;
@@ -1393,7 +1393,7 @@
case NUMBERFORMAT_FRACTION:
switch (eNewType)
{
- case NUMBERFORMAT_NUMBER: // nur Zahl nach Bruch
+ case NUMBERFORMAT_NUMBER: // Only number to fraction
break;
default:
return nPos;
@@ -1403,7 +1403,7 @@
break;
}
}
- nPos = nPos + sStrArray[i].getLength(); // Korrekturposition
+ nPos = nPos + sStrArray[i].getLength(); // Position of correction
i++;
if ( bMatchBracket )
{ // no type detection inside of matching brackets if [$...], [~...]
@@ -1423,7 +1423,7 @@
}
if ( bMatchBracket )
{
- return nPos; // missing closing bracket at end of code
+ return nPos; // missing closing bracket at end of code
}
}
SkipStrings(i, nPos);
@@ -1433,13 +1433,13 @@
eScannedType == NUMBERFORMAT_UNDEFINED) &&
nCurrPos >= 0 && !bHaveGeneral)
{
- eScannedType = NUMBERFORMAT_CURRENCY; // old "automatic" currency
+ eScannedType = NUMBERFORMAT_CURRENCY; // old "automatic" currency
}
if (eScannedType == NUMBERFORMAT_UNDEFINED)
{
eScannedType = NUMBERFORMAT_DEFINED;
}
- return 0; // Alles ok
+ return 0; // All is fine
}
bool ImpSvNumberformatScan::InsertSymbol( sal_uInt16 & nPos, svt::NfSymbolType eType, const
OUString& rStr )
@@ -1450,7 +1450,7 @@
}
if (nPos > 0 && nTypeArray[nPos-1] == NF_SYMBOLTYPE_EMPTY)
{
- --nPos; // reuse position
+ --nPos; // reuse position
}
else
{
@@ -1483,17 +1483,17 @@
// as of SV_NUMBERFORMATTER_VERSION_CALENDAR
nPos = nPos + sStrArray[i].getLength(); // [
nTypeArray[i] = NF_SYMBOLTYPE_CALDEL;
- nPos = nPos + sStrArray[++i].getLength(); // ~
- sStrArray[i-1] += sStrArray[i]; // [~
+ nPos = nPos + sStrArray[++i].getLength(); // ~
+ sStrArray[i-1] += sStrArray[i]; // [~
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
rAnzResStrings--;
if ( ++i >= nAnzStrings )
{
- return -1; // error
+ return -1; // error
}
nPos = nPos + sStrArray[i].getLength(); // calendarID
OUString& rStr = sStrArray[i];
- nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR; // convert
+ nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR; // convert
i++;
while ( i < nAnzStrings && sStrArray[i][0] != ']' )
{
@@ -1512,7 +1512,7 @@
}
else
{
- return -1; // error
+ return -1; // error
}
return 1;
}
@@ -1573,7 +1573,7 @@
case NF_SYMBOLTYPE_BLANK:
case NF_SYMBOLTYPE_STAR:
break;
- case NF_KEY_GENERAL : // #77026# "General" is the same as "@"
+ case NF_KEY_GENERAL: // #77026# "General" is the same as "@"
break;
default:
if ( nTypeArray[i] != NF_SYMBOLTYPE_DEL ||
@@ -1585,7 +1585,7 @@
}
nPos = nPos + sStrArray[i].getLength();
i++;
- } // of while
+ } // of while
break;
case NUMBERFORMAT_NUMBER:
@@ -1597,20 +1597,20 @@
{
// TODO: rechecking eScannedType is unnecessary.
// This switch-case is for eScannedType == NUMBERFORMAT_FRACTION anyway
- if (eScannedType == NUMBERFORMAT_FRACTION && // special case
+ if (eScannedType == NUMBERFORMAT_FRACTION && // special case
nTypeArray[i] == NF_SYMBOLTYPE_DEL && // # ### #/#
- StringEqualsChar( sOldThousandSep, ' ' ) && // e.g. France or Sweden
+ StringEqualsChar( sOldThousandSep, ' ' ) && // e.g. France or Sweden
StringEqualsChar( sStrArray[i], ' ' ) &&
!bFrac &&
IsLastBlankBeforeFrac(i) )
{
nTypeArray[i] = NF_SYMBOLTYPE_STRING; // del->string
- } // kein Taus.p.
+ } // No thousands marker
if (nTypeArray[i] == NF_SYMBOLTYPE_BLANK ||
nTypeArray[i] == NF_SYMBOLTYPE_STAR ||
- nTypeArray[i] == NF_KEY_CCC || // CCC
- nTypeArray[i] == NF_KEY_GENERAL ) // Standard
+ nTypeArray[i] == NF_KEY_CCC || // CCC
+ nTypeArray[i] == NF_KEY_GENERAL ) // Standard
{
if (nTypeArray[i] == NF_KEY_GENERAL)
{
@@ -1623,13 +1623,13 @@
nPos = nPos + sStrArray[i].getLength();
i++;
}
- else if (nTypeArray[i] == NF_SYMBOLTYPE_STRING || // Strings oder
- nTypeArray[i] > 0) // Keywords
+ else if (nTypeArray[i] == NF_SYMBOLTYPE_STRING || // No Strings or
+ nTypeArray[i] > 0) // Keywords
{
if (eScannedType == NUMBERFORMAT_SCIENTIFIC &&
- nTypeArray[i] == NF_KEY_E) // E+
+ nTypeArray[i] == NF_KEY_E) // E+
{
- if (bExp) // doppelt
+ if (bExp) // Double
{
return nPos;
}
@@ -1649,11 +1649,11 @@
else if (eScannedType == NUMBERFORMAT_FRACTION &&
sStrArray[i][0] == ' ')
{
- if (!bBlank && !bFrac) // nicht doppelt oder hinter /
+ if (!bBlank && !bFrac) // Not double or after a /
{
- if (bDecSep && nCounter > 0) // Nachkommastellen
+ if (bDecSep && nCounter > 0) // Decimal places
{
- return nPos; // Fehler
+ return nPos; // Error
}
bBlank = true;
nBlankPos = i;
@@ -1678,12 +1678,12 @@
}
if (OUString::valueOf(sDiv.toInt32()) == sDiv)
{
- /* Found a Divisor */
+ // Found a Divisor
while (i < j)
{
nTypeArray[i++] = NF_SYMBOLTYPE_FRAC_FDIV;
}
- i = j - 1; // Stop the loop
+ i = j - 1; // Stop the loop
if (nCntPost)
{
nCounter = nCntPost;
@@ -1692,8 +1692,7 @@
{
nCounter = nCntPre;
}
- // don't artificially increment nCntPre
- // for forced denominator
+ // don't artificially increment nCntPre for forced denominator
if ( ( eScannedType != NUMBERFORMAT_FRACTION ) && (!nCntPre) )
{
nCntPre++;
@@ -1735,11 +1734,11 @@
case '?':
if (nThousand > 0) // #... #
{
- return nPos; // Fehler
+ return nPos; // Error
}
else if (bFrac && cHere == '0')
{
- return nPos; // 0 im Nenner
+ return nPos; // Denominator is 0
}
nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
nPos = nPos + rStr.getLength();
@@ -1811,7 +1810,7 @@
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
nAnzResStrings--;
- i++; // eat it
+ i++; // eat it
}
else
{
@@ -1823,12 +1822,11 @@
((cNext = NextChar(i)) == '#' || cNext == '0')) // #,#
{
nPos = nPos + sStrArray[i].getLength();
- if (!bThousand) // only once
+ if (!bThousand) // only once
{
bThousand = true;
}
- // Eat it, will be reinserted at proper
- // grouping positions further down.
+ // Eat it, will be reinserted at proper grouping positions further
down.
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
nAnzResStrings--;
i++;
@@ -1836,7 +1834,7 @@
else if (i > 0 && (cPre == '#' || cPre == '0')
&& PreviousType(i) == NF_SYMBOLTYPE_DIGIT
&& nThousand < FLAG_STANDARD_IN_FORMAT )
- { // #,,,,
+ { // #,,,,
if ( StringEqualsChar( sOldThousandSep, ' ' ) )
{
// strange, those French..
@@ -1912,7 +1910,7 @@
while (i < nAnzStrings && sStrArray[i] == sOldThousandSep);
}
}
- else // any grsep
+ else // any grsep
{
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
nPos = nPos + rStr.getLength();
@@ -1966,8 +1964,8 @@
i++;
}
- } // of else = DecSep
- else // . without meaning
+ } // of else = DecSep
+ else // . without meaning
{
if (cSaved == ' ' &&
eScannedType == NUMBERFORMAT_FRACTION &&
@@ -1975,9 +1973,9 @@
{
if (!bBlank && !bFrac) // no dups
{ // or behind /
- if (bDecSep && nCounter > 0)// dec.
+ if (bDecSep && nCounter > 0) // dec.
{
- return nPos; // error
+ return nPos; // error
}
bBlank = true;
nBlankPos = i;
@@ -2021,9 +2019,9 @@
nPos = nPos + sStrArray[i].getLength();
i++;
}
- else // / doppelt od. , imZaehl
+ else // / double or in , in the denominator
{
- return nPos; // Fehler
+ return nPos; // Error
}
}
else
@@ -2040,20 +2038,20 @@
sStrArray[i+1][0] == '$' )
{
// [$DM-xxx]
- // ab SV_NUMBERFORMATTER_VERSION_NEW_CURR
- nPos = nPos + sStrArray[i].getLength(); // [
+ // As of SV_NUMBERFORMATTER_VERSION_NEW_CURR
+ nPos = nPos + sStrArray[i].getLength(); // [
nTypeArray[i] = NF_SYMBOLTYPE_CURRDEL;
- nPos = nPos + sStrArray[++i].getLength(); // $
- sStrArray[i-1] += sStrArray[i]; // [$
+ nPos = nPos + sStrArray[++i].getLength(); // $
+ sStrArray[i-1] += sStrArray[i]; // [$
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
nAnzResStrings--;
if ( ++i >= nAnzStrings )
{
- return nPos; // Fehler
+ return nPos; // Error
}
- nPos = nPos + sStrArray[i].getLength(); // DM
+ nPos = nPos + sStrArray[i].getLength(); // DM
OUString* pStr = &sStrArray[i];
- nTypeArray[i] = NF_SYMBOLTYPE_CURRENCY; // wandeln
+ nTypeArray[i] = NF_SYMBOLTYPE_CURRENCY; // convert
bool bHadDash = false;
i++;
while ( i < nAnzStrings && sStrArray[i][0] != ']' )
@@ -2090,7 +2088,7 @@
}
else
{
- return nPos; // Fehler
+ return nPos; // Error
}
}
else
@@ -2100,7 +2098,7 @@
i++;
}
break;
- default: // andere Dels
+ default: // Other Dels
if (eScannedType == NUMBERFORMAT_PERCENT && cHere == '%')
{
nTypeArray[i] = NF_SYMBOLTYPE_PERCENT;
@@ -2112,15 +2110,15 @@
nPos = nPos + sStrArray[i].getLength();
i++;
break;
- } // of switch (Del)
- } // of else Del
+ } // of switch (Del)
+ } // of else Del
else
{
SAL_WARN( "svl.numbers", "unknown NF_SYMBOLTYPE_..." );
nPos = nPos + sStrArray[i].getLength();
i++;
}
- } // of while
+ } // of while
if (eScannedType == NUMBERFORMAT_FRACTION)
{
if (bFrac)
@@ -2151,7 +2149,7 @@
nCntPre = nCounter;
}
}
- if (bThousand) // Expansion of grouping separators
+ if (bThousand) // Expansion of grouping separators
{
sal_uInt16 nMaxPos;
if (bFrac)
@@ -2188,7 +2186,7 @@
if (nTypeArray[i] == NF_SYMBOLTYPE_DIGIT)
{
nFirstDigitSymbol = i;
- nCount = nCount + sStrArray[i].getLength(); // MSC converts += to int and
then warns, so ...
+ nCount = nCount + sStrArray[i].getLength(); // MSC converts += to int and then
warns, so ...
// Insert separator only if not leftmost symbol.
if (i > 0 && nCount >= aGrouping.getPos())
{
@@ -2228,7 +2226,7 @@
}
}
}
- break; // of NUMBERFORMAT_NUMBER
+ break; // of NUMBERFORMAT_NUMBER
case NUMBERFORMAT_DATE:
while (i < nAnzStrings)
{
@@ -2256,7 +2254,7 @@
{
if ( nCalRet < 0 )
{
- return nPos; // error
+ return nPos; // error
}
}
else
@@ -2299,14 +2297,14 @@
nPos = nPos + sStrArray[i].getLength();
i++;
break;
- default: // andere Keywords
+ default: // Other keywords
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
nPos = nPos + sStrArray[i].getLength();
i++;
break;
}
- } // of while
- break; // of NUMBERFORMAT_DATE
+ } // of while
+ break; // of NUMBERFORMAT_DATE
case NUMBERFORMAT_TIME:
while (i < nAnzStrings)
{
@@ -2351,11 +2349,11 @@
case '?':
return nPos;
case '[':
- if (bThousand) // doppelt
+ if (bThousand) // Double
{
return nPos;
}
- bThousand = true; // bei Time frei
+ bThousand = true; // Empty for Time
cChar = pChrCls->uppercase(OUString(NextChar(i)))[0];
if ( cChar == cOldKeyH )
{
@@ -2377,7 +2375,7 @@
i++;
break;
case ']':
- if (!bThousand) // kein [ vorher
+ if (!bThousand) // No preceding [
{
return nPos;
}
@@ -2417,7 +2415,7 @@
break;
case NF_KEY_AMPM: // AM/PM
case NF_KEY_AP: // A/P
- bExp = true; // missbraucht fuer A/P
+ bExp = true; // Abuse for A/P
sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
nPos = nPos + sStrArray[i].getLength();
i++;
@@ -2435,19 +2433,19 @@
nPos = nPos + sStrArray[i].getLength();
i++;
break;
- default: // andere Keywords
+ default: // Other keywords
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
nPos = nPos + sStrArray[i].getLength();
i++;
break;
}
} // of while
- nCntPost = nCounter; // Zaehler der Nullen
+ nCntPost = nCounter; // Zero counter
if (bExp)
{
- nCntExp = 1; // merkt AM/PM
+ nCntExp = 1; // Remembers AM/PM
}
- break; // of NUMBERFORMAT_TIME
+ break; // of NUMBERFORMAT_TIME
case NUMBERFORMAT_DATETIME:
while (i < nAnzStrings)
{
@@ -2465,7 +2463,7 @@
{
if ( nCalRet < 0 )
{
- return nPos; // error
+ return nPos; // Error
}
}
else
@@ -2547,7 +2545,7 @@
case NF_KEY_AMPM: // AM/PM
case NF_KEY_AP: // A/P
bTimePart = true;
- bExp = true; // missbraucht fuer A/P
+ bExp = true; // Abuse for A/P
sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT
nPos = nPos + sStrArray[i].getLength();
i++;
@@ -2600,19 +2598,19 @@
nPos = nPos + sStrArray[i].getLength();
i++;
break;
- default: // andere Keywords
+ default: // Other keywords
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
nPos = nPos + sStrArray[i].getLength();
i++;
break;
}
- } // of while
- nCntPost = nCounter; // decimals (100th seconds)
+ } // of while
+ nCntPost = nCounter; // decimals (100th seconds)
if (bExp)
{
- nCntExp = 1; // merkt AM/PM
+ nCntExp = 1; // Remembers AM/PM
}
- break; // of NUMBERFORMAT_DATETIME
+ break; // of NUMBERFORMAT_DATETIME
default:
break;
}
@@ -2643,7 +2641,7 @@
// don't stringize automatic currency, will be converted
if ( sStrArray[i] == sOldCurSymbol )
{
- continue; // for
+ continue; // for
}
// DM might be splitted into D and M
if ( sStrArray[i].getLength() < sOldCurSymbol.getLength() &&
@@ -2667,7 +2665,7 @@
nAnzResStrings--;
}
i = j - 1;
- continue; // for
+ continue; // for
}
}
}
@@ -2678,13 +2676,13 @@
if ( (j == 0 || rStr[j - 1] != '\\') && GetKeyWord( rStr, j ) )
{
rStr = "\"" + rStr + "\"";
- break; // for
+ break; // for
}
}
}
}
}
- // concatenate strings, remove quotes for output, and rebuild the format string
+ // Concatenate strings, remove quotes for output, and rebuild the format string
rString = "";
i = 0;
while (i < nAnzStrings)
@@ -2759,8 +2757,7 @@
if ( eScannedType == NUMBERFORMAT_CURRENCY )
{
// dM -> DM or DM -> $ in old automatic
- // currency formats, oh my ..., why did we ever
- // introduce them?
+ // currency formats, oh my ..., why did we ever introduce them?
OUString aTmp( pChrCls->uppercase( sStrArray[iPos], nArrPos,
sStrArray[iPos].getLength()-nArrPos ) );
sal_Int32 nCPos = aTmp.indexOf( sOldCurString );
@@ -2798,7 +2795,7 @@
if ( i < nAnzStrings )
{
- i--; // enter switch on next symbol again
+ i--; // enter switch on next symbol again
}
if ( eScannedType == NUMBERFORMAT_CURRENCY && nStringPos < rString.getLength() )
{
@@ -2867,17 +2864,16 @@
sal_Int32 ImpSvNumberformatScan::ScanFormat( OUString& rString )
{
- sal_Int32 res = Symbol_Division(rString); //lexikalische Analyse
+ sal_Int32 res = Symbol_Division(rString); // Lexical analysis
if (!res)
{
- res = ScanType(); // Erkennung des Formattyps
+ res = ScanType(); // Recognizing the Format type
}
if (!res)
{
- res = FinalScan( rString ); // Typabhaengige Endanalyse
+ res = FinalScan( rString ); // Type dependent final analysis
}
- return res; // res = Kontrollposition
- // res = 0 => Format ok
+ return res; // res = control position; res = 0 => Format ok
}
void ImpSvNumberformatScan::CopyInfo(ImpSvNumberformatInfo* pInfo, sal_uInt16 nAnz)
--
To view, visit https://gerrit.libreoffice.org/4331
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied6c233cba113673f928c1a6b41a5217b9fff077
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Weissenbacher <p.weissenbacher@gmail.com>
Context
- [PATCH] Translate German comments, correct some WS · Philipp Weissenbacher (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.