./packages/openofficeorg/3.2.1/unstable r2084: add fix for ##572535
------------------------------------------------------------
revno: 2084
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-11-03 22:44:53 +0100
message:
add fix for ##572535
added:
patches/set-correct-default-formula-syntax.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-11-03 20:41:12 +0000
+++ b/changelog 2010-11-03 21:44:53 +0000
@@ -1,5 +1,9 @@
openoffice.org (1:3.2.1-8) UNRELEASED; urgency=low
+ * debian/patches/set-correct-default-formula-syntax.diff: backport
+ from LibreOffice: Set correct default formula syntax value in case
+ it's not explicitly set (closes: #572535)
+
* debian/catalog.xml: move ...
* debian/catalog.xml.in: ... here and fix path to dtd
* debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle
@@ -10,7 +14,7 @@
* debian/templates/debian-presentation*: add Debian presentation template,
thanks Raphael Hertzog (closes: #602043)
- -- Rene Engelhard <rene@debian.org> Wed, 22 Sep 2010 17:58:25 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 03 Nov 2010 21:18:52 +0100
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== modified file 'patches/series'
--- a/patches/series 2010-09-22 15:21:57 +0000
+++ b/patches/series 2010-11-03 21:44:53 +0000
@@ -11,3 +11,4 @@
SA40775.diff
add-some-missing-german-translations.diff
pdf-link-export-fix.diff
+set-correct-default-formula-syntax.diff
=== added file 'patches/set-correct-default-formula-syntax.diff'
--- a/patches/set-correct-default-formula-syntax.diff 1970-01-01 00:00:00 +0000
+++ b/patches/set-correct-default-formula-syntax.diff 2010-11-03 21:44:53 +0000
@@ -0,0 +1,30 @@
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/calc-formula-variable-separators-sc.diff-old 2010-11-03 21:14:08.000000000 +0100
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/calc-formula-variable-separators-sc.diff 2010-11-03 21:16:03.000000000 +0100
+@@ -319,7 +319,7 @@
+ aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) )
+ {
+ sal_Int32 nIntVal = 0;
+-@@ -328,6 +423,69 @@ ScDocCfg::ScDocCfg() :
++@@ -328,6 +423,72 @@ ScDocCfg::ScDocCfg() :
+
+ SetDate( nDateDay, nDateMonth, nDateYear );
+
+@@ -335,7 +335,8 @@
+ + {
+ + case SCFORMULAOPT_GRAMMAR:
+ + {
+-+ ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
+++ // Get default value in case this option is not set.
+++ ::formula::FormulaGrammar::Grammar eGram = GetFormulaSyntax();
+ +
+ + do
+ + {
+@@ -354,6 +355,8 @@
+ + case 2: // Excel R1C1
+ + eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
+ + break;
+++ default:
+++ ;
+ + }
+ + }
+ + while (false);
Reply to: