diff options
| author | Noel Power <noel.power@suse.com> | 2013-07-12 14:06:08 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-07-12 14:17:03 +0100 |
| commit | df9f26c22a59ae2309201d2709ea5f8a0ecbf247 (patch) | |
| tree | 16cd62b16e7a12a1140274fa687a8a2775dabfe2 /svtools/source | |
| parent | 146e3927f06cf5d1f1782a3dd6b04fc68945bad6 (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
Diffstat (limited to 'svtools/source')
| -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; |