[Libreoffice-commits] .: 2 commits - svx/source sw/source

[Miklos Vajna]

 svx/source/dialog/hdft.cxx    |    4 ++++
 sw/source/ui/wrtsh/wrtsh1.cxx |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 50b1657865318d83e468b5fdf7d0d48585549637
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Jul 2 12:07:57 2012 +0200

    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

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index dc24a0e..50c92c7 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();
commit 7c8218ed493e2d51f12968ba43e3d7de0c71efc0
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Jul 2 10:56:06 2012 +0200

    SwWrtShell::ChangeHeaderOrFooter: fix typo
    
    Change-Id: I216fdfb3040dfe6748538d3c39b7d0c981ecd0a0

diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 1f2073b..3934bd5 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1814,7 +1814,7 @@ void SwWrtShell::SetReadonlyOption(sal_Bool bSet)
 }
 
 /*
- *  Switch on/off header of footer of a page style - if an empty name is
+ *  Switch on/off header or footer of a page style - if an empty name is
  *  given all styles are changed
  */
 void SwWrtShell::ChangeHeaderOrFooter(