summaryrefslogtreecommitdiffstats
path: root/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-04-26 11:28:01 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-04-26 11:28:01 +0200
commitd56d039d95d14dfa39fb1e3630e508bf48982c49 (patch)
tree4ec8984845b893ab7409aaaedb2e69ac95e2b023 /redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch
parenta513a89bebab63ea439e7f6090cf474c67a7a3b0 (diff)
downloadtde-packaging-d56d039d95d14dfa39fb1e3630e508bf48982c49.tar.gz
tde-packaging-d56d039d95d14dfa39fb1e3630e508bf48982c49.zip
RHEL/Fedora: updates koffice 3.5.13
Diffstat (limited to 'redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch')
-rw-r--r--redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch b/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch
new file mode 100644
index 000000000..9147ffad2
--- /dev/null
+++ b/redhat/applications/koffice/kexi-fp_expressions-1.1.3.patch
@@ -0,0 +1,21 @@
+Index: kexi/kexidb/expression.cpp
+===================================================================
+--- kexi/kexidb/expression.cpp (revision 742153)
++++ kexi/kexidb/expression.cpp (working copy)
+@@ -400,14 +400,10 @@
+ if (ltInt && rtInt)
+ return KexiDB::maximumForIntegerTypes(lt, rt);
+
+- if (Field::isFPNumericType(lt) && rtInt)
++ if (Field::isFPNumericType(lt) && (rtInt || lt==rt))
+ return lt;
+- if (Field::isFPNumericType(rt) && ltInt)
++ if (Field::isFPNumericType(rt) && (ltInt || lt==rt))
+ return rt;
+- if ((lt==Field::Double || lt==Field::Float) && rtInt)
+- return lt;
+- if ((rt==Field::Double || rt==Field::Float) && ltInt)
+- return rt;
+
+ return Field::Boolean;
+ }