[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice
Subject:    patch for kspread
From:       montel laurent <montell () club-internet ! fr>
Date:       2000-09-23 12:48:36
[Download RAW message or body]

Hi,

I fixed a bug when you reload a kspread file which contains merged cell.

Sometime you don't see merged cell after reloading.
So now I refresh view after loading.

Could you test it please and apply it please.

Thanks 
bye
["patch74.diff" (text/plain)]

? KSpreadCellIface_stub.h
? KSpreadCellIface_stub.cpp
cvs server: Diffing .
Index: kspread_table.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_table.cc,v
retrieving revision 1.212
diff -u -p -r1.212 kspread_table.cc
--- kspread_table.cc	2000/09/22 20:59:48	1.212
+++ kspread_table.cc	2000/09/23 12:46:09
@@ -4080,7 +4080,10 @@ bool KSpreadTable::loadSelection( const 
         cell->updateChart();
         }
     m_pDoc->setModified( true );
-    refreshMergedCell();
+
+    if(!isLoading())
+        refreshMergedCell();
+
     emit sig_updateView( this );
     emit sig_updateHBorder( this );
     emit sig_updateVBorder( this );
Index: kspread_view.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_view.cc,v
retrieving revision 1.290
diff -u -p -r1.290 kspread_view.cc
--- kspread_view.cc	2000/09/22 20:59:48	1.290
+++ kspread_view.cc	2000/09/23 12:46:18
@@ -421,14 +421,19 @@ void KSpreadView::initialPosition()
     int row = m_pDoc->map()->initialMarkerRow();
     if ( row <= 0 ) row = 1;
     m_pCanvas->gotoLocation( col, row );
-    
+
     //init toggle button
     m_showPageBorders->setChecked( m_pTable->isShowPageBorders());
     m_tableFormat->setEnabled(false);
     /*recalc all dependent after loading*/
     KSpreadTable *tbl;
     for ( tbl = m_pDoc->map()->firstTable(); tbl != 0L; tbl = m_pDoc->map()->nextTable() )
+        {
         tbl->recalc(true);
+        tbl->refreshMergedCell();
+        }
+
+    slotUpdateView( activeTable() );
     m_bLoading =true;
 }
 
cvs server: Diffing dtd
cvs server: Diffing extensions
cvs server: Diffing pics
cvs server: Diffing plugins
cvs server: Diffing plugins/calculator
cvs server: Diffing plugins/calculator/pics
cvs server: Diffing scripts
cvs server: Diffing tablestyles
cvs server: Diffing toolbar
cvs server: Diffing toolbar/hicolor
cvs server: Diffing toolbar/locolor


[prev in list] [next in list] [prev in thread] [next in thread]