toolkit/inc/controls/controlmodelcontainerbase.hxx | 5 +++-- toolkit/source/controls/controlmodelcontainerbase.cxx | 1 - 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit f70276214149b8497c755f117bed8104cc1f783a Author: Noel Grandin <[email protected]> AuthorDate: Tue Sep 10 10:25:34 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Sep 10 12:05:39 2024 +0200 use concrete UNO type in ControlContainerBase Change-Id: Ibbdde51c7257ab7d8db690dd97670ef570b52556 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173123 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx index d8efbcf700bc..31dcc3707525 100644 --- a/toolkit/inc/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx @@ -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 ); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index f39f12a9c816..b7c8466f1fe6 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -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(); }
