cui/source/tabpages/tpgradnt.cxx | 2 +- cui/source/tabpages/tphatch.cxx | 2 +- cui/source/tabpages/tppattern.cxx | 2 +- cui/source/tabpages/tpshadow.cxx | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 52a626ffb48d2b04a355b31063ca58198e8c2e11 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Tue Sep 24 10:01:40 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Tue Sep 24 13:19:20 2019 +0200 should use the controller here Change-Id: Ic6a97c0032521bf7099ba1ef9a1ab196d50e0894 Reviewed-on: https://gerrit.libreoffice.org/79445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 3e99b3405dae..6274913ac078 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -141,7 +141,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& rSet ) *m_pnColorListState & ChangeType::MODIFIED ) { SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ? - dynamic_cast<SvxAreaTabDialog*>(GetParentDialog()) : nullptr; + dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr; if (pArea) m_pColorList = pArea->GetNewColorList(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 4793cb887137..6d99d73817e8 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -142,7 +142,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) *m_pnColorListState & ChangeType::MODIFIED ) { SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ? - dynamic_cast<SvxAreaTabDialog*>(GetParentDialog()) : nullptr; + dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr; if (pArea) m_pColorList = pArea->GetNewColorList(); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index ef96e4511c1e..c2358a0fa546 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -141,7 +141,7 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet ) *m_pnColorListState & ChangeType::MODIFIED ) { SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ? - dynamic_cast<SvxAreaTabDialog*>(GetParentDialog()) : nullptr; + dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr; if (pArea) m_pColorList = pArea->GetNewColorList(); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 63b1fa8f89dc..a64b108657ba 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -184,14 +184,14 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { if( *m_pnColorListState & ChangeType::CHANGED ) { - SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( GetParentDialog() ); + SvxAreaTabDialog* pArea = dynamic_cast<SvxAreaTabDialog*>(GetDialogController()); if( pArea ) { m_pColorList = pArea->GetNewColorList(); } else { - SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( GetParentDialog() ); + SvxLineTabDialog* pLine = dynamic_cast<SvxLineTabDialog*>(GetDialogController()); if( pLine ) m_pColorList = pLine->GetNewColorList(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits