Kaydet (Commit) d4d5af73 authored tarafından Eike Rathke's avatar Eike Rathke

translated comments

Change-Id: I29cbd65d57b1c6cc26039c0f5472ecb9e669e6a7
üst 6dc98de9
...@@ -168,7 +168,7 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const ...@@ -168,7 +168,7 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
nInfoCount == rCmp.nInfoCount ) nInfoCount == rCmp.nInfoCount )
{ {
OSL_ENSURE( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat), 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++) for (sal_uInt16 i=0; i<nInfoCount; i++)
if ( pColStart[i] != rCmp.pColStart[i] || if ( pColStart[i] != rCmp.pColStart[i] ||
pColFormat[i] != rCmp.pColFormat[i] ) pColFormat[i] != rCmp.pColFormat[i] )
...@@ -179,11 +179,8 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const ...@@ -179,11 +179,8 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
return false; return false;
} }
// // The options string must not contain semicolons (because of the pick list),
// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) // use comma as separator.
// darum ab Version 336 Komma stattdessen
//
void ScAsciiOptions::ReadFromString( const String& rString ) void ScAsciiOptions::ReadFromString( const String& rString )
{ {
...@@ -192,10 +189,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) ...@@ -192,10 +189,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
xub_StrLen nSub; xub_StrLen nSub;
xub_StrLen i; xub_StrLen i;
// // Field separator.
// Feld-Trenner
//
if ( nCount >= 1 ) if ( nCount >= 1 )
{ {
bFixedLen = bMergeFieldSeps = false; bFixedLen = bMergeFieldSeps = false;
...@@ -219,10 +213,7 @@ void ScAsciiOptions::ReadFromString( const String& rString ) ...@@ -219,10 +213,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
} }
} }
// // Text separator.
// Text-Trenner
//
if ( nCount >= 2 ) if ( nCount >= 2 )
{ {
aToken = rString.GetToken(1,','); aToken = rString.GetToken(1,',');
...@@ -230,30 +221,21 @@ void ScAsciiOptions::ReadFromString( const String& rString ) ...@@ -230,30 +221,21 @@ void ScAsciiOptions::ReadFromString( const String& rString )
cTextSep = (sal_Unicode) nVal; cTextSep = (sal_Unicode) nVal;
} }
// // Text encoding.
// Zeichensatz
//
if ( nCount >= 3 ) if ( nCount >= 3 )
{ {
aToken = rString.GetToken(2,','); aToken = rString.GetToken(2,',');
eCharSet = ScGlobal::GetCharsetValue( aToken ); eCharSet = ScGlobal::GetCharsetValue( aToken );
} }
// // Number of start row.
// Startzeile
//
if ( nCount >= 4 ) if ( nCount >= 4 )
{ {
aToken = rString.GetToken(3,','); aToken = rString.GetToken(3,',');
nStartRow = aToken.ToInt32(); nStartRow = aToken.ToInt32();
} }
// // Column info.
// Spalten-Infos
//
if ( nCount >= 5 ) if ( nCount >= 5 )
{ {
delete[] pColStart; delete[] pColStart;
...@@ -311,10 +293,7 @@ String ScAsciiOptions::WriteToString() const ...@@ -311,10 +293,7 @@ String ScAsciiOptions::WriteToString() const
{ {
OUString aOutStr; OUString aOutStr;
// // Field separator.
// Feld-Trenner
//
if ( bFixedLen ) if ( bFixedLen )
aOutStr += pStrFix; aOutStr += pStrFix;
else if ( !aFieldSeps.Len() ) else if ( !aFieldSeps.Len() )
...@@ -335,27 +314,20 @@ String ScAsciiOptions::WriteToString() const ...@@ -335,27 +314,20 @@ String ScAsciiOptions::WriteToString() const
} }
} }
aOutStr += "," + // Text delimiter.
// Text-Trenner aOutStr += "," + OUString::number(cTextSep) + ",";
OUString::number(cTextSep) + ",";
//
// Zeichensatz
//
// Text encoding.
if ( bCharSetSystem ) // force "SYSTEM" if ( bCharSetSystem ) // force "SYSTEM"
aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW ); aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW );
else else
aOutStr += ScGlobal::GetCharsetString( eCharSet ); aOutStr += ScGlobal::GetCharsetString( eCharSet );
aOutStr += "," +
// Startzeile
OUString::number(nStartRow) + ",";
// // Number of start row.
// Spalten-Infos 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++) for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
{ {
if (nInfo) if (nInfo)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment