rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: rhbz#657541 don't crash during processing of auto. styles when joining paragraphs

Browse Source
This commit is contained in:
David Tardon 2010-11-27 16:21:08 +01:00
parent a610ba3af2
commit 756ce26801
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.spec
View File

@ -97,6 +97,7 @@ Patch13: qstart.dont-forceenabled-on-post-reg-restart.patch
Patch14: libreoffice-installfix.patch
Patch15: exit.quickstarter.when.deleted.patch
Patch16: 0001-destroydesktop.in.timeout.patch
Patch17: openoffice.org-3.3.0.rhbz657541.join-paragraphs.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -710,6 +711,7 @@ cp -p %{SOURCE20} external/unowinreg/unowinreg.dll
%patch14 -p1 -b .libreoffice-installfix.patch
%patch15 -p1 -b .exit.quickstarter.when.deleted.patch
%patch16 -p1 -b .0001-destroydesktop.in.timeout.patch
%patch17 -p1 -b .rhbz657541.join-paragraphs.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@ -2014,9 +2016,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%changelog
* Fri Nov 26 2010 Caolán McNamara <caolanm@redhat.com> 3.2.99.3-2
* Sat Nov 27 2010 Caolán McNamara <caolanm@redhat.com> 3.2.99.3-2
- Resolves: rhbz#610103 exit quickstarter when libs deleted
- Resolves: rhbz#652695 release desktop in timeout
- Resolves: rhbz#657541 don't crash during processing of auto. styles
when joining paragraphs (dtardon)
* Thu Nov 18 2010 Caolán McNamara <caolanm@redhat.com 3.2.99.3-1
- next Libreoffice milestone

21
openoffice.org-3.3.0.rhbz657541.join-paragraphs.patch Normal file
View File

@ -0,0 +1,21 @@
diff -r 98d427d68ce0 sw/source/core/txtnode/thints.cxx
--- a/sw/source/core/txtnode/thints.cxx Thu Nov 04 14:44:14 2010 +0000
+++ b/sw/source/core/txtnode/thints.cxx Sat Nov 27 16:03:40 2010 +0100
@@ -2102,7 +2102,7 @@
const SwTxtAttr* const pAutoStyle(i_rAttrSpan.second);
SfxItemIter aIter(m_rAttrSet);
const SfxPoolItem* pItem(aIter.GetCurItem());
- while (true)
+ while (pItem)
{
const USHORT nWhich(pItem->Which());
if (CharFmt::IsItemIncluded(nWhich, pAutoStyle))
@@ -2170,7 +2170,7 @@
o_rClearIds.reserve(i_rAttrSet.Count());
SfxItemIter aIter(i_rAttrSet);
const SfxPoolItem* pItem(aIter.GetCurItem());
- while (true)
+ while (pItem)
{
o_rClearIds.push_back(pItem->Which());