- 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
@@ -40,385 +40,385 @@
 /* QT */
 #include <qmessagebox.h>
 #include <qradiobutton.h>
 
 /* STD */
 #include "cellformat.h"
 #include "numberdlg.h"
 #include "textdlg.h"
 #include "sortdlg.h"
 #include "finddlg.h"
 
 #define DEFAULT_NUM_ROWS 300
 #define DEFAULT_NUM_COLS (26*3)
 #define DEFAULT_NUM_SHEETS 3
 
 MainWindow::MainWindow(QWidget *parent, const char* n, WFlags fl)
         :QMainWindow(parent, n, fl)
 {
     // initialize variables
     documentModified=FALSE;
 
     // construct objects
     currentDoc=0;
     fileSelector=new FileSelector("application/opie-sheet", this, QString::null);
     ExcelSelector=new FileSelector("application/excel",this,QString::null,FALSE);
     connect(fileSelector, SIGNAL(closeMe()), this, SLOT(selectorHide()));
     connect(fileSelector, SIGNAL(newSelected(const DocLnk&)), this, SLOT(selectorFileNew(const DocLnk&)));
     connect(fileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(selectorFileOpen(const DocLnk&)));
     connect(ExcelSelector,SIGNAL(fileSelected(const DocLnk&)),this,SLOT(slotImportExcel(const DocLnk&)));
     connect(ExcelSelector,SIGNAL(closeMe()), this, SLOT(ExcelSelectorHide()));
 
     listSheets.setAutoDelete(TRUE);
 
     initActions();
     initMenu();
     initEditToolbar();
     initFunctionsToolbar();
     initStandardToolbar();
     initSheet();
 
     // set window title
     setCaption(tr("Opie Sheet"));
 
     // create sheets
     selectorFileNew(DocLnk());
 }
 
 MainWindow::~MainWindow()
 {
     if (currentDoc) delete currentDoc;
 }
 
 void MainWindow::documentSave(DocLnk *lnkDoc)
 {
     FileManager fm;
     QByteArray streamBuffer;
     QDataStream stream(streamBuffer, IO_WriteOnly);
 
     typeSheet *currentSheet=findSheet(sheet->getName());
     if (!currentSheet)
     {
         QMessageBox::critical(this, tr("Error"), tr("Inconsistency error!"));
         return;
     }
     sheet->copySheetData(&currentSheet->data);
     stream.writeRawBytes("SQT100", 6);
     stream << (Q_UINT32)listSheets.count();
     for (typeSheet *tempSheet=listSheets.first(); tempSheet; tempSheet=listSheets.next())
     {
         stream << tempSheet->name << (Q_UINT32)tempSheet->data.count();
         for (typeCellData *tempCell=tempSheet->data.first(); tempCell; tempCell=tempSheet->data.next())
             stream << (Q_UINT32)tempCell->col << (Q_UINT32)tempCell->row << tempCell->borders.right << tempCell->borders.bottom << tempCell->background << (Q_UINT32)tempCell->alignment << tempCell->fontColor << tempCell->font << tempCell->data;
     }
 
     lnkDoc->setType("application/opie-sheet");
     if (!fm.saveFile(*lnkDoc, streamBuffer))
     {
         QMessageBox::critical(this, tr("Error"), tr("File cannot be saved!"));
         return;
     }
     documentModified=FALSE;
 }
 
 void MainWindow::documentOpen(const DocLnk &lnkDoc)
 {
     FileManager fm;
     QByteArray streamBuffer;
     if (!lnkDoc.isValid() || !fm.loadFile(lnkDoc, streamBuffer))
     {
         QMessageBox::critical(this, tr("Error"), tr("File cannot be opened!"));
         documentModified=FALSE;
         selectorFileNew(DocLnk());
         return;
     }
     QDataStream stream(streamBuffer, IO_ReadOnly);
 
     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);
     connect(insertRows, SIGNAL(activated()), this, SLOT(slotInsertRows()));
     insertCols=new QAction(tr("Insert Columns"), tr("&Columns"), 0, this);
     connect(insertCols, SIGNAL(activated()), this, SLOT(slotInsertCols()));
     insertSheets=new QAction(tr("Add Sheets"), tr("&Sheets"), 0, this);
     connect(insertSheets, SIGNAL(activated()), this, SLOT(slotInsertSheets()));
 
     formatCells=new QAction(tr("Cells"), tr("&Cells"), 0, this);
     connect(formatCells, SIGNAL(activated()), this, SLOT(slotFormatCells()));
 
     rowHeight=new QAction(tr("Row Height"), tr("H&eight"), 0, this);
     connect(rowHeight, SIGNAL(activated()), this, SLOT(slotRowHeight()));
     rowAdjust=new QAction(tr("Adjust Row"), tr("&Adjust"), 0, this);
     connect(rowAdjust, SIGNAL(activated()), this, SLOT(slotRowAdjust()));
     rowShow=new QAction(tr("Show Row"), tr("&Show"), 0, this);
     connect(rowShow, SIGNAL(activated()), this, SLOT(slotRowShow()));
     rowHide=new QAction(tr("Hide Row"), tr("&Hide"), 0, this);
     connect(rowHide, SIGNAL(activated()), this, SLOT(slotRowHide()));
 
     colWidth=new QAction(tr("Column Width"), tr("&Width"), 0, this);
     connect(colWidth, SIGNAL(activated()), this, SLOT(slotColumnWidth()));
     colAdjust=new QAction(tr("Adjust Column"), tr("&Adjust"), 0, this);
     connect(colAdjust, SIGNAL(activated()), this, SLOT(slotColumnAdjust()));
     colShow=new QAction(tr("Show Column"), tr("&Show"), 0, this);
     connect(colShow, SIGNAL(activated()), this, SLOT(slotColumnShow()));
     colHide=new QAction(tr("Hide Column"), tr("&Hide"), 0, this);
     connect(colHide, SIGNAL(activated()), this, SLOT(slotColumnHide()));
 
     sheetRename=new QAction(tr("Rename Sheet"), tr("&Rename"), 0, this);
     connect(sheetRename, SIGNAL(activated()), this, SLOT(slotSheetRename()));
     sheetRemove=new QAction(tr("Remove Sheet"), tr("R&emove"), 0, this);
     connect(sheetRemove, SIGNAL(activated()), this, SLOT(slotSheetRemove()));
 
     dataSort=new QAction(tr("Sort Data"), tr("&Sort"), 0, this);
     connect(dataSort, SIGNAL(activated()), this, SLOT(slotDataSort()));
     dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this);
     connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace()));
 
     funcEqual=new QAction(tr("Equal To"), Resource::loadPixmap( "opie-sheet/func-equal" ), tr("&Equal To"), 0, this);
     funcEqual->setToolTip("=");
     connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcPlus=new QAction(tr("Addition"), Resource::loadPixmap( "opie-sheet/func-plus" ), tr("&Addition"), 0, this);
     funcPlus->setToolTip("+");
     connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcMinus=new QAction(tr("Subtraction"), Resource::loadPixmap( "opie-sheet/func-minus" ), tr("&Subtraction"), 0, this);
     funcMinus->setToolTip("-");
     connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcCross=new QAction(tr("Multiplication"), Resource::loadPixmap ("opie-sheet/func-cross" ), tr("&Multiplication"), 0, this);
     funcCross->setToolTip("*");
     connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcDivide=new QAction(tr("Division"), Resource::loadPixmap( "opie-sheet/func-divide" ), tr("&Division"), 0, this);
     funcDivide->setToolTip("/");
     connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), Resource::loadPixmap( "opie-sheet/func-paran-open" ), tr("&Open Paranthesis"), 0, this);
     funcParanOpen->setToolTip("(");
     connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcParanClose=new QAction(tr("Close Paranthesis"), Resource::loadPixmap( "opie-sheet/func-paran-close" ), tr("&Close Paranthesis"), 0, this);
     funcParanClose->setToolTip(")");
     connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
     funcComma=new QAction(tr("Comma"), Resource::loadPixmap( "opie-sheet/func-comma" ), tr("&Comma"), 0, this);
     funcComma->setToolTip(",");
     connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
 }
 
 void MainWindow::initMenu()
 {
     menu=new QMenuBar(this);
 
     menuFile=new QPopupMenu;
     fileNew->addTo(menuFile);
     fileOpen->addTo(menuFile);
     fileSave->addTo(menuFile);
     fileSaveAs->addTo(menuFile);
     //  menuFile->insertSeparator();
     //  fileQuit->addTo(menuFile);
     menuFile->insertSeparator();
     fileExcelImport->addTo(menuFile);
     menu->insertItem(tr("&File"), menuFile);
 
     menuEdit=new QPopupMenu;
     editAccept->addTo(menuEdit);
     editCancel->addTo(menuEdit);
     editCellSelect->addTo(menuEdit);
     menuEdit->insertSeparator();
     editCut->addTo(menuEdit);
     editCopy->addTo(menuEdit);
     editPaste->addTo(menuEdit);
     editPasteContents->addTo(menuEdit);
     editClear->addTo(menuEdit);
     menu->insertItem(tr("&Edit"), menuEdit);
 
     menuInsert=new QPopupMenu;
     menu->insertItem(tr("&Insert"), menuInsert);
 
     menuFormat=new QPopupMenu;
     formatCells->addTo(menuFormat);
     menu->insertItem(tr("&Format"), menuFormat);