[libreoffice/f16] Resolves: fdo#44816 crash using instances dialog of dataform navigator
Michael Stahl
mstahl at fedoraproject.org
Thu Mar 1 12:47:26 UTC 2012
commit c4a41486913201b9855e0763b87c4461545dc213
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Mar 1 13:47:13 2012 +0100
Resolves: fdo#44816 crash using instances dialog of dataform navigator
...rtcut-for-.uno-SearchDialog-should-be-Ctr.patch | 53 ++++++++++++++++++++
...sing-instances-dialog-of-dataform-navigat.patch | 39 ++++++++++++++
libreoffice.spec | 5 ++
3 files changed, 97 insertions(+), 0 deletions(-)
---
diff --git a/0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch b/0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch
new file mode 100644
index 0000000..27075f1
--- /dev/null
+++ b/0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch
@@ -0,0 +1,53 @@
+From 3bb279c73e0034c7c50e5561de82c681a2f3b3b9 Mon Sep 17 00:00:00 2001
+From: Andras Timar <atimar at suse.com>
+Date: Wed, 14 Sep 2011 19:43:08 +0200
+Subject: [PATCH 1/2] default shortcut for .uno:SearchDialog should be Ctrl+H
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ctrl+Alt+F was not good, because on some keyboard layouts it enters
+a character. Ctrl+Alt (=AltGr on Windows) should be avoided, if possible.
+
+Signed-off-by: Caolán McNamara <caolanm at redhat.com>
+---
+ .../data/org/openoffice/Office/Accelerators.xcu | 9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+index 44de8c4..4fd42dc 100644
+--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
++++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+@@ -85,7 +85,7 @@
+ <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ </prop>
+ </node>
+- <node oor:name="F_MOD1_MOD2" oor:op="replace">
++ <node oor:name="H_MOD1" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:SearchDialog</value>
+ </prop>
+@@ -235,7 +235,7 @@
+ <value xml:lang="en-US">vnd.sun.star.findbar:FocusToFindbar</value>
+ </prop>
+ </node>
+- <node oor:name="F_MOD1_MOD2" oor:op="replace">
++ <node oor:name="H_MOD1" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno.SearchDialog</value>
+ </prop>
+@@ -635,11 +635,6 @@
+ <value xml:lang="en-US">.uno:GoToStartSel</value>
+ </prop>
+ </node>
+- <node oor:name="H_MOD1" oor:op="replace">
+- <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+- <value xml:lang="de">.uno:SuperScript</value>
+- </prop>
+- </node>
+ <node oor:name="INSERT" oor:op="replace">
+ <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+ <value xml:lang="en-US">.uno:InsertContents</value>
+--
+1.7.7.6
+
diff --git a/0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch b/0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch
new file mode 100644
index 0000000..cbbe1bf
--- /dev/null
+++ b/0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch
@@ -0,0 +1,39 @@
+From 0aaa35c6d3b07a273af6a1be2d26add4a9d537cd Mon Sep 17 00:00:00 2001
+From: Noel Power <noel.power at novell.com>
+Date: Thu, 1 Mar 2012 12:10:56 +0000
+Subject: [PATCH 2/2] fix crash using instances dialog of dataform navigator
+ fdo#44816
+
+also silence a valgrind 'Conditional jump or move depends on uninitialised value(s)' where initial state of a checkbox was undefined
+(cherry picked from commit 7b860d4970604f08ebd2e818bfd63891dd940804)
+
+Signed-off-by: Michael Stahl <mstahl at redhat.com>
+---
+ svx/source/form/datanavi.cxx | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
+index e2e0b17..6718cd1 100644
+--- a/svx/source/form/datanavi.cxx
++++ b/svx/source/form/datanavi.cxx
+@@ -306,7 +306,8 @@ namespace svxform
+ m_pNaviWin ( _pNaviWin ),
+ m_bHasModel ( false ),
+ m_eGroup ( _eGroup ),
+- m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) )
++ m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ),
++ m_bLinkOnce ( false )
+
+ {
+ FreeResource();
+@@ -1883,7 +1884,6 @@ namespace svxform
+ m_aTabCtrl.SetPageText( nId, sNewName );
+ bIsDocModified = true;
+ }
+- delete(pPage);
+ }
+ break;
+ }
+--
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8dbf0aa..6841151 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -225,6 +225,8 @@ Patch106: 0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch
Patch107: 0001-Correctly-calculate-leap-year.patch
Patch108: 0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch
Patch109: 0001-SwRootFrm-SwRootFrm-refactor.patch
+Patch110: 0001-default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch
+Patch111: 0002-fix-crash-using-instances-dialog-of-dataform-navigat.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1133,6 +1135,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch107 -p1 -b .Correctly-calculate-leap-year.patch
%patch108 -p1 -b .fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch
%patch109 -p1 -b .SwRootFrm-SwRootFrm-refactor.patch
+%patch110 -p1 -b .default-shortcut-for-.uno-SearchDialog-should-be-Ctr.patch
+%patch111 -p1 -b .fix-crash-using-instances-dialog-of-dataform-navigat.patch
# these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings
@@ -2447,6 +2451,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
* Wed Feb 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-8.UNBUILT
- Resolves: fdo#31966 do not create an empty slide when printing handouts
- fixes nsplugin
+- Resolves: fdo#44816 crash using instances dialog of dataform navigator
* Wed Feb 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-7
- Resolves: rhbz#788045 swriter --help wouldn't display help
More information about the scm-commits
mailing list