Kaydet (Commit) 7f91f731 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

ScImportExport clean-up, German comments

Change-Id: Ife16a0e787a03c1225218356572c2fd929a0c63c
üst 1139d618
...@@ -78,10 +78,7 @@ enum SylkVersion ...@@ -78,10 +78,7 @@ enum SylkVersion
SYLK_OTHER // Assume that aliens wrote correct strings. SYLK_OTHER // Assume that aliens wrote correct strings.
}; };
// Whole document without Undo
// Gesamtdokument ohne Undo
ScImportExport::ScImportExport( ScDocument* p ) ScImportExport::ScImportExport( ScDocument* p )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
...@@ -94,9 +91,7 @@ ScImportExport::ScImportExport( ScDocument* p ) ...@@ -94,9 +91,7 @@ ScImportExport::ScImportExport( ScDocument* p )
pExtOptions = NULL; pExtOptions = NULL;
} }
// Insert am Punkt ohne Bereichschecks // Insert am current cell without range(es)
ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
aRange( rPt ), aRange( rPt ),
...@@ -110,10 +105,8 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) ...@@ -110,10 +105,8 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
pExtOptions = NULL; pExtOptions = NULL;
} }
// ctor with a range is only used for export // ctor with a range is only used for export
//! ctor with a string (and bSingle=true) is also used for DdeSetData //! ctor with a string (and bSingle=true) is also used for DdeSetData
ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
aRange( r ), aRange( r ),
...@@ -125,14 +118,12 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) ...@@ -125,14 +118,12 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
{ {
pUndoDoc = NULL; pUndoDoc = NULL;
pExtOptions = NULL; pExtOptions = NULL;
// Zur Zeit nur in einer Tabelle! // Only one sheet (table) supported
aRange.aEnd.SetTab( aRange.aStart.Tab() ); aRange.aEnd.SetTab( aRange.aStart.Tab() );
} }
// String auswerten: Entweder Bereich, Punkt oder Gesamtdoc (bei Fehler) // Evaluate input string - either range, cell or the whole document (when error)
// Falls eine View existiert, wird die TabNo der View entnommen! // If a View exists, the TabNo of the view will be used.
ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos ) ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ), : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
...@@ -147,9 +138,9 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos ) ...@@ -147,9 +138,9 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
SCTAB nTab = ScDocShell::GetCurTab(); SCTAB nTab = ScDocShell::GetCurTab();
aRange.aStart.SetTab( nTab ); aRange.aStart.SetTab( nTab );
OUString aPos( rPos ); OUString aPos( rPos );
// Benannter Bereich? // Named range?
ScRangeName* pRange = pDoc->GetRangeName(); ScRangeName* pRange = pDoc->GetRangeName();
if( pRange ) if (pRange)
{ {
const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos)); const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos));
if (pData) if (pData)
...@@ -157,28 +148,28 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos ) ...@@ -157,28 +148,28 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
if( pData->HasType( RT_REFAREA ) if( pData->HasType( RT_REFAREA )
|| pData->HasType( RT_ABSAREA ) || pData->HasType( RT_ABSAREA )
|| pData->HasType( RT_ABSPOS ) ) || pData->HasType( RT_ABSPOS ) )
pData->GetSymbol( aPos ); // mit dem Inhalt weitertesten {
pData->GetSymbol(aPos);
}
} }
} }
formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
// Bereich? // Range?
if( aRange.Parse( aPos, pDoc, eConv ) & SCA_VALID ) if (aRange.Parse(aPos, pDoc, eConv) & SCA_VALID)
bSingle = false; bSingle = false;
// Zelle? // Cell?
else if( aRange.aStart.Parse( aPos, pDoc, eConv ) & SCA_VALID ) else if (aRange.aStart.Parse(aPos, pDoc, eConv) & SCA_VALID)
aRange.aEnd = aRange.aStart; aRange.aEnd = aRange.aStart;
else else
bAll = true; bAll = true;
} }
ScImportExport::~ScImportExport() ScImportExport::~ScImportExport()
{ {
delete pUndoDoc; delete pUndoDoc;
delete pExtOptions; delete pExtOptions;
} }
void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt ) void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt )
{ {
if ( pExtOptions ) if ( pExtOptions )
...@@ -186,13 +177,12 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt ) ...@@ -186,13 +177,12 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt )
else else
pExtOptions = new ScAsciiOptions( rOpt ); pExtOptions = new ScAsciiOptions( rOpt );
// "normale" Optionen uebernehmen // "normal" Options
cSep = ScAsciiOptions::GetWeightedFieldSep( rOpt.GetFieldSeps(), false); cSep = ScAsciiOptions::GetWeightedFieldSep( rOpt.GetFieldSeps(), false);
cStr = rOpt.GetTextSep(); cStr = rOpt.GetTextSep();
} }
bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) bool ScImportExport::IsFormatSupported( sal_uLong nFormat )
{ {
return nFormat == FORMAT_STRING return nFormat == FORMAT_STRING
...@@ -203,10 +193,7 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) ...@@ -203,10 +193,7 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat )
|| nFormat == SOT_FORMATSTR_ID_DIF; || nFormat == SOT_FORMATSTR_ID_DIF;
} }
// Prepare for Undo
// Vorbereitung fuer Undo: Undo-Dokument erzeugen
bool ScImportExport::StartPaste() bool ScImportExport::StartPaste()
{ {
if ( !bAll ) if ( !bAll )
...@@ -229,9 +216,7 @@ bool ScImportExport::StartPaste() ...@@ -229,9 +216,7 @@ bool ScImportExport::StartPaste()
return true; return true;
} }
// Nachbereitung Insert: Undo/Redo-Aktionen erzeugen, Invalidate/Repaint // Create Undo/Redo actions, Invalidate/Repaint
void ScImportExport::EndPaste(bool bAutoRowHeight) void ScImportExport::EndPaste(bool bAutoRowHeight)
{ {
bool bHeight = bAutoRowHeight && pDocSh && pDocSh->AdjustRowHeight( bool bHeight = bAutoRowHeight && pDocSh && pDocSh->AdjustRowHeight(
...@@ -251,7 +236,7 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) ...@@ -251,7 +236,7 @@ void ScImportExport::EndPaste(bool bAutoRowHeight)
if( pDocSh ) if( pDocSh )
{ {
if (!bHeight) if (!bHeight)
pDocSh->PostPaint( aRange, PAINT_GRID ); // AdjustRowHeight paintet evtl. selber pDocSh->PostPaint( aRange, PAINT_GRID );
pDocSh->SetDocumentModified(); pDocSh->SetDocumentModified();
} }
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
...@@ -284,7 +269,6 @@ bool ScImportExport::ExportData( const OUString& rMimeType, ...@@ -284,7 +269,6 @@ bool ScImportExport::ExportData( const OUString& rMimeType,
return false; return false;
} }
bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt ) bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt )
{ {
switch ( nFmt ) switch ( nFmt )
...@@ -309,7 +293,6 @@ bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt ) ...@@ -309,7 +293,6 @@ bool ScImportExport::ImportString( const OUString& rText, sal_uLong nFmt )
} }
} }
bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt ) bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt )
{ {
OSL_ENSURE( nFmt == FORMAT_STRING, "ScImportExport::ExportString: Unicode not supported for other formats than FORMAT_STRING" ); OSL_ENSURE( nFmt == FORMAT_STRING, "ScImportExport::ExportString: Unicode not supported for other formats than FORMAT_STRING" );
...@@ -341,7 +324,6 @@ bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt ) ...@@ -341,7 +324,6 @@ bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt )
// ExportStream must handle RTL_TEXTENCODING_UNICODE // ExportStream must handle RTL_TEXTENCODING_UNICODE
} }
bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt ) bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt )
{ {
OSL_ENSURE( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" ); OSL_ENSURE( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" );
...@@ -359,7 +341,6 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa ...@@ -359,7 +341,6 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa
{ {
aStrm.WriteChar( (sal_Char) 0 ); aStrm.WriteChar( (sal_Char) 0 );
aStrm.Seek( STREAM_SEEK_TO_END ); aStrm.Seek( STREAM_SEEK_TO_END );
// Sicherheits-Check:
if( aStrm.Tell() <= nSizeLimit ) if( aStrm.Tell() <= nSizeLimit )
{ {
rText = (const sal_Char*) aStrm.GetData(); rText = (const sal_Char*) aStrm.GetData();
...@@ -370,12 +351,11 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa ...@@ -370,12 +351,11 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa
return false; return false;
} }
bool ScImportExport::ImportStream( SvStream& rStrm, const OUString& rBaseURL, sal_uLong nFmt ) bool ScImportExport::ImportStream( SvStream& rStrm, const OUString& rBaseURL, sal_uLong nFmt )
{ {
if( nFmt == FORMAT_STRING ) if( nFmt == FORMAT_STRING )
{ {
if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten if( ExtText2Doc( rStrm ) ) // evaluate pExtOptions
return true; return true;
} }
if( nFmt == SOT_FORMATSTR_ID_SYLK ) if( nFmt == SOT_FORMATSTR_ID_SYLK )
...@@ -411,7 +391,6 @@ bool ScImportExport::ImportStream( SvStream& rStrm, const OUString& rBaseURL, sa ...@@ -411,7 +391,6 @@ bool ScImportExport::ImportStream( SvStream& rStrm, const OUString& rBaseURL, sa
return false; return false;
} }
bool ScImportExport::ExportStream( SvStream& rStrm, const OUString& rBaseURL, sal_uLong nFmt ) bool ScImportExport::ExportStream( SvStream& rStrm, const OUString& rBaseURL, sal_uLong nFmt )
{ {
if( nFmt == FORMAT_STRING ) if( nFmt == FORMAT_STRING )
...@@ -486,7 +465,6 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const OUString& rBaseURL, sa ...@@ -486,7 +465,6 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const OUString& rBaseURL, sa
return false; return false;
} }
void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const OUString& rString, bool bZero ) void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const OUString& rString, bool bZero )
{ {
rtl_TextEncoding eEnc = rStrm.GetStreamCharSet(); rtl_TextEncoding eEnc = rStrm.GetStreamCharSet();
...@@ -515,7 +493,6 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const OUString& ...@@ -515,7 +493,6 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const OUString&
} }
} }
// This function could be replaced by endlub() // This function could be replaced by endlub()
void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm ) void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
{ {
...@@ -537,7 +514,6 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm ) ...@@ -537,7 +514,6 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
endl( rStrm ); endl( rStrm );
} }
enum QuoteType enum QuoteType
{ {
FIELDSTART_QUOTE, FIELDSTART_QUOTE,
...@@ -547,7 +523,6 @@ enum QuoteType ...@@ -547,7 +523,6 @@ enum QuoteType
DONTKNOW_QUOTE DONTKNOW_QUOTE
}; };
/** Determine if *p is a quote that ends a quoted field. /** Determine if *p is a quote that ends a quoted field.
Precondition: we are parsing a quoted field already and *p is a quote. Precondition: we are parsing a quoted field already and *p is a quote.
...@@ -571,7 +546,6 @@ static QuoteType lcl_isFieldEndQuote( const sal_Unicode* p, const sal_Unicode* p ...@@ -571,7 +546,6 @@ static QuoteType lcl_isFieldEndQuote( const sal_Unicode* p, const sal_Unicode* p
return DONTKNOW_QUOTE; return DONTKNOW_QUOTE;
} }
/** Determine if *p is a quote that is escaped by being doubled or ends a /** Determine if *p is a quote that is escaped by being doubled or ends a
quoted field. quoted field.
...@@ -611,7 +585,6 @@ static QuoteType lcl_isEscapedOrFieldEndQuote( sal_Int32 nQuotes, const sal_Unic ...@@ -611,7 +585,6 @@ static QuoteType lcl_isEscapedOrFieldEndQuote( sal_Int32 nQuotes, const sal_Unic
return lcl_isFieldEndQuote( p, pSeps); return lcl_isFieldEndQuote( p, pSeps);
} }
/** Append characters of [p1,p2) to rField. /** Append characters of [p1,p2) to rField.
@returns TRUE if ok; FALSE if data overflow, truncated @returns TRUE if ok; FALSE if data overflow, truncated
...@@ -631,7 +604,6 @@ static bool lcl_appendLineData( OUString& rField, const sal_Unicode* p1, const s ...@@ -631,7 +604,6 @@ static bool lcl_appendLineData( OUString& rField, const sal_Unicode* p1, const s
} }
} }
enum DoubledQuoteMode enum DoubledQuoteMode
{ {
DQM_KEEP_ALL, // both are taken, additionally start and end quote are included in string DQM_KEEP_ALL, // both are taken, additionally start and end quote are included in string
...@@ -856,7 +828,6 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri ...@@ -856,7 +828,6 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri
ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); ScImportExport::WriteUnicodeOrByteString( rStrm, rString );
} }
bool ScImportExport::Text2Doc( SvStream& rStrm ) bool ScImportExport::Text2Doc( SvStream& rStrm )
{ {
bool bOk = true; bool bOk = true;
...@@ -949,8 +920,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) ...@@ -949,8 +920,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm )
return bOk; return bOk;
} }
// Extended Ascii-Import
// erweiterter Ascii-Import
static bool lcl_PutString( static bool lcl_PutString(
ScDocumentImport& rDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rStr, sal_uInt8 nColFormat, ScDocumentImport& rDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rStr, sal_uInt8 nColFormat,
...@@ -993,22 +963,22 @@ static bool lcl_PutString( ...@@ -993,22 +963,22 @@ static bool lcl_PutString(
if ( nColFormat == SC_COL_ENGLISH ) if ( nColFormat == SC_COL_ENGLISH )
{ {
//! SetString mit Extra-Flag ??? //! SetString with Extra-Flag ???
SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable(); SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable();
sal_uInt32 nEnglish = pDocFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US); sal_uInt32 nEnglish = pDocFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
double fVal; double fVal;
if ( pDocFormatter->IsNumberFormat( rStr, nEnglish, fVal ) ) if ( pDocFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
{ {
// Zahlformat wird nicht auf englisch gesetzt // Numberformat will not be set to English
rDocImport.setNumericCell( ScAddress( nCol, nRow, nTab ), fVal ); rDocImport.setNumericCell( ScAddress( nCol, nRow, nTab ), fVal );
return bMultiLine; return bMultiLine;
} }
// sonst weiter mit SetString // else, continue with SetString
} }
else if ( nColFormat != SC_COL_STANDARD ) // Datumsformate else if ( nColFormat != SC_COL_STANDARD ) // Datumformats
{ {
const sal_uInt16 nMaxNumberParts = 7; // Y-M-D h:m:s.t const sal_uInt16 nMaxNumberParts = 7; // Y-M-D h:m:s.t
sal_Int32 nLen = rStr.getLength(); sal_Int32 nLen = rStr.getLength();
sal_Int32 nStart[nMaxNumberParts]; sal_Int32 nStart[nMaxNumberParts];
sal_Int32 nEnd[nMaxNumberParts]; sal_Int32 nEnd[nMaxNumberParts];
...@@ -1219,7 +1189,6 @@ static bool lcl_PutString( ...@@ -1219,7 +1189,6 @@ static bool lcl_PutString(
return bMultiLine; return bMultiLine;
} }
static OUString lcl_GetFixed( const OUString& rLine, sal_Int32 nStart, sal_Int32 nNext, static OUString lcl_GetFixed( const OUString& rLine, sal_Int32 nStart, sal_Int32 nNext,
bool& rbIsQuoted, bool& rbOverflowCell ) bool& rbIsQuoted, bool& rbOverflowCell )
{ {
...@@ -1350,7 +1319,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) ...@@ -1350,7 +1319,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
sal_Int32 nLineLen = aLine.getLength(); sal_Int32 nLineLen = aLine.getLength();
SCCOL nCol = nStartCol; SCCOL nCol = nStartCol;
bool bMultiLine = false; bool bMultiLine = false;
if ( bFixed ) // Feste Satzlaenge if ( bFixed ) // Fixed line length
{ {
// Yes, the check is nCol<=MAXCOL+1, +1 because it is only an // Yes, the check is nCol<=MAXCOL+1, +1 because it is only an
// overflow if there is really data following to be put behind // overflow if there is really data following to be put behind
...@@ -1381,7 +1350,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) ...@@ -1381,7 +1350,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
} }
} }
} }
else // Nach Trennzeichen suchen else // Search for the separator
{ {
SCCOL nSourceCol = 0; SCCOL nSourceCol = 0;
sal_uInt16 nInfoStart = 0; sal_uInt16 nInfoStart = 0;
...@@ -1488,7 +1457,6 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) ...@@ -1488,7 +1457,6 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
return true; return true;
} }
void ScImportExport::EmbeddedNullTreatment( OUString & rStr ) void ScImportExport::EmbeddedNullTreatment( OUString & rStr )
{ {
// A nasty workaround for data with embedded NULL characters. As long as we // A nasty workaround for data with embedded NULL characters. As long as we
...@@ -1505,7 +1473,6 @@ void ScImportExport::EmbeddedNullTreatment( OUString & rStr ) ...@@ -1505,7 +1473,6 @@ void ScImportExport::EmbeddedNullTreatment( OUString & rStr )
} }
} }
const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p, const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p,
OUString& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted, OUString& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted,
bool& rbOverflowCell ) bool& rbOverflowCell )
...@@ -1697,7 +1664,6 @@ bool ScImportExport::Doc2Text( SvStream& rStrm ) ...@@ -1697,7 +1664,6 @@ bool ScImportExport::Doc2Text( SvStream& rStrm )
return rStrm.GetError() == SVSTREAM_OK; return rStrm.GetError() == SVSTREAM_OK;
} }
bool ScImportExport::Sylk2Doc( SvStream& rStrm ) bool ScImportExport::Sylk2Doc( SvStream& rStrm )
{ {
bool bOk = true; bool bOk = true;
...@@ -1953,7 +1919,6 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) ...@@ -1953,7 +1919,6 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
return bOk; return bOk;
} }
bool ScImportExport::Doc2Sylk( SvStream& rStrm ) bool ScImportExport::Doc2Sylk( SvStream& rStrm )
{ {
SCCOL nCol; SCCOL nCol;
...@@ -2095,7 +2060,6 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) ...@@ -2095,7 +2060,6 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm )
return rStrm.GetError() == SVSTREAM_OK; return rStrm.GetError() == SVSTREAM_OK;
} }
bool ScImportExport::Doc2HTML( SvStream& rStrm, const OUString& rBaseURL ) bool ScImportExport::Doc2HTML( SvStream& rStrm, const OUString& rBaseURL )
{ {
// rtl_TextEncoding is ignored in ScExportHTML, read from Load/Save HTML options // rtl_TextEncoding is ignored in ScExportHTML, read from Load/Save HTML options
...@@ -2111,7 +2075,6 @@ bool ScImportExport::Doc2RTF( SvStream& rStrm ) ...@@ -2111,7 +2075,6 @@ bool ScImportExport::Doc2RTF( SvStream& rStrm )
return rStrm.GetError() == SVSTREAM_OK; return rStrm.GetError() == SVSTREAM_OK;
} }
bool ScImportExport::Doc2Dif( SvStream& rStrm ) bool ScImportExport::Doc2Dif( SvStream& rStrm )
{ {
// for DIF in the clipboard, IBM_850 is always used // for DIF in the clipboard, IBM_850 is always used
...@@ -2119,7 +2082,6 @@ bool ScImportExport::Doc2Dif( SvStream& rStrm ) ...@@ -2119,7 +2082,6 @@ bool ScImportExport::Doc2Dif( SvStream& rStrm )
return true; return true;
} }
bool ScImportExport::Dif2Doc( SvStream& rStrm ) bool ScImportExport::Dif2Doc( SvStream& rStrm )
{ {
SCTAB nTab = aRange.aStart.Tab(); SCTAB nTab = aRange.aStart.Tab();
...@@ -2153,7 +2115,6 @@ bool ScImportExport::Dif2Doc( SvStream& rStrm ) ...@@ -2153,7 +2115,6 @@ bool ScImportExport::Dif2Doc( SvStream& rStrm )
return bOk; return bOk;
} }
bool ScImportExport::RTF2Doc( SvStream& rStrm, const OUString& rBaseURL ) bool ScImportExport::RTF2Doc( SvStream& rStrm, const OUString& rBaseURL )
{ {
ScEEAbsImport *pImp = ScFormatFilter::Get().CreateRTFImport( pDoc, aRange ); ScEEAbsImport *pImp = ScFormatFilter::Get().CreateRTFImport( pDoc, aRange );
......
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