[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/inc/cuitabarea.hxx   |    2 --
 cui/source/tabpages/tpcolor.cxx |    7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 500ccb7d03e589268d02c8614479a81473337eaf
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 22 19:16:52 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Oct 8 11:41:20 2019 +0200

    should use DialogController here
    
    Change-Id: Ie0ad42e98d574d15172c6ed3a58714c3f87593cd
    Reviewed-on: https://gerrit.libreoffice.org/79356
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 4b2dd2f3ac84..ba6fbc482197 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -660,8 +660,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 4264f7cda73a..8e19d7262767 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -57,7 +57,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 )
@@ -166,7 +165,6 @@ SvxColorTabPage::~SvxColorTabPage()
 
 void SvxColorTabPage::dispose()
 {
-    mpTopDlg.clear();
     m_xValSetRecentListWin.reset();
     m_xValSetRecentList.reset();
     m_xValSetColorListWin.reset();
@@ -463,8 +461,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);