From f90cfaf44571d3119cb7dd2ec9a318008a69ead9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 7 Oct 2013 13:22:33 +0100 Subject: [PATCH] Resolves: rhbz#996162 crash with no bullet font --- ...hbz-996162-apparent-NULL-bullet-font.patch | 34 +++++++++++++++++++ libreoffice.spec | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 0001-Resolves-rhbz-996162-apparent-NULL-bullet-font.patch diff --git a/0001-Resolves-rhbz-996162-apparent-NULL-bullet-font.patch b/0001-Resolves-rhbz-996162-apparent-NULL-bullet-font.patch new file mode 100644 index 0000000..bc27af2 --- /dev/null +++ b/0001-Resolves-rhbz-996162-apparent-NULL-bullet-font.patch @@ -0,0 +1,34 @@ +From 166510ed48bf49b75a031ce973f41d08fb4e4518 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 22 Aug 2013 15:29:10 +0100 +Subject: [PATCH] Resolves: rhbz#996162 apparent NULL bullet font + +Change-Id: I2f50ef1dabe2f152f2e18025edc88734158dbea2 +--- + editeng/source/outliner/outliner.cxx | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx +index cb27c69..49465fb 100644 +--- a/editeng/source/outliner/outliner.cxx ++++ b/editeng/source/outliner/outliner.cxx +@@ -897,9 +897,15 @@ Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const + } + + Font aBulletFont; ++ const Font *pSourceFont = 0; + if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL ) + { +- aBulletFont = *pFmt->GetBulletFont(); ++ pSourceFont = pFmt->GetBulletFont(); ++ } ++ ++ if (pSourceFont) ++ { ++ aBulletFont = *pSourceFont; + } + else + { +-- +1.8.3.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 0d29b51..6e01106 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -262,6 +262,7 @@ Patch21: 0001-Resolves-rhbz-1013480-crash-in-EditLineList-operator.patch Patch22: 0001-rhbz-1014010-Missing-dependencies-in-isBootstrapType.patch Patch23: 0001-Resolves-rhbz-1013844-fdo-47482-encrypted-OOo-1.0-do.patch Patch24: 0001-Resolves-rhbz-1015281-crash-on-clicking-custom-anima.patch +Patch25: 0001-Resolves-rhbz-996162-apparent-NULL-bullet-font.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1018,6 +1019,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch22 -p1 -b .rhbz-1014010-Missing-dependencies-in-isBootstrapType.patch %patch23 -p1 -b .rhbz-1013844-fdo-47482-encrypted-OOo-1.0-do.patch %patch24 -p1 -b .rhbz-1015281-crash-on-clicking-custom-anima.patch +%patch25 -p1 -b .rhbz-996162-apparent-NULL-bullet-font.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2110,6 +2112,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Mon Oct 07 2013 Caolán McNamara - 1:4.1.2.3-3 - Resolves: rhbz#1015281 crash on clicking custom animation +- Resolves: rhbz#996162 crash with no bullet font * Wed Oct 02 2013 Caolán McNamara - 1:4.1.2.3-2 - Resolves: rhbz#1013480 crash in EditLineList::operator[]