summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-08-26 14:53:30 +0200
committerEike Rathke <erack@redhat.com>2013-08-26 14:54:14 +0200
commitd4d5af7396f997d72487db3127eba7f8a4130a2b (patch)
tree9db6e93cd26495472934dee10a186f6494d2f50f
parent6dc98de97f6bc4325407b098bb153f359000c717 (diff)
translated comments
Change-Id: I29cbd65d57b1c6cc26039c0f5472ecb9e669e6a7
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx60
1 files changed, 16 insertions, 44 deletions
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 628f29b9617d..0f514ce9bcc4 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -168,7 +168,7 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
nInfoCount == rCmp.nInfoCount )
{
OSL_ENSURE( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat),
- "0-Zeiger in ScAsciiOptions" );
+ "NULL pointer in ScAsciiOptions::operator==() column info" );
for (sal_uInt16 i=0; i<nInfoCount; i++)
if ( pColStart[i] != rCmp.pColStart[i] ||
pColFormat[i] != rCmp.pColFormat[i] )
@@ -179,11 +179,8 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
return false;
}
-//
-// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-// darum ab Version 336 Komma stattdessen
-//
-
+// The options string must not contain semicolons (because of the pick list),
+// use comma as separator.
void ScAsciiOptions::ReadFromString( const String& rString )
{
@@ -192,10 +189,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
xub_StrLen nSub;
xub_StrLen i;
- //
- // Feld-Trenner
- //
-
+ // Field separator.
if ( nCount >= 1 )
{
bFixedLen = bMergeFieldSeps = false;
@@ -219,10 +213,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
}
}
- //
- // Text-Trenner
- //
-
+ // Text separator.
if ( nCount >= 2 )
{
aToken = rString.GetToken(1,',');
@@ -230,30 +221,21 @@ void ScAsciiOptions::ReadFromString( const String& rString )
cTextSep = (sal_Unicode) nVal;
}
- //
- // Zeichensatz
- //
-
+ // Text encoding.
if ( nCount >= 3 )
{
aToken = rString.GetToken(2,',');
eCharSet = ScGlobal::GetCharsetValue( aToken );
}
- //
- // Startzeile
- //
-
+ // Number of start row.
if ( nCount >= 4 )
{
aToken = rString.GetToken(3,',');
nStartRow = aToken.ToInt32();
}
- //
- // Spalten-Infos
- //
-
+ // Column info.
if ( nCount >= 5 )
{
delete[] pColStart;
@@ -311,10 +293,7 @@ String ScAsciiOptions::WriteToString() const
{
OUString aOutStr;
- //
- // Feld-Trenner
- //
-
+ // Field separator.
if ( bFixedLen )
aOutStr += pStrFix;
else if ( !aFieldSeps.Len() )
@@ -335,27 +314,20 @@ String ScAsciiOptions::WriteToString() const
}
}
- aOutStr += "," +
- // Text-Trenner
- OUString::number(cTextSep) + ",";
-
- //
- // Zeichensatz
- //
+ // Text delimiter.
+ aOutStr += "," + OUString::number(cTextSep) + ",";
+ // Text encoding.
if ( bCharSetSystem ) // force "SYSTEM"
aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW );
else
aOutStr += ScGlobal::GetCharsetString( eCharSet );
- aOutStr += "," +
- // Startzeile
- OUString::number(nStartRow) + ",";
- //
- // Spalten-Infos
- //
+ // Number of start row.
+ aOutStr += "," + OUString::number(nStartRow) + ",";
- OSL_ENSURE( !nInfoCount || (pColStart && pColFormat), "0-Zeiger in ScAsciiOptions" );
+ // Column info.
+ OSL_ENSURE( !nInfoCount || (pColStart && pColFormat), "NULL pointer in ScAsciiOptions column info" );
for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
{
if (nInfo)