diff options
| author | Justin Luth <jluth@mail.com> | 2022-08-08 14:13:37 -0400 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-09 08:43:33 +0200 |
| commit | 6161b951c246125caf3efc009def0faf7caccc75 (patch) | |
| tree | 3c20194b283acfbbd67bc39e38cdbf828b24a72d /sfx2 | |
| parent | 9bfc9c3f414a5ff928fe093a4725e5e00e28aba5 (diff) | |
tdf#150278 sfx2: use provided aInfo, not factory
This continues the revolution from tdf#81293 that was done
for the MOD section of this function in 7.4.
It looks like the same thing needs to be done for APP.
Prior to this commit, opening up the same form control
property dialog always opened up to the same initial tab,
regardless of the last-used-tab. ONLY of document reload
would the last-used-tab come into play.
Now it always opens up immediately tot he last-used-tab.
This is full fix for SAL_USE_VCLPLUGIN=gen.
gtk3 needs an additional fix so it doesn't follow the
second-last-used-tab instead.
Change-Id: Ie7c13cfb48de87c4ab595460680f4306e8feaac7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138002
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 0887e5106137..a9c94152d383 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -211,12 +211,11 @@ std::unique_ptr<SfxChildWindow> SfxChildWindow::CreateChildWindow( sal_uInt16 nI pFact = pApp->GetChildWinFactoryById(nId); if ( pFact ) { - SfxChildWinInfo& rFactInfo = pFact->aInfo; if ( rInfo.bVisible ) { if ( pBindings ) pBindings->ENTERREGISTRATIONS(); - SfxChildWinInfo aInfo = rFactInfo; + SfxChildWinInfo aInfo = rInfo; Application::SetSystemWindowMode( SystemWindowFlags::NOAUTOMODE ); pChild = pFact->pCtor( pParent, nId, pBindings, &aInfo ); Application::SetSystemWindowMode( nOldMode ); |