strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use concrete UNO type in ControlContainerBase

Browse source 
Change-Id: Ibbdde51c7257ab7d8db690dd97670ef570b52556
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173123
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-09-10 10:25:34 +02:00
parent 07df95e75a
commit f702762141
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
toolkit/inc/controls/controlmodelcontainerbase.hxx
View file

@ -37,12 +37,13 @@
#include <com/sun/star/awt/tab/XTabPageModel.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/interfacecontainer4.hxx>
#include <rtl/ref.hxx>
#include <mutex>
#include <vector>
namespace com::sun::star::resource { class XStringResourceResolver; }
namespace com::sun::star::uno { class XComponentContext; }
class StdTabController;
typedef UnoControlModel ControlModel_Base;
typedef ::cppu::AggImplInheritanceHelper8 < ControlModel_Base
@ -221,7 +222,7 @@ protected:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
bool mbSizeModified;
bool mbPosModified;
css::uno::Reference< css::awt::XTabController > mxTabController;
rtl::Reference< StdTabController > mxTabController;
css::uno::Reference< css::util::XModifyListener > mxListener;
void ImplInsertControl( css::uno::Reference< css::awt::XControlModel > const & rxModel, const OUString& rName );

1
toolkit/source/controls/controlmodelcontainerbase.cxx
View file

@ -1371,7 +1371,6 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod
{
mxTabController->setModel( nullptr ); // just to be sure, should not be necessary
removeTabController( mxTabController );
::comphelper::disposeComponent( mxTabController ); // just to be sure, should not be necessary
mxTabController.clear();
}