diff -Naurp koffice-1.6.3-orig/filters/kpresenter/powerpoint/libppt/pole.cpp koffice-1.6.3/filters/kpresenter/powerpoint/libppt/pole.cpp --- koffice-1.6.3-orig/filters/kpresenter/powerpoint/libppt/pole.cpp 2007-05-30 15:38:58.000000000 -0600 +++ koffice-1.6.3/filters/kpresenter/powerpoint/libppt/pole.cpp 2008-11-22 16:45:05.000000000 -0600 @@ -32,6 +32,8 @@ #include #include +#include + #include "pole.h" // enable to activate debugging output diff -Naurp koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx --- koffice-1.6.3-orig/filters/kword/wordperfect/import/TableStyle.cxx 2007-05-30 15:39:02.000000000 -0600 +++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx 2008-11-22 16:47:47.000000000 -0600 @@ -36,6 +36,8 @@ #include #endif +#include + TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) : Style(psName), mPropList(xPropList) diff -Naurp koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx --- koffice-1.6.3-orig/filters/kword/wordperfect/import/TextRunStyle.cxx 2007-05-30 15:39:02.000000000 -0600 +++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx 2008-11-22 16:48:30.000000000 -0600 @@ -37,6 +37,8 @@ #include #endif +#include + ParagraphStyle::ParagraphStyle(WPXPropertyList *pPropList, const WPXPropertyListVector &xTabStops, const WPXString &sName) : mpPropList(pPropList), mxTabStops(xTabStops), diff -Naurp koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp --- koffice-1.6.3-orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2007-05-30 15:35:49.000000000 -0600 +++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008-11-22 16:50:24.000000000 -0600 @@ -26,6 +26,7 @@ #include #include +#include using namespace KexiDB; diff -Naurp koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp koffice-1.6.3/krita/core/kis_perspective_math.cpp --- koffice-1.6.3-orig/krita/core/kis_perspective_math.cpp 2007-05-30 15:40:31.000000000 -0600 +++ koffice-1.6.3/krita/core/kis_perspective_math.cpp 2008-11-22 16:52:47.000000000 -0600 @@ -24,7 +24,7 @@ #if 1 -#include +#include #include #include //#define NDEBUG // uncomment to remove checking of assert() @@ -57,9 +57,9 @@ template void rprint()const; //print entries on a single line void resize(int n); int operator==(const vector& v)const; - friend vector operator*(ElType c,vector& v ); - friend vector operator*(vector& v,ElType c ); - friend ostream& operator<<(ostream& s,vector& v); + friend vector operator* (ElType c,vector& v ); + friend vector operator*(vector& v,ElType c ); + friend std::ostream& operator<<(std::ostream& s,vector& v); }; template void vector::zero() @@ -129,10 +129,10 @@ template void vector::rprint()const //print entries on a single line { int i; - cout << "VECTOR: "; - cout << "("; - for(i=0;i @@ -164,7 +164,7 @@ template return ans; } template - ostream& operator<<(ostream& s,vector& v) + std::ostream& operator<<(std::ostream& s,vector& v) { s << "("; for(int i=0;i matrix operator-(const matrix& a); matrix transpose(); //matrix inverse(); - friend ostream& operator<<(ostream& s,matrix& m); + friend std::ostream& operator<<(std::ostream& s,matrix& m); friend void ludcmp(matrix& a,vector& indx,double &d); friend void lubksb(matrix&a,vector& indx,vector&b); }; @@ -357,7 +357,7 @@ template return ans; } template - ostream& operator<<(ostream& s,matrix& m) + std::ostream& operator<<(std::ostream& s,matrix& m) { for(int i=0; i& a, vector big) big=temp; /* kdDebug() << temp << " " << fabs(a[i][j]) << " "<< big <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 @@ bool Cell::setText(const QString& text, 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 -Naurp koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h --- koffice-1.6.3-orig/kspread/plugins/scripting/kspreadcore/krs_cell.h 2007-05-30 15:43:20.000000000 -0600 +++ koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h 2008-11-22 16:56:56.000000000 -0600 @@ -131,11 +131,10 @@ class Cell : public Kross::Api::Class