diff options
| author | Noel Power <noel.power@suse.com> | 2013-07-12 14:22:30 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-07-15 11:08:06 +0000 |
| commit | 4079afed49aaa5b1d84443a21f63007754ba31ae (patch) | |
| tree | b599d8726224c34904c2db24b9fe669f668d3089 /svtools | |
| parent | 49d3f271b0da11f1793135b067b9b5d4f48cf537 (diff) | |
fix fdo#66586 Revert "fdo#46808, create IDL fortree::DefaultTreeDataModel"
This reverts commit fcd01fba69db6de6cfc983fae65b6ba6764de0d6.
Service DefaultTreeDataModel actually doens't exist ( and we can't find
when/where it used to :-( ) The treecontrolpeer.cxx change to
use the new service also had the undesired effect of throwing an exception
when the UnoTreeControl model is inserted ( previously this failed silently )
The net effect is the dialog control is malformed and not initialised
correctly
(cherry picked from commit df9f26c22a59ae2309201d2709ea5f8a0ecbf247)
also partial revert of f50553593613cbefb7f197fed66498bb6556a39a on
DefaultTreeDataModel.idl so the revert above would apply
Change-Id: Id76cc12a5360f6435bd39ca86020655feba20c9f
Reviewed-on: https://gerrit.libreoffice.org/4865
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index a403e317b5ae..e4976a62b756 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -22,8 +22,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/view/SelectionType.hpp> -#include <com/sun/star/awt/tree/DefaultTreeDataModel.hpp> - #include <toolkit/helper/property.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -1230,8 +1228,12 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere if( !xDataModel.is() ) { - Reference< XComponentContext > xORB( ::comphelper::getProcessComponentContext() ); - mxDataModel.query( DefaultTreeDataModel::create(xORB)); + static const OUString aSN( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.tree.DefaultTreeDataModel" ) ); + Reference< XMultiServiceFactory > xORB( ::comphelper::getProcessServiceFactory() ); + if( xORB.is() ) + { + mxDataModel.query( xORB->createInstance( aSN ) ); + } } mxDataModel = xDataModel; |