mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetDialogController not valid yet

Browse Source 
Change-Id: I476744d8f351f4ab2afce5974355a066edc8a4a6
Reviewed-on: https://gerrit.libreoffice.org/68489
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-02-28 09:20:40 +00:00
parent 2dfffccde8
commit 65438bcda4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/inc/cuitabarea.hxx
View File

@@ -249,7 +249,7 @@ protected:
std::unique_ptr<weld::ToggleButton> m_xBtnBitmap; std::unique_ptr<weld::ToggleButton> m_xBtnBitmap;
std::unique_ptr<weld::ToggleButton> m_xBtnPattern; std::unique_ptr<weld::ToggleButton> m_xBtnPattern;
void SetOptimalSize(); void SetOptimalSize(weld::DialogController* pController);
private: private:
DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void); DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void);

2
cui/source/tabpages/backgrnd.cxx
View File

@@ -1479,7 +1479,7 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
VclPtr<SfxTabPage> SvxBkgTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs) VclPtr<SfxTabPage> SvxBkgTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
{ {
auto xRet = VclPtr<SvxBkgTabPage>::Create(pWindow, *rAttrs); auto xRet = VclPtr<SvxBkgTabPage>::Create(pWindow, *rAttrs);
xRet->SetOptimalSize(); xRet->SetOptimalSize(pWindow.pController);
return xRet; return xRet;
} }

6
cui/source/tabpages/tparea.cxx
View File

@@ -119,9 +119,9 @@ SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs
SetExchangeSupport(); SetExchangeSupport();
} }
void SvxAreaTabPage::SetOptimalSize() void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
{ {
TabPageParent aFillTab(m_xFillTab.get(), GetDialogController()); TabPageParent aFillTab(m_xFillTab.get(), pController);
// TEMP // TEMP
if (!aFillTab.pController) if (!aFillTab.pController)
aFillTab.pParent = GetParentDialog(); aFillTab.pParent = GetParentDialog();
@@ -343,7 +343,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
VclPtr<SfxTabPage> SvxAreaTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs) VclPtr<SfxTabPage> SvxAreaTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
{ {
auto xRet = VclPtr<SvxAreaTabPage>::Create(pParent, *rAttrs); auto xRet = VclPtr<SvxAreaTabPage>::Create(pParent, *rAttrs);
xRet->SetOptimalSize(); xRet->SetOptimalSize(pParent.pController);
return xRet; return xRet;
} }