[Libreoffice-commits] core.git: 2 commits - offapi/com offapi/UnoApi_offapi.mk svtools/source

[Noel Power]

 offapi/UnoApi_offapi.mk                               |    1 
 offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl |   38 ------------------
 svtools/source/uno/treecontrolpeer.cxx                |    8 ---
 3 files changed, 47 deletions(-)

New commits:
commit 3d64d67763038f4c7070f9bdbfdedf63360e6439
Author: Noel Power <noel.power at suse.com>
Date:   Fri Jul 12 14:15:12 2013 +0100

    remove create of com.sun.star.awt.tree.DefaultTreeDataModel, it doesn't exist
    
    Change-Id: I029286d9c25f0b7ee562e87cc7e205aa398e594b

diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index e4976a6..7130ffc 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1226,16 +1226,6 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
     if( mxDataModel.is() )
         mxDataModel->removeTreeDataModelListener( xListener );
 
-    if( !xDataModel.is() )
-    {
-        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;
 
     fillTree( rTree, mxDataModel );
commit df9f26c22a59ae2309201d2709ea5f8a0ecbf247
Author: Noel Power <noel.power at suse.com>
Date:   Fri Jul 12 14:06:08 2013 +0100

    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

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 495eea6..5a7f329 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
 	UnoControlTabPageModel \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
-	DefaultTreeDataModel \
 	MutableTreeDataModel \
 	MutableTreeNode \
 	TreeControl \
diff --git a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl b/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
deleted file mode 100644
index c709a0b..0000000
--- a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_awt_tree_DefaultTreeDataModel_idl__
-#define __com_sun_star_awt_tree_DefaultTreeDataModel_idl__
-
-#include <com/sun/star/awt/tree/XTreeDataModel.idl>
-
-
-module com {  module sun {  module star {  module awt { module tree {
-
-
-/**
-    @since LibreOffice 4.1
- */
-service DefaultTreeDataModel : XTreeDataModel;
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index a403e31..e4976a6 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;