cws tl78: merge with DEV300 m77

3 files changed, 14 insertions, 170 deletions

diff --git a/framework/source/inc/loadenv/loaddispatchlistener.hxx b/framework/source/inc/loadenv/loaddispatchlistener.hxx
deleted file mode 100644
index 6d1bf8d165a2..000000000000
--- a/framework/source/inc/loadenv/loaddispatchlistener.hxx
+++ /dev/null
@@ -1,165 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __FRAMEWORK_LOADENV_LOADDISPATCHLISTENER_HXX_
-#define __FRAMEWORK_LOADENV_LOADDISPATCHLISTENER_HXX_
-
-//_______________________________________________
-// includes of own project
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <threadhelp/gate.hxx>
-#include <macros/xinterface.hxx>
-
-//_______________________________________________
-// includes of uno interface
-#include <com/sun/star/frame/XDispatchResultListener.hpp>
-
-/*
-#include <com/sun/star/frame/DispatchResultEvent.hpp>
-*/
-
-//_______________________________________________
-// includes of an other project
-
-#ifndef _OSL_CONDITN_HXX_
-#include <osl/condition.hxx>
-#endif
-#include <cppuhelper/weak.hxx>
-
-//_______________________________________________
-// namespace
-
-namespace framework{
-
-namespace css = ::com::sun::star;
-
-//_______________________________________________
-// definitions
-
-/** @short  listen for finished dispatches, where document will be loaded.
-
-    @descr  This listener can be bound to an URL - so its well known
-            for which load request this event was triggered.
-            Thats needed - but not supported by the XDispatchResultListener
-            notification.
-            Further a condition can be used to synchronize any outside code
-            against the occurence of this event.
-
-    @author as96863
- */
-class LoadDispatchListener : public  css::frame::XDispatchResultListener // => css.lang.XEventListener
-                           , private ThreadHelpBase
-                           , public  ::cppu::OWeakObject
-{
-    //___________________________________________
-    // member
-
-    private:
-
-        /** @short  the URL which is bound to this callback. */
-        ::rtl::OUString m_sURL;
-
-        /** @short  the original event, which was notified to this object. */
-        css::frame::DispatchResultEvent m_aResult;
-
-        /** @short  used to let the user of this instance wait, till an
-                    event occures.
-         */
-        ::osl::Condition m_aUserWait;
-
-    //___________________________________________
-    // native interface
-
-    public:
-
-        //_______________________________________
-        /** @short  initialize a new instance of this class. */
-        LoadDispatchListener();
-
-        //_______________________________________
-        /** @short  deinitialize an instance of this class. */
-        virtual ~LoadDispatchListener();
-
-        //_______________________________________
-        /** @short  bind this listenerr to a new URL.
-
-            @param  sURL
-                    the new URL bound to this instance.
-         */
-        void setURL(const ::rtl::OUString & sURL);
-
-        //_______________________________________
-        /** @short  let the user of this instance wait.
-
-            @descr  If the call timed out - false is returned.
-                    Otherwise it returns true.
-                    Then the method getResult() has to be called,
-                    to get the origianl event.
-
-            @param  nWait_ms
-                    the time for wait in [ms].
-                    If its set to 0 this call is blocked till
-                    an event occures!
-
-            @return TRUE if an event occured in time - FALSE otherwhise.
-        */
-        sal_Bool wait(sal_Int32 nWait_ms);
-
-        //_______________________________________
-        /** @short  returns the result of this listener operation.
-
-            @descr  If wait() (which must be called before!) returns FALSE
-                    the return of getResult() is undefined!
-
-            @return The result of the got listener notification.
-         */
-        css::frame::DispatchResultEvent getResult() const;
-
-    //___________________________________________
-    // uno interface
-
-    public:
-
-        //_______________________________________
-        // css.uno.XInterface
-        FWK_DECLARE_XINTERFACE
-
-        //_______________________________________
-        // css.frame.XDispatchResultListener
-        virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
-            throw(css::uno::RuntimeException);
-
-        //_______________________________________
-        // css.lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException);
-};
-
-} // namespace framework
-
-#endif // __FRAMEWORK_LOADENV_LOADDISPATCHLISTENER_HXX_
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index f78117d7021b..982f390f8469 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -417,6 +417,7 @@ class LoadEnv : private ThreadHelpBase
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException);
 */
+
     //___________________________________________
     // static interface
 
@@ -455,6 +456,14 @@ class LoadEnv : private ThreadHelpBase
                                             const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor);
 
         /** TODO document me ... */
+        static  void initializeUIDefaults(
+                    const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rSMGR,
+                    ::comphelper::MediaDescriptor& io_lMediaDescriptor,
+                    const bool _bUIMode,
+                    QuietInteraction** o_ppQuiteInteraction
+                );
+
+        /** TODO document me ... */
         void impl_setResult(sal_Bool bResult);
 
         /** TODO document me ... */
@@ -484,7 +493,7 @@ class LoadEnv : private ThreadHelpBase
 
         /** @short  tries to detect the type and the filter of the specified content.
 
-            @descr  This method actualize the available media descriptor of this instance,
+            @descr  This method update the available media descriptor of this instance,
                     so it contains the right type, a corresponding filter, may a
                     valid frame loader etc. In case detection failed, this descriptor
                     is corrected first, before a suitable exception will be thrown.
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 45282fb252bc..bb26e98f4695 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -172,11 +172,11 @@ class LoadEnvException
             @param  exUno
                     the original catched uno exception.
          */
-        LoadEnvException(      sal_Int32            nID  ,
-                         const css::uno::Exception& exUno)
+        LoadEnvException(      sal_Int32        nID  ,
+                         const css::uno::Any&   exUno)
         {
-            m_nID          = nID  ;
-            m_exOriginal <<= exUno;
+            m_nID        = nID  ;
+            m_exOriginal = exUno;
         }
 
         //_______________________________________