diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 21:12:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 21:14:33 +0000 |
| commit | f8513683bb2eb4c4d0573334df998aea634e5257 (patch) | |
| tree | 7dbb8f398127e7c6c08a10e463b2a41de8da0ac2 | |
| parent | 026ce884754f1be33bec2de48d173134625f622d (diff) | |
rename ApplyImageList
Change-Id: I0af692fe338c487b6ade62c2f8558fb9fd97f558
| -rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 15 | ||||
| -rw-r--r-- | sw/source/uibase/inc/wrap.hxx | 3 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 68266e2e817c..e29a814a991e 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -128,7 +128,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pWrapParallelRB->SetClickHdl(aLk2); m_pWrapThroughRB->SetClickHdl(aLk2); m_pIdealWrapRB->SetClickHdl(aLk2); - ApplyImageList(); + SetImages(); m_pWrapOutlineCB->SetClickHdl(LINK(this, SwWrapTabPage, ContourHdl)); } @@ -640,20 +640,11 @@ IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, Button*, void) if (bEnable == m_bContourImage) // so that it doesn't always flicker { m_bContourImage = !bEnable; - ApplyImageList(); + SetImages(); } } -void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt ) -{ - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && - (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) - ApplyImageList(); - - SfxTabPage::DataChanged( rDCEvt ); -} - -void SwWrapTabPage::ApplyImageList() +void SwWrapTabPage::SetImages() { m_pWrapThroughRB->SetModeRadioImage(get<FixedImage>("imgthrough")->GetImage()); bool bWrapOutline = !m_pWrapOutlineCB->IsChecked(); diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index b596dc511158..254a9a6dc58d 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -80,10 +80,9 @@ class SwWrapTabPage: public SfxTabPage virtual ~SwWrapTabPage() override; virtual void dispose() override; - void ApplyImageList(); + void SetImages(); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; DECL_LINK( RangeModifyHdl, SpinField&, void ); DECL_LINK( RangeLoseFocusHdl, Control&, void ); |