diff -Nru libreoffice-3.3.2/debian/changelog libreoffice-3.3.2/debian/changelog --- libreoffice-3.3.2/debian/changelog 2011-04-20 00:25:22.000000000 +0200 +++ libreoffice-3.3.2/debian/changelog 2011-05-04 09:42:24.000000000 +0200 @@ -1,3 +1,10 @@ +libreoffice (1:3.3.2-1ubuntu5) natty; urgency=high + + * hotfix for Libreoffice Calc's PRODUCT function doesn't calculate correctly (LP: #775608) + * tentative patch for lp#746375 (LP: #746375) + + -- Bjoern Michaelsen Wed, 04 May 2011 09:39:41 +0200 + libreoffice (1:3.3.2-1ubuntu4) natty; urgency=low * fix corrupted startcenter desktop file (LP: #765010) diff -Nru libreoffice-3.3.2/debian/patches/lp746375.diff libreoffice-3.3.2/debian/patches/lp746375.diff --- libreoffice-3.3.2/debian/patches/lp746375.diff 1970-01-01 01:00:00.000000000 +0100 +++ libreoffice-3.3.2/debian/patches/lp746375.diff 2011-05-03 23:37:39.000000000 +0200 @@ -0,0 +1,60 @@ +Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/apply +=================================================================== +--- libreoffice-3.3.2.orig/libreoffice-build/patches/dev300/apply 2011-04-26 11:45:52.645409871 +0200 ++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-04-26 11:46:15.645409868 +0200 +@@ -2380,3 +2380,6 @@ + + [ UbuntuOnly ] + lp720716.diff ++ ++[ UbuntuOnly ] ++lp746375.diff +--- /dev/null 2011-04-26 09:25:32.995411000 +0200 ++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/lp746375.diff 2011-04-26 11:39:39.085409921 +0200 +@@ -0,0 +1,46 @@ ++From df71bb6970dc95a963ef2ea52f1f93f5f50325ed Mon Sep 17 00:00:00 2001 ++From: Caolán McNamara ++Date: Wed, 13 Apr 2011 11:23:40 +0000 ++Subject: Related: lp#746375 ensure a deterministic shutdown order for globals ++ ++--- ++diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx ++index 68bb949..97e44e7 100644 ++--- vcl/unx/gtk/a11y/atkutil.cxx +++++ vcl/unx/gtk/a11y/atkutil.cxx ++@@ -66,7 +66,14 @@ ++ ++ using namespace ::com::sun::star; ++ ++-static uno::WeakReference< accessibility::XAccessible > xNextFocusObject; +++namespace +++{ +++ struct theNextFocusObject : +++ public rtl::Static< uno::WeakReference< accessibility::XAccessible >, theNextFocusObject> +++ { +++ }; +++} +++ ++ static guint focus_notify_handler = 0; ++ ++ /*****************************************************************************/ ++@@ -80,7 +87,7 @@ atk_wrapper_focus_idle_handler (gpointer data) ++ ++ focus_notify_handler = 0; ++ ++- uno::Reference< accessibility::XAccessible > xAccessible = xNextFocusObject; +++ uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject::get(); ++ if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) ) ++ { ++ AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL; ++@@ -135,7 +142,7 @@ atk_wrapper_focus_tracker_notify_when_idle( const uno::Reference< accessibility: ++ if( focus_notify_handler ) ++ g_source_remove(focus_notify_handler); ++ ++- xNextFocusObject = xAccessible; +++ theNextFocusObject::get() = xAccessible; ++ ++ focus_notify_handler = g_idle_add (atk_wrapper_focus_idle_handler, xAccessible.get()); ++ } ++-- ++cgit v0.8.3-6-g21f6 diff -Nru libreoffice-3.3.2/debian/patches/lp775608.diff libreoffice-3.3.2/debian/patches/lp775608.diff --- libreoffice-3.3.2/debian/patches/lp775608.diff 1970-01-01 01:00:00.000000000 +0100 +++ libreoffice-3.3.2/debian/patches/lp775608.diff 2011-05-03 23:41:17.000000000 +0200 @@ -0,0 +1,33 @@ +Index: libreoffice-3.3.2/libreoffice-build/patches/hotfixes/001-lp775608.diff +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libreoffice-3.3.2/libreoffice-build/patches/hotfixes/001-lp775608.diff 2011-05-03 23:41:08.765322967 +0200 +@@ -0,0 +1,28 @@ ++commit eb5cd73db0ab42da28999cfba6b0f231245f2b3d ++Author: Bjoern Michaelsen ++AuthorDate: Tue May 3 23:01:34 2011 +0200 ++Commit: Bjoern Michaelsen ++CommitDate: Tue May 3 23:10:48 2011 +0200 ++ ++ lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly ++ ++diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx ++index f561317..3bc30fa 100644 ++--- sc/source/core/tool/interpr1.cxx +++++ sc/source/core/tool/interpr1.cxx ++@@ -3448,13 +3448,13 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero ) ++ if (nGlobalError) ++ break; ++ ++- IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fMem, fRes, bNull); +++ IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fRes, fMem, bNull); ++ } ++ break; ++ case svMatrix : ++ { ++ ScMatrixRef pMat = PopMatrix(); ++- IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fMem, fRes, bNull); +++ IterateMatrix(pMat, eFunc, bTextAsZero, nCount, nFuncFmtType, fVal, fRes, fMem, bNull); ++ } ++ break; ++ case svError: diff -Nru libreoffice-3.3.2/debian/patches/series libreoffice-3.3.2/debian/patches/series --- libreoffice-3.3.2/debian/patches/series 2011-04-20 00:25:22.000000000 +0200 +++ libreoffice-3.3.2/debian/patches/series 2011-05-03 23:38:25.000000000 +0200 @@ -16,3 +16,5 @@ fix-lo-desktop-pot.diff fix-jpeg.diff lp720716.diff +lp746375.diff +lp775608.diff