summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/tplneend.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-20 20:29:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-26 09:54:18 +0200
commita37e559ed123789f6bc8f7972242d6461ce692ab (patch)
tree7c6304b4541335b2bb706efda58b882132fe3819 /cui/source/tabpages/tplneend.cxx
parentb3f249c1351642be6f2774230ff80a6d20bd1401 (diff)
disinherit OWizardPage and SfxTabPage from vcl TabPage
Now that there's no need to support weld/unwelded mixes of pages in dialog any more. inherit from a BuilderPage which contains a Builder and Toplevel container BuilderPage Activate and Deactivate replace TabPage ActivatePage and DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and DeactivatePage. Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812 Reviewed-on: https://gerrit.libreoffice.org/79317 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/tabpages/tplneend.cxx')
-rw-r--r--cui/source/tabpages/tplneend.cxx23
1 files changed, 2 insertions, 21 deletions
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index b146fecff049..3d108c81626b 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -91,14 +91,8 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemS
SvxLineEndDefTabPage::~SvxLineEndDefTabPage()
{
- disposeOnce();
-}
-
-void SvxLineEndDefTabPage::dispose()
-{
m_xCtlPreview.reset();
m_xLbLineEnds.reset();
- SfxTabPage::dispose();
}
void SvxLineEndDefTabPage::Construct()
@@ -237,9 +231,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
}
}
-VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxLineEndDefTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
- return VclPtr<SvxLineEndDefTabPage>::Create(pParent, *rSet );
+ return std::make_unique<SvxLineEndDefTabPage>(pParent, *rSet );
}
void SvxLineEndDefTabPage::SelectLineEndHdl_Impl()
@@ -613,17 +607,4 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, weld::Button&, void)
}
}
-void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt )
-{
- SfxTabPage::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
- {
- auto nOldSelect = m_xLbLineEnds->get_active();
- m_xLbLineEnds->clear();
- m_xLbLineEnds->Fill(pLineEndList);
- m_xLbLineEnds->set_active(nOldSelect);
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */