[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-03 14:21:52
[Download RAW message or body]

Hi,

I added to my previous patch :
-Fix bug when you delete a selection (selection is an entire column
or entire row). before If there was a cell merged and you selected a part
of a cell merged, cell merged was not refreshing.
No it works

Could you test it please.

Thanks 
bye

["patch46.diff" (text/x-c++)]

? KSpreadCellIface_stub.h
? KSpreadCellIface_stub.cpp
cvs server: Diffing .
Index: kspread_cell.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_cell.cc,v
retrieving revision 1.202
diff -u -p -r1.202 kspread_cell.cc
--- kspread_cell.cc	2000/09/03 04:35:16	1.202
+++ kspread_cell.cc	2000/09/03 14:18:33
@@ -3941,7 +3941,8 @@ bool KSpreadCell::load( const QDomElemen
     QDomElement f = cell.namedItem( "format" ).toElement();
     if ( !f.isNull() && ( pm == Normal || pm == Format || pm == NoBorder ) )
     {
-        if ( !KSpreadLayout::load( f ) )
+        // send pm parameter. Didn't load Borders if pm==NoBorder
+        if ( !KSpreadLayout::load( f,pm ) )
             return false;
 
         if ( f.hasAttribute( "colspan" ) )
Index: kspread_dlg_format.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_dlg_format.cc,v
retrieving revision 1.10
diff -u -p -r1.10 kspread_dlg_format.cc
--- kspread_dlg_format.cc	2000/09/03 04:35:16	1.10
+++ kspread_dlg_format.cc	2000/09/03 14:18:34
@@ -301,7 +301,7 @@ bool KSpreadFormatDlg::parseXML( const Q
 	    KSpreadTable* table = m_view->activeTable();
 	    KSpreadLayout* cell = new KSpreadLayout( table );
 
-	    if ( !cell->load( e.namedItem("format").toElement() ) )
+	    if ( !cell->load( e.namedItem("format").toElement(),Normal ) )
 		return false;
 
 	    int row = e.attribute("row").toInt();
Index: kspread_layout.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_layout.cc,v
retrieving revision 1.43
diff -u -p -r1.43 kspread_layout.cc
--- kspread_layout.cc	2000/07/29 12:17:44	1.43
+++ kspread_layout.cc	2000/09/03 14:18:45
@@ -291,7 +291,7 @@ QDomElement KSpreadLayout::save( QDomDoc
     return format;
 }
 
-bool KSpreadLayout::load( const QDomElement& f )
+bool KSpreadLayout::load( const QDomElement& f,PasteMode pm )
 {
     bool ok;
 
@@ -405,6 +405,8 @@ bool KSpreadLayout::load( const QDomElem
     if ( !font.isNull() )
 	setTextFont( toFont(font) );
 
+    if(pm!=NoBorder)
+    {
     QDomElement left = f.namedItem( "left-border" ).toElement();
     if ( !left.isNull() )
     {
@@ -451,6 +453,8 @@ bool KSpreadLayout::load( const QDomElem
 	QDomElement pen = goUpDiagonal.namedItem( "pen" ).toElement();
 	if ( !pen.isNull() )
 	    setGoUpDiagonalPen( toPen(pen) );
+    }
+
     }
 
     if ( f.hasAttribute( "prefix" ) )
Index: kspread_layout.h
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_layout.h,v
retrieving revision 1.35
diff -u -p -r1.35 kspread_layout.h
--- kspread_layout.h	2000/07/29 12:17:44	1.35
+++ kspread_layout.h	2000/09/03 14:18:51
@@ -30,6 +30,8 @@ class QDomDocument;
 #include <qcolor.h>
 #include <qfont.h>
 
+#include "kspread_global.h"
+
 /**
  */
 class KSpreadLayout
@@ -83,7 +85,7 @@ public:
     //
     ////////////////////////////////
 
-    bool load( const QDomElement& f );
+    bool load( const QDomElement& f,PasteMode pm );
     QDomElement save( QDomDocument& doc ) const;
 
     ////////////////////////////////
Index: kspread_table.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_table.cc,v
retrieving revision 1.202
diff -u -p -r1.202 kspread_table.cc
--- kspread_table.cc	2000/08/31 04:38:34	1.202
+++ kspread_table.cc	2000/09/03 14:19:20
@@ -4194,7 +4194,7 @@ void KSpreadTable::deleteSelection( cons
 
         deleteCells( r );
     }
-
+    refreshMergedCell();
     emit sig_updateView( this );
 }
 
cvs server: cannot find kspread_view.cc
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]