cui/source/tabpages/paragrph.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fbb9c7654f812431044aa5a49dba8f0ef6ebdb9a
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 27 23:38:38 2014 +0100
fdo#70861: cui: fix crash in SvxExtParagraphTabPage
SvxExtParagraphTabPage::Reset() must not request a pool default for
SID_ATTR_PARA_PAGENUM because it simply does not exist; the item is
backed by a member of SwPageDesc in Writer.
(cherry picked from commit 9c1a1b98776ca2216d82af303394a09f2bac0471)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
Conflicts:
cui/source/tabpages/paragrph.cxx
Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d
(cherry picked from commit 7cbc78da69a755b8a994c46c5f04bee0b4b0dd1b)
Reviewed-on: https://gerrit.libreoffice.org/13176
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0e71f68..71fb626 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1562,7 +1562,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet&
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
- if ( rSet.GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState(_nWhich) >= SFX_ITEM_SET )
{
const sal_uInt16 nPageNum =
( (const SfxUInt16Item&)rSet.Get( _nWhich ) ).GetValue();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
