diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-10 14:51:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-11 09:56:57 +0200 |
| commit | 1520d56ea3cd5075c71b8ec492e3d4c23b9593f5 (patch) | |
| tree | ebc9c23478614e399d0813ea2c5b320897afa615 /svx | |
| parent | bc65992929392d597070237471aa4d5a7eec674d (diff) | |
weld SvxBitmapPickTabPage
Change-Id: I4c5fd94356f3640b150ef9fec48a166457f3b70b
Reviewed-on: https://gerrit.libreoffice.org/60266
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index aae13f758f9c..66ea1f6732bd 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -750,8 +750,8 @@ void NumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -NumValueSet::NumValueSet() - : SvtValueSet(nullptr) +NumValueSet::NumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) + : SvtValueSet(std::move(pScrolledWindow)) , ePageType(NumberingPageType::BULLET) , pVDev(nullptr) { @@ -815,18 +815,15 @@ void NumValueSet::SetOutlineNumberingSettings( } } -SvxBmpNumValueSet::SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits) - : SvxNumValueSet(pParent, nWinBits) +SvxBmpNumValueSet::SvxBmpNumValueSet(std::unique_ptr<weld::ScrolledWindow> pScrolledWindow) + : NumValueSet(std::move(pScrolledWindow)) , aFormatIdle("SvxBmpNumValueSet FormatIdle") { - init(); } -VCL_BUILDER_FACTORY_ARGS(SvxBmpNumValueSet, WB_TABSTOP) - void SvxBmpNumValueSet::init() { - SvxNumValueSet::init(NumberingPageType::BITMAP); + NumValueSet::init(NumberingPageType::BITMAP); bGrfNotFound = false; GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); SetStyle( GetStyle() | WB_VSCROLL ); @@ -838,19 +835,13 @@ void SvxBmpNumValueSet::init() SvxBmpNumValueSet::~SvxBmpNumValueSet() { - disposeOnce(); -} - -void SvxBmpNumValueSet::dispose() -{ GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS); aFormatIdle.Stop(); - SvxNumValueSet::dispose(); } void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt) { - SvxNumValueSet::UserDraw(rUDEvt); + NumValueSet::UserDraw(rUDEvt); tools::Rectangle aRect = rUDEvt.GetRect(); vcl::RenderContext* pDev = rUDEvt.GetRenderContext(); |