From kde-commits  Fri Jul 08 20:51:56 2005
From: Raphael Langerhorst <raphael-langerhorst () gmx ! at>
Date: Fri, 08 Jul 2005 20:51:56 +0000
To: kde-commits
Subject: branches/koffice/1.4/koffice
Message-Id: <1120855916.627562.23762.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112085818408672

SVN commit 432874 by raphael:

KOffice 1.4 Backport

Backport fixes from Adriaan he only committed to trunk,
patches taken from the FreeBSD ports collection
/usr/ports/editors/koffice-kde3/files
This commit includes all patches except the kexi patch.


 M  +1 -1      filters/kspread/excel/sidewinder/excel.cpp  
 M  +1 -1      krita/plugins/cimg/CImg.h  
 M  +2 -2      kspread/dialogs/kspread_dlg_database.cc  


--- branches/koffice/1.4/koffice/filters/kspread/excel/sidewinder/excel.cpp #432873:432874
@@ -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;
--- branches/koffice/1.4/koffice/krita/plugins/cimg/CImg.h #432873:432874
@@ -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++) {
--- branches/koffice/1.4/koffice/kspread/dialogs/kspread_dlg_database.cc #432873:432874
@@ -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 )
   {