[Libreoffice-commits] core.git: toolkit/source

[Noel Grandin (via logerrit)]

 toolkit/source/controls/tree/treedatamodel.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 1914124c6a343f58edbc52dab5238d03a7110ced
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Nov 7 15:24:02 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 8 09:22:40 2023 +0100

    loplugin:fieldcast in MutableTreeDataModel
    
    Change-Id: I713db74dac43a61fe98ab18834e0dd6e24117caa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159097
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/toolkit/source/controls/tree/treedatamodel.cxx 
b/toolkit/source/controls/tree/treedatamodel.cxx
index eca39d94f86b..4471697fb687 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -78,7 +78,7 @@ private:
     comphelper::OInterfaceContainerHelper4<XTreeDataModelListener> 
maTreeDataModelListeners;
     comphelper::OInterfaceContainerHelper4<XEventListener> maEventListeners;
     bool mbDisposed;
-    Reference< XTreeNode > mxRootNode;
+    rtl::Reference< MutableTreeNode > mxRootNode;
 };
 
 class MutableTreeNode: public ::cppu::WeakImplHelper< XMutableTreeNode, 
XServiceInfo >
@@ -182,15 +182,11 @@ void SAL_CALL MutableTreeDataModel::setRoot( const 
Reference< XMutableTreeNode >
         throw IllegalArgumentException();
 
     std::unique_lock aGuard( m_aMutex );
-    if( xNode == mxRootNode )
+    if( xNode.get() == mxRootNode.get() )
         return;
 
     if( mxRootNode.is() )
-    {
-        rtl::Reference< MutableTreeNode > xOldImpl( dynamic_cast< 
MutableTreeNode* >( mxRootNode.get() ) );
-        if( xOldImpl.is() )
-            xOldImpl->mbIsInserted = false;
-    }
+        mxRootNode->mbIsInserted = false;
 
     rtl::Reference< MutableTreeNode > xImpl( dynamic_cast< MutableTreeNode* >( 
xNode.get() ) );
     if( !xImpl.is() || xImpl->mbIsInserted )