commit c9a3d679c630e8cc9a82ad2d84b726748e5d314f
author Caolán McNamara <caolanm@redhat.com> Sat Mar 16 20:46:49 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Sun Mar 17 00:36:04 2019 +0100
tree 930cdbbde1429f5bff0357ff40203dcff2c645c5
parent 6af7bd87a64ddd93e3beef134914311eeac07373

Resolves: tdf#124058 factor bitmap page into size req when its toggled on

post ctor time

Change-Id: I8257c8ffdfc4dab9893ab7d2d67e218dd3f8097c
Reviewed-on: https://gerrit.libreoffice.org/69353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

cui/source/tabpages/backgrnd.cxx

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index bdf559e6..eff3e8f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1565,6 +1565,7 @@ void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
        }
        if (nFlags & SvxBackgroundTabFlags::SHOW_SELECTOR)
            m_xBtnBitmap->show();
        SetOptimalSize(GetDialogController());
    }

    if ( bCharBackColor )

cui/source/tabpages/tparea.cxx

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 54615fd..b5b535e 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -121,6 +121,8 @@ SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs

void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
{
    m_xFillTab->set_size_request(-1, -1);

    TabPageParent aFillTab(m_xFillTab.get(), pController);
    // TEMP
    if (!aFillTab.pController)