Update to KOffice 1.4.0a.

Note that 'a' does *not* stand for 'alpha', but denotes a short-notice
bugfix release made after KOffice 1.4.0.

8 files changed, 48 insertions, 78 deletions

diff --git a/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp
new file mode 100644
index 000000000000..68068710b7c0
--- /dev/null
+++ b/editors/calligra/files/extrapatch-kexi-main-keximainwindowimpl.cpp
@@ -0,0 +1,13 @@
+--- kexi/main/keximainwindowimpl.cpp.orig	Thu Jun 30 17:28:58 2005
++++ kexi/main/keximainwindowimpl.cpp	Thu Jun 30 17:29:14 2005
+@@ -106,8 +106,8 @@
+ //#define PROPEDITOR_VISIBILITY_CHANGES
+ 
+ //temporary fix to manage layout
+-#include "ksplitter.h"
+-#define KDOCKWIDGET_P 1
++// #include "ksplitter.h"
++// #define KDOCKWIDGET_P 1
+ 
+ //#ifndef KEXI_NO_MIGRATION
+ //#include "migration/importwizard.h"
diff --git a/editors/calligra/files/patch-configure b/editors/calligra/files/patch-configure
deleted file mode 100644
index 5147ed156f26..000000000000
--- a/editors/calligra/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Oct 30 03:46:09 2004
-+++ configure	Sat Oct 30 03:46:54 2004
-@@ -26335,7 +26335,7 @@
-     PTHREAD_LIBS="$PTHREAD_LIBS_save"
-   fi
- 
--  if test -z "$LIBPTHREAD"; then
-+  if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then
-     echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
diff --git a/editors/calligra/files/patch-filters-kspread-excel-sidewinder-excel.cpp b/editors/calligra/files/patch-filters-kspread-excel-sidewinder-excel.cpp
new file mode 100644
index 000000000000..65e60fd83a86
--- /dev/null
+++ b/editors/calligra/files/patch-filters-kspread-excel-sidewinder-excel.cpp
@@ -0,0 +1,11 @@
+--- filters/kspread/excel/sidewinder/excel.cpp.orig	Wed Jun 29 02:06:17 2005
++++ filters/kspread/excel/sidewinder/excel.cpp	Wed Jun 29 02:04:06 2005
+@@ -5412,7 +5412,7 @@
+       case 10:  valueFormat = "0.00%"; break;
+       case 11:  valueFormat = "0.00E+00"; break;
+       case 12:  valueFormat = "#?/?"; break;
+-      case 13:  valueFormat = "#\?\?\/\?\?"; break;
++      case 13:  valueFormat = "#\?\?/\?\?"; break;
+       case 14:  valueFormat = "M/D/YY"; break;
+       case 15:  valueFormat = "D-MMM-YY"; break;
+       case 16:  valueFormat = "D-MMM"; break;
diff --git a/editors/calligra/files/patch-krita-plugins-cimg-CImg.h b/editors/calligra/files/patch-krita-plugins-cimg-CImg.h
new file mode 100644
index 000000000000..9c914acb3d05
--- /dev/null
+++ b/editors/calligra/files/patch-krita-plugins-cimg-CImg.h
@@ -0,0 +1,11 @@
+--- krita/plugins/cimg/CImg.h.orig	Tue Jun 28 02:31:30 2005
++++ krita/plugins/cimg/CImg.h	Tue Jun 28 02:32:10 2005
+@@ -5135,7 +5135,7 @@
+       if (ny1<0 || ny0>=dimy()) return *this;
+       if (ny0<0) { nx0-=ny0*(nx1-nx0)/(ny1-ny0); ny0=0; }
+       if (ny1>=dimy()) { nx1+=(ny1-dimy())*(nx0-nx1)/(ny1-ny0); ny1=dimy()-1;}
+-      const unsigned int dmax = (unsigned int)cimg::max(std::abs(nx1-nx0),ny1-ny0), whz = width*height*depth;
++      const unsigned int dmax = (unsigned int)cimg::max(std::abs((long int)(nx1-nx0)),(long int)(ny1-ny0)), whz = width*height*depth;
+       const float px = dmax?(nx1-nx0)/(float)dmax:0, py = dmax?(ny1-ny0)/(float)dmax:0;
+       float x = (float)nx0, y = (float)ny0;
+       if (opacity>=1) for (unsigned int t=0; t<=dmax; t++) {
diff --git a/editors/calligra/files/patch-kspread-dialogs-kspread_dlg_database.cc b/editors/calligra/files/patch-kspread-dialogs-kspread_dlg_database.cc
new file mode 100644
index 000000000000..0f733f0e891f
--- /dev/null
+++ b/editors/calligra/files/patch-kspread-dialogs-kspread_dlg_database.cc
@@ -0,0 +1,13 @@
+--- kspread/dialogs/kspread_dlg_database.cc.orig	Tue Jun 28 03:42:22 2005
++++ kspread/dialogs/kspread_dlg_database.cc	Tue Jun 28 03:48:20 2005
+@@ -600,8 +600,8 @@
+   // An update command must also be followed by a space, or it would be parsed
+   // as an identifier.
+   // For sanity, also check that there is a SELECT 
+-  QRegExp couldModifyDB( "(^|[( \s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
+-  QRegExp couldQueryDB( "(^|[( \s])(SELECT) ", false /* cs */ );
++  QRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
++  QRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ );
+ 
+   if (couldModifyDB.search( queryStr ) != -1 || couldQueryDB.search ( queryStr ) == -1 )
+   {
diff --git a/editors/calligra/files/patch-kspread_kspread_cell.cc b/editors/calligra/files/patch-kspread_kspread_cell.cc
deleted file mode 100644
index 4a02dc363cfa..000000000000
--- a/editors/calligra/files/patch-kspread_kspread_cell.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- kspread/kspread_cell.cc.orig	Sun Feb 20 23:27:56 2005
-+++ kspread/kspread_cell.cc	Sun Feb 20 23:29:21 2005
-@@ -2882,7 +2882,7 @@
-       x = indent + cellRect.x() + m_dTextX;
-     else
-       x = indent + cellRect.x() + m_dTextX
--        - ( fm.descent() + fm.ascent() ) * sin( angle * M_PI / 180 );
-+        - doc->unzoomItX(( fm.descent() + fm.ascent() ) * sin( angle * M_PI / 180 ));
-     double y;
-     if ( angle > 0 )
-       y = cellRect.y() + m_dTextY;
diff --git a/editors/calligra/files/patch-post-1.3.5-koffice.diff b/editors/calligra/files/patch-post-1.3.5-koffice.diff
deleted file mode 100644
index 4635b7562fac..000000000000
--- a/editors/calligra/files/patch-post-1.3.5-koffice.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/XRef.cc	30 Oct 2004 16:35:33 -0000	1.6
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc	20 Jan 2005 17:36:38 -0000	1.8
-@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
- 	} else {
- 	  keyLength = 5;
- 	}
-+	if (keyLength < 1) {
-+	  keyLength = 1;
-+	}
-+	if (keyLength > 16) {
-+	  keyLength = 16;
-+	}
- 	permFlags = permissions.getInt();
- 	if (encVersion >= 1 && encVersion <= 2 &&
- 	    encRevision >= 2 && encRevision <= 3) {
diff --git a/editors/calligra/files/patch-xpdf_security_integer_overflow_2.diff b/editors/calligra/files/patch-xpdf_security_integer_overflow_2.diff
deleted file mode 100644
index 929a3ba2964c..000000000000
--- a/editors/calligra/files/patch-xpdf_security_integer_overflow_2.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -u -b -p -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/Gfx.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ filters/kword/pdf/xpdf/xpdf/Gfx.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
-@@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	   ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
-diff -u -b -p -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/GfxState.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ filters/kword/pdf/xpdf/xpdf/GfxState.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
-@@ -682,6 +682,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+	  nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
-@@ -1023,6 +1028,11 @@ GfxColorSpace *GfxDeviceNColorSpace::par
-     goto err2;
-   }
-   nCompsA = obj1.arrayGetLength();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "DeviceN color space with too many (%d > %d) components",
-+         nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   for (i = 0; i < nCompsA; ++i) {
-     if (!obj1.arrayGet(i, &obj2)->isName()) {
-       error(-1, "Bad DeviceN color space (names)");