Diffstat (limited to 'noncore/apps/opie-sheet/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index 7394623..3095142 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp | |||
@@ -877,7 +877,10 @@ void MainWindow::slotFileSaveAs() | |||
877 | void MainWindow::slotImportExcel(const DocLnk &lnkDoc) | 877 | void MainWindow::slotImportExcel(const DocLnk &lnkDoc) |
878 | { | 878 | { |
879 | ExcelBook file1; | 879 | ExcelBook file1; |
880 | file1.ParseBook((char *)lnkDoc.file().ascii()); | 880 | if ( !file1.ParseBook((char *)lnkDoc.file().ascii()) ){ |
881 | QMessageBox::critical(this, tr("Error"), tr("<td>Unable to open or parse file!</td>")); | ||
882 | return; | ||
883 | } | ||
881 | int NumOfSheets=file1.Sheets.count(); | 884 | int NumOfSheets=file1.Sheets.count(); |
882 | printf("OpieSheet::NumberOfSheets:%d\r\n",NumOfSheets); | 885 | printf("OpieSheet::NumberOfSheets:%d\r\n",NumOfSheets); |
883 | if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return; | 886 | if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return; |
@@ -893,7 +896,7 @@ void MainWindow::slotImportExcel(const DocLnk &lnkDoc) | |||
893 | for(w1=1;w1<=NumOfSheets;w1++) | 896 | for(w1=1;w1<=NumOfSheets;w1++) |
894 | { | 897 | { |
895 | sh1=file1.Sheets[w1-1]; | 898 | sh1=file1.Sheets[w1-1]; |
896 | printf("OpieSheet:newSheet:%x,r=%d,c=%d\r\n",sh1,sh1->rows,sh1->cols); | 899 | // printf("OpieSheet:newSheet:%x,r=%d,c=%d\r\n",sh1, sh1->rows,sh1->cols); |
897 | newSheet=new typeSheet; | 900 | newSheet=new typeSheet; |
898 | newSheet->data.setAutoDelete(TRUE); | 901 | newSheet->data.setAutoDelete(TRUE); |
899 | newSheet->name=sh1->name; | 902 | newSheet->name=sh1->name; |