diff options
Diffstat (limited to 'sc/source/ui/docshell/dbdocimp.cxx')
| -rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 41c045096300..3b8ee69953d0 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -192,9 +192,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO ); pImportDoc->InitUndo( pDoc, nTab, nTab ); - // + // get data from database into import document - // + try { @@ -216,9 +216,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); if ( xRowProp.is() ) { - // + // set source parameters - // + sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : @@ -251,9 +251,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } if ( xRowSet.is() ) { - // + // get column descriptions - // + long nColCount = 0; uno::Reference<sdbc::XResultSetMetaData> xMeta; @@ -401,9 +401,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_FAIL("Unexpected exception in database"); } - // + // test for cell protection - // + sal_Bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); sal_Bool bMoveCells = !bAddrInsert && pDBData->IsDoSize(); @@ -449,9 +449,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // + // copy data from import doc into real document - // + if ( bSuccess ) { @@ -489,9 +489,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern ); } - // + // copy old data for undo - // + SCCOL nUndoEndCol = std::max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); @@ -529,9 +529,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nCopyFlags, false, pUndoDoc ); } - // + // move new data - // + if (bMoveCells) { |