[patch] kspread-gcc43.patch

kspread-gcc43.patch (text/plain), 1.80 KB, created by Peter Alfredsen (RETIRED) on 2008-03-23 13:17:04 UTC

diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp
--- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2007-05-30 23:43:20.000000000 +0200
+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp	2008-03-12 00:59:07.000000000 +0100
@@ -174,12 +174,7 @@
 	return m_cell->text();
 }
 
-bool Cell::setText(const QString& text, bool asString) {
-
-	//FIXME: there is some problem with asString parameter, when it's set
-	//to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
-	//kspread: Cell at row 6, col 1 marked as formula, but formula is NULL
-
+bool Cell::setText(const QString& text) {
 	KSpread::ProtectedCheck prot;
 	prot.setSheet (m_sheet);
 	prot.add (QPoint (m_col, m_row));
@@ -189,7 +184,7 @@
 	KSpread::DataManipulator *dm = new KSpread::DataManipulator ();
 	dm->setSheet (m_sheet);
 	dm->setValue (text);
-	dm->setParsing (!asString);
+	dm->setParsing (true);
 	dm->add (QPoint (m_col, m_row));
 	dm->execute ();
 
diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h
--- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h	2007-05-30 23:43:20.000000000 +0200
+++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h	2008-03-12 00:59:07.000000000 +0100
@@ -131,11 +131,10 @@
 		*/
 		const QString text() const;
 		/**
-		* Set the text of the cell. If asString is true, the text
-		* will be handled as string else we try to parse the
-		* string to the expected value.
+		* Set the text of the cell. the text
+		* will be handled as string
 		*/
-		bool setText(const QString& text, bool asString = false);
+		bool setText(const QString& text);
 
 		/**
 		* Return the textcolor as RGB-value in the format "#RRGGBB".