diff options
Diffstat (limited to 'sw/source/uibase/sidebar/PageFooterPanel.cxx')
| -rw-r--r-- | sw/source/uibase/sidebar/PageFooterPanel.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index c85969e29168..1a2f049dcee5 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> #include <svl/intitem.hxx> #include <svl/eitem.hxx> +#include <svl/itemset.hxx> #include <svx/dlgutil.hxx> #include <svx/rulritem.hxx> #include <svx/svdtrans.hxx> @@ -59,7 +60,6 @@ PageFooterPanel::PageFooterPanel( maFooterSpacingController(SID_ATTR_PAGE_FOOTER_SPACING, *pBindings, *this), maFooterLayoutController(SID_ATTR_PAGE_FOOTER_LAYOUT, *pBindings, *this), meFUnit(GetModuleFieldUnit()), - aCustomEntry(), mpFooterItem( new SfxBoolItem(SID_ATTR_PAGE_FOOTER) ), mpFooterLRMarginItem( new SvxLongLRSpaceItem(0, 0, SID_ATTR_PAGE_FOOTER_LRMARGIN)), mpFooterSpacingItem( new SvxLongULSpaceItem(0, 0, SID_ATTR_PAGE_FOOTER_SPACING)), @@ -101,7 +101,7 @@ void PageFooterPanel::Initialize() SetMarginsAndSpacingFieldUnit(); - aCustomEntry = mxCustomEntry->get_label(); + m_aCustomEntry = mxCustomEntry->get_label(); mxFooterToggle->connect_toggled( LINK(this, PageFooterPanel, FooterToggleHdl) ); mxFooterMarginPresetLB->connect_changed( LINK(this, PageFooterPanel, FooterLRMarginHdl)); mxFooterSpacingLB->connect_changed( LINK(this, PageFooterPanel, FooterSpacingHdl)); @@ -142,15 +142,15 @@ void PageFooterPanel::UpdateMarginControl() if (mxFooterMarginPresetLB->get_id(i).toUInt32() == nLeft) { mxFooterMarginPresetLB->set_active(i); - int nCustomEntry = mxFooterMarginPresetLB->find_text(aCustomEntry); + int nCustomEntry = mxFooterMarginPresetLB->find_text(m_aCustomEntry); if (nCustomEntry != -1) mxFooterMarginPresetLB->remove(nCustomEntry); return; } } } - mxFooterMarginPresetLB->append_text(aCustomEntry); - mxFooterMarginPresetLB->set_active_text(aCustomEntry); + mxFooterMarginPresetLB->append_text(m_aCustomEntry); + mxFooterMarginPresetLB->set_active_text(m_aCustomEntry); } void PageFooterPanel::UpdateSpacingControl() @@ -162,14 +162,14 @@ void PageFooterPanel::UpdateSpacingControl() if (mxFooterSpacingLB->get_id(i).toUInt32() == nBottom) { mxFooterSpacingLB->set_active(i); - int nCustomEntry = mxFooterSpacingLB->find_text(aCustomEntry); + int nCustomEntry = mxFooterSpacingLB->find_text(m_aCustomEntry); if (nCustomEntry != -1) mxFooterSpacingLB->remove(nCustomEntry); return; } } - mxFooterSpacingLB->append_text(aCustomEntry); - mxFooterSpacingLB->set_active_text(aCustomEntry); + mxFooterSpacingLB->append_text(m_aCustomEntry); + mxFooterSpacingLB->set_active_text(m_aCustomEntry); } void PageFooterPanel::UpdateLayoutControl() @@ -246,7 +246,7 @@ void PageFooterPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, weld::Toggleable&, void ) { bool IsChecked = mxFooterToggle->get_active(); mpFooterItem->SetValue(IsChecked); |