cui/source/inc/cuitabarea.hxx | 2 --
cui/source/tabpages/tpcolor.cxx | 7 +++----
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 2ce8c7e2ec7a5b8a78c03b4adb2d52964287cf73
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 22 19:16:52 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 23 09:51:36 2019 +0200
should use DialogController here
Change-Id: Ie0ad42e98d574d15172c6ed3a58714c3f87593cd
Reviewed-on: https://gerrit.libreoffice.org/79355
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 92dab7b168c2..652e38b59d07 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -659,8 +659,6 @@ class SvxColorTabPage : public SfxTabPage
using TabPage::DeactivatePage;
private:
- VclPtr<Window> mpTopDlg;
-
const SfxItemSet& rOutAttrs;
XColorListRef pColorList;
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index cc910f3d56da..72526db27fff 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -39,7 +39,6 @@ using namespace com::sun::star;
SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet&
rInAttrs)
: SfxTabPage(pParent, "cui/ui/colorpage.ui", "ColorPage", &rInAttrs)
- , mpTopDlg( GetParentDialog() )
, rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
, pnColorListState( nullptr )
@@ -148,7 +147,6 @@ SvxColorTabPage::~SvxColorTabPage()
void SvxColorTabPage::dispose()
{
- mpTopDlg.clear();
m_xValSetRecentListWin.reset();
m_xValSetRecentList.reset();
m_xValSetColorListWin.reset();
@@ -445,8 +443,9 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl,
weld::ComboBox&, void)
pList->SetName(maPaletteManager.GetPaletteName());
if(pList->Load())
{
- SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >(
mpTopDlg.get() );
- SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >(
mpTopDlg.get() );
+ SfxOkDialogController* pController = GetDialogController();
+ SvxAreaTabDialog* pArea =
dynamic_cast<SvxAreaTabDialog*>(pController);
+ SvxLineTabDialog* pLine =
dynamic_cast<SvxLineTabDialog*>(pController);
pColorList = pList;
if( pArea )
pArea->SetNewColorList(pList);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
