summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-11-27 23:38:38 +0100
committerAndras Timar <andras.timar@collabora.com>2014-11-28 10:19:49 +0100
commit7cbc78da69a755b8a994c46c5f04bee0b4b0dd1b (patch)
treed8d5abe9b22fe5d4b63b4200b028ac825bd7348b
parentd12fc79394842951807ab8c58a810cd9c5848cb7 (diff)
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.timar@collabora.com> Conflicts: cui/source/tabpages/paragrph.cxx Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d
-rw-r--r--cui/source/tabpages/paragrph.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0e71f68c8d16..71fb62686b10 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();