diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-15 08:15:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-15 08:15:29 +0000 |
| commit | 727308673e8d0d3a18e0902aa570d376fd593bd2 (patch) | |
| tree | 24fec4c974f0b0979202455004025495abbafc67 /sfx2 | |
| parent | ba896296cdde70b85c1bc8527c766f2c697b142b (diff) | |
INTEGRATION: CWS oxtsysint01 (1.119.2); FILE MERGED
2008/04/23 09:40:56 dv 1.119.2.1: #i85856# use new SynchronousDispatch helper instead of loadComponentFromURL
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index a3a96ff5a9..fe310e2c6d 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: appopen.cxx,v $ - * $Revision: 1.119 $ + * $Revision: 1.120 $ * * This file is part of OpenOffice.org. * @@ -54,9 +54,10 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> -#ifndef _COMPHELPER_STORAGEHELPER_HXX_ + #include <comphelper/storagehelper.hxx> -#endif +#include <comphelper/synchronousdispatch.hxx> + #include <vcl/wrkwin.hxx> #include <svtools/intitem.hxx> #include <vcl/msgbox.hxx> @@ -1334,8 +1335,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) try { - Reference < XComponentLoader > xLoader( xFrame, UNO_QUERY ); - xComp = xLoader->loadComponentFromURL( aFileName, aTarget, 0, aArgs ); + xComp = ::comphelper::SynchronousDispatch::dispatch( xFrame, aFileName, aTarget, 0, aArgs ); +// Reference < XComponentLoader > xLoader( xFrame, UNO_QUERY ); +// xComp = xLoader->loadComponentFromURL( aFileName, aTarget, 0, aArgs ); } catch(const RuntimeException&) { |