summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-07-02 12:07:57 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-07-02 12:10:54 +0200
commit50b1657865318d83e468b5fdf7d0d48585549637 (patch)
tree511e672cd7306a8b83e9b74c54352bff9ea95432 /svx
parent7c8218ed493e2d51f12968ba43e3d7de0c71efc0 (diff)
svx: always set SharedFirst to True for now in SvxHFPage::FillItemSet()
This feature is not complete yet (so adding real UI doesn't make sense yet), but the lack of SID_ATTR_PAGE_SHARED_FIRST caused a crash in sw's ItemSetToPageDesc(). Change-Id: I3832b617aba50ad7d451766628bbb005879d25fe
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/hdft.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index dc24a0e3cf71..50c92c7fc5bd 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -80,6 +80,7 @@ static sal_uInt16 pRanges[] =
SID_ATTR_PAGE_ON, SID_ATTR_PAGE_ON,
SID_ATTR_PAGE_DYNAMIC, SID_ATTR_PAGE_DYNAMIC,
SID_ATTR_PAGE_SHARED, SID_ATTR_PAGE_SHARED,
+ SID_ATTR_PAGE_SHARED_FIRST, SID_ATTR_PAGE_SHARED_FIRST,
SID_ATTR_HDFT_DYNAMIC_SPACING, SID_ATTR_HDFT_DYNAMIC_SPACING,
0
};
@@ -237,6 +238,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
const sal_uInt16 nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC );
const sal_uInt16 nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
const sal_uInt16 nWShared = GetWhich( SID_ATTR_PAGE_SHARED );
+ const sal_uInt16 nWSharedFirst = GetWhich( SID_ATTR_PAGE_SHARED_FIRST );
const sal_uInt16 nWBrush = GetWhich( SID_ATTR_BRUSH );
const sal_uInt16 nWBox = GetWhich( SID_ATTR_BORDER_OUTER );
const sal_uInt16 nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER );
@@ -247,6 +249,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
nWOn, nWOn,
nWDynamic, nWDynamic,
nWShared, nWShared,
+ nWSharedFirst, nWSharedFirst,
nWBrush, nWBrush,
nWBoxInfo, nWBoxInfo,
nWBox, nWBox,
@@ -264,6 +267,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
aSet.Put( SfxBoolItem( nWOn, aTurnOnBox.IsChecked() ) );
aSet.Put( SfxBoolItem( nWDynamic, aHeightDynBtn.IsChecked() ) );
aSet.Put( SfxBoolItem( nWShared, aCntSharedBox.IsChecked() ) );
+ aSet.Put( SfxBoolItem( nWSharedFirst, sal_True) );
if(aDynSpacingCB.IsVisible() && SFX_WHICH_MAX > nWDynSpacing)
{
SfxBoolItem* pBoolItem = (SfxBoolItem*)pPool->GetDefaultItem(nWDynSpacing).Clone();