Tag: cws_src680_dba24
User: fs      
Date: 05/03/09 01:27:00

Modified:
 /dba/dbaccess/source/filter/xml/
  dbloader2.cxx

Log:
 #i10000# don't insert document twice to the GlobalEventBroadcaster

File Changes:

Directory: /dba/dbaccess/source/filter/xml/
===========================================

File [changed]: dbloader2.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.5.18.7&r2=1.5.18.8
Delta lines:  +5 -24
--------------------
--- dbloader2.cxx       8 Mar 2005 15:10:23 -0000       1.5.18.7
+++ dbloader2.cxx       9 Mar 2005 09:26:58 -0000       1.5.18.8
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbloader2.cxx,v $
  *
- *  $Revision: 1.5.18.7 $
+ *  $Revision: 1.5.18.8 $
  *
- *  last change: $Author: fs $ $Date: 2005/03/08 15:10:23 $
+ *  last change: $Author: fs $ $Date: 2005/03/09 09:26:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -497,26 +497,6 @@
                                     makeAny(xModel),
                                     PropertyState_DIRECT_VALUE);
 
-           try
-       {
-                       Reference< css::container::XSet > xModelCollection(
-                m_xServiceFactory->createInstance(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.frame.GlobalEventBroadcaster" ) )
-                ),
-                UNO_QUERY_THROW
-            );
-                       xModelCollection->insert(css::uno::makeAny(xModel));
-               Reference< ::com::sun::star::document::XEventListener > 
xDocEventBroadcaster(xModel,UNO_QUERY);
-               if ( xDocEventBroadcaster.is() )
-           {
-                   ::com::sun::star::document::EventObject aEvent(xModel, 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnNew")) );
-               xDocEventBroadcaster->notifyEvent(aEvent);
-               }
-       }
-           catch(Exception)
-       {
-               OSL_ENSURE(0,"Could not create GlobalEventBroadcaster!");
-           }
                // create the dialog
                Reference< XExecutableDialog > xAdminDialog(
             
m_xServiceFactory->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseWizardDialog")),aArgs),
 UNO_QUERY);
@@ -573,7 +553,7 @@
            }
     }
 
-       if (bSuccess && rListener.is())
+       if (bSuccess)
        {
                if ( xController.is() && rFrame.is() )
                        xController->attachFrame(rFrame);
@@ -590,6 +570,7 @@
         {
             OSL_ENSURE(0,"Could not add database model to global model 
collection and broadcast the events OnNew/OnLoad!");
         }
+        if ( rListener.is() )
                rListener->loadFinished(this);
 
                if ( bStartTableWizard )




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to