diff options
| author | Andras Timar <atimar@suse.com> | 2012-02-01 16:43:58 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-02-01 18:46:02 +0100 |
| commit | 20bb21fc428d8c8f423289a365658fdcae5a887a (patch) | |
| tree | e8beeb8114b278f37d5a088edda80822ab71bf56 /l10ntools | |
| parent | 0adf5eed03d7a0f14d73c23bceb13b7a8cc693e4 (diff) | |
remove support of obsolete ($$) delimited GSI file format
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/inc/gsicheck.hxx | 2 | ||||
| -rw-r--r-- | l10ntools/source/gsicheck.cxx | 70 |
2 files changed, 3 insertions, 69 deletions
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx index fff822f7ed92..7764e782c803 100644 --- a/l10ntools/inc/gsicheck.hxx +++ b/l10ntools/inc/gsicheck.hxx @@ -35,7 +35,7 @@ // // class GSILine // -enum LineFormat { FORMAT_GSI, FORMAT_SDF, FORMAT_UNKNOWN }; +enum LineFormat { FORMAT_SDF, FORMAT_UNKNOWN }; class GSILine : public ByteString { diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index a33e8ea4c12c..a49b1d6a05ed 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -178,44 +178,10 @@ GSILine::GSILine( const ByteString &rLine, sal_uLong nLine ) NotOK(); } } - else // allow tabs in gsi files + else { - aFormat = FORMAT_GSI; - ByteString sTmp( rLine ); - sal_uInt16 nPos = sTmp.Search( "($$)" ); - sal_uInt16 nStart = 0; - if ( nPos != STRING_NOTFOUND ) - { - aUniqId = sTmp.Copy( nStart, nPos - nStart ); - nStart = nPos + 4; // + length of the delemiter - nPos = sTmp.Search( "($$)", nStart ); - } - if ( nPos != STRING_NOTFOUND ) - { - aLineType = sTmp.Copy( nStart, nPos - nStart ); - nStart = nPos + 4; // + length of the delemiter - nPos = sTmp.Search( "($$)", nStart ); - aUniqId.Append( "/" ); - aUniqId.Append( aLineType ); - } - if ( nPos != STRING_NOTFOUND ) - { - aLangId = sTmp.Copy( nStart, nPos - nStart ); - nStart = nPos + 4; // + length of the delemiter - nPos = sTmp.Search( "($$)", nStart ); - } - if ( nPos != STRING_NOTFOUND ) - { - nStart = nPos + 4; // + length of the delemiter - } - if ( nPos != STRING_NOTFOUND ) - aText = sTmp.Copy( nStart ); - else - aFormat = FORMAT_UNKNOWN; - } - - if ( FORMAT_UNKNOWN == GetLineFormat() ) NotOK(); + } } /*****************************************************************************/ @@ -252,38 +218,6 @@ void GSILine::ReassembleLine() } *(ByteString*)this = aReassemble; } - else if ( GetLineFormat() == FORMAT_GSI ) - { - sal_uInt16 nPos = Search( "($$)" ); - sal_uInt16 nStart = 0; - if ( nPos != STRING_NOTFOUND ) - { - nStart = nPos + 4; // + length of the delemiter - nPos = Search( "($$)", nStart ); - } - if ( nPos != STRING_NOTFOUND ) - { - nStart = nPos + 4; // + length of the delemiter - nPos = Search( "($$)", nStart ); - } - if ( nPos != STRING_NOTFOUND ) - { - nStart = nPos + 4; // + length of the delemiter - nPos = Search( "($$)", nStart ); - } - if ( nPos != STRING_NOTFOUND ) - { - nStart = nPos + 4; // + length of the delemiter - } - if ( nPos != STRING_NOTFOUND ) - { - aReassemble = Copy( 0, nStart ); - aReassemble += aText; - *(ByteString*)this = aReassemble; - } - else - PrintError( "Cannot reassemble GSI line (internal Error).", "Line format", "", sal_False, GetLineNumber(), GetUniqId() ); - } else PrintError( "Cannot reassemble line of unknown type (internal Error).", "Line format", "", sal_False, GetLineNumber(), GetUniqId() ); } |