- BUGFIX: 0001292 - opie sheet not saving correctly

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index bb85a24..7394623 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -136,193 +136,193 @@ void MainWindow::documentOpen(const DocLnk &lnkDoc)
     Q_UINT32 countSheet, countCell, i, j, row, col, alignment;
     typeSheet *newSheet;
     typeCellData *newCell;
 
     char fileFormat[7];
     stream.readRawBytes(fileFormat, 6);
     fileFormat[6]=0;
     if ((QString)fileFormat!="SQT100")
     {
         QMessageBox::critical(this, tr("Error"), tr("Invalid file format!"));
         documentModified=FALSE;
         selectorFileNew(DocLnk());
         return;
     }
 
     stream >> countSheet;
     for (i=0; i<countSheet; ++i)
     {
         newSheet=new typeSheet;
         newSheet->data.setAutoDelete(TRUE);
         stream >> newSheet->name >> countCell;
         comboSheets->insertItem(newSheet->name);
 
         for (j=0; j<countCell; ++j)
         {
             newCell=new typeCellData;
             stream >> col >> row >> newCell->borders.right >> newCell->borders.bottom >> newCell->background >> alignment >> newCell->fontColor >> newCell->font >> newCell->data;
             newCell->col=col;
             newCell->row=row;
             newCell->alignment=(Qt::AlignmentFlags)alignment;
             newSheet->data.append(newCell);
         }
         listSheets.append(newSheet);
 
         if (i==0)
         {
             sheet->setName(newSheet->name);
             sheet->setSheetData(&newSheet->data);
         }
     }
 }
 
 int MainWindow::saveCurrentFile(bool ask)
 {
     if (ask)
     {
         int result=QMessageBox::information(this, tr("Save File"), tr("Do you want to save the current file?"), QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel);
         if (result!=QMessageBox::Yes) return result;
     }
 
     if (!currentDoc->isValid())
     {
         TextDialog dialogText(this);
         if (dialogText.exec(tr("Save File"), tr("&File Name:"), tr("UnnamedFile"))!=QDialog::Accepted || dialogText.getValue().isEmpty()) return QMessageBox::Cancel;
 
         currentDoc->setName(dialogText.getValue());
         currentDoc->setFile(QString::null);
         currentDoc->setLinkFile(QString::null);
     }
 
     documentSave(currentDoc);
     return QMessageBox::Yes;
 }
 
 void MainWindow::selectorFileNew(const DocLnk &lnkDoc)
 {
     selectorHide();
 
     if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return;
     if (currentDoc) delete currentDoc;
     currentDoc = new DocLnk(lnkDoc);
     editData->clear();
     listSheets.clear();
     comboSheets->clear();
 
     typeSheet *newSheet=createNewSheet();
     newSheet->data.setAutoDelete(TRUE);
     sheet->setName(newSheet->name);
     sheet->setSheetData(&newSheet->data);
     for (int i=1; i<DEFAULT_NUM_SHEETS; ++i)
         createNewSheet();
     documentModified=FALSE;
 }
 
 void MainWindow::closeEvent(QCloseEvent *e)
 {
     if (documentModified && saveCurrentFile()==QMessageBox::Cancel) e->ignore();
     else e->accept();
 }
 
 void MainWindow::selectorFileOpen(const DocLnk &lnkDoc)
 {
     selectorHide();
 
     if (documentModified && saveCurrentFile()==QMessageBox::Cancel) return;
     if (currentDoc) delete currentDoc;
-    currentDoc = new DocLnk();
+    currentDoc = new DocLnk( lnkDoc );
     listSheets.clear();
     comboSheets->clear();
 
     documentOpen(lnkDoc);
     documentModified=FALSE;
 }
 
 void MainWindow::selectorShow()
 {
     sheet->hide();
     setCentralWidget(fileSelector);
     fileSelector->show();
     fileSelector->reread();
 }
 
 void MainWindow::selectorHide()
 {
     fileSelector->hide();
     setCentralWidget(sheet);
     sheet->show();
 }
 
 void MainWindow::slotFileNew()
 {
     selectorFileNew(DocLnk());
 }
 
 void MainWindow::slotFileOpen()
 {
     selectorShow();
 }
 
 void MainWindow::slotImportExcelOpen()
 {
     sheet->hide();
     setCentralWidget(ExcelSelector);
     ExcelSelector->show();
     ExcelSelector->reread();
 }
 
 void MainWindow::ExcelSelectorHide()
 {
     ExcelSelector->hide();
     setCentralWidget(sheet);
     sheet->show();
 }
 
 void MainWindow::slotFileSave()
 {
     saveCurrentFile(FALSE);
 }
 
 void MainWindow::setDocument(const QString &applnk_filename)
 {
     selectorFileOpen(DocLnk(applnk_filename));
 }
 
 void MainWindow::initActions()
 {
     fileNew=new QAction(tr("New File"), Resource::loadPixmap( "new" ), tr("&New"), 0, this);
     connect(fileNew, SIGNAL(activated()), this, SLOT(slotFileNew()));
     fileOpen=new QAction(tr("Open File"), Resource::loadPixmap( "fileopen" ), tr("&Open"), 0, this);
     connect(fileOpen, SIGNAL(activated()), this, SLOT(slotFileOpen()));
     fileSave=new QAction(tr("Save File"),Resource::loadPixmap( "save" ), tr("&Save"), 0, this);
     connect(fileSave, SIGNAL(activated()), this, SLOT(slotFileSave()));
     fileSaveAs=new QAction(tr("Save File As"), Resource::loadPixmap( "save" ), tr("Save &As"), 0, this);
     connect(fileSaveAs, SIGNAL(activated()), this, SLOT(slotFileSaveAs()));
 
     //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this);
     //connect(fileQuit, SIGNAL(activated()), this, SLOT(close()));
     fileExcelImport=new QAction(tr("Import Excel file"),Resource::loadPixmap( "opie-sheet/excel16" ),tr("Import E&xcel file"),0,this);
     connect(fileExcelImport, SIGNAL(activated()), this, SLOT(slotImportExcelOpen()));
 
     // helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this);
     //connect(helpGeneral, SIGNAL(activated()), this, SLOT(slotHelpGeneral()));
     //helpAbout=new QAction(tr("About Opie Sheet"), tr("&About"), 0, this);
     //connect(helpAbout, SIGNAL(activated()), this, SLOT(slotHelpAbout()));
 
     editAccept=new QAction(tr("Accept"),Resource::loadPixmap( "enter" ) , tr("&Accept"), 0, this);
     connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
     editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this);
     connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel()));
     editCellSelect=new QAction(tr("Cell Selector"), Resource::loadPixmap( "opie-sheet/cell-select" ), tr("Cell &Selector"), 0, this);
     editCellSelect->setToggleAction(TRUE);
     connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool)));
     editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this);
     editCopy=new QAction(tr("Copy Cells"), tr("&Copy"), 0, this);
     editPaste=new QAction(tr("Paste Cells"), tr("&Paste"), 0, this);
     connect(editPaste, SIGNAL(activated()), this, SLOT(slotEditPaste()));
     editPasteContents=new QAction(tr("Paste Contents"), tr("Paste Cont&ents"), 0, this);
     connect(editPasteContents, SIGNAL(activated()), this, SLOT(slotEditPasteContents()));
     editClear=new QAction(tr("Clear Cells"), tr("C&lear"), 0, this);
 
     insertCells=new QAction(tr("Insert Cells"), tr("C&ells"), 0, this);
     connect(insertCells, SIGNAL(activated()), this, SLOT(slotInsertCells()));
     insertRows=new QAction(tr("Insert Rows"), tr("&Rows"), 0, this);