diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-26 15:00:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-26 15:00:36 +0000 |
| commit | aee7e11d704523f4ce45c7e0d21b81e9dda2a47d (patch) | |
| tree | 5f522da31bb5fc8c37fc49381f5bc6825b253736 /desktop | |
| parent | 8d7ea5352457d197f4a19346e648c7316f801c64 (diff) | |
CWS-TOOLING: integrate CWS tkr18
2009-01-27 19:56:17 +0100 tkr r267017 : #i98521# remove -fast switch for solaris build
2009-01-23 07:44:53 +0100 tkr r266766 : #i98223# cought exception while loading gvfs ucp
2009-01-16 16:32:58 +0100 kso r266434 : i98053# - support for XInteractionHandler2n
2009-01-16 16:29:41 +0100 kso r266433 : i98053# - new interface: XInteractionHandler2
2009-01-14 12:48:17 +0100 tkr r266288 : #i98053# install new configuation file for InteractionHandler
2009-01-14 08:16:57 +0100 tkr r266264 : #i98053# new configuation file for InteractionHandler
2009-01-14 08:14:20 +0100 tkr r266263 : #i98053# deligate InteractionHandlerRequest if office cannot handle it
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 58 |
1 files changed, 34 insertions, 24 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 3bf38d1e2b61..e87701b4addf 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -154,21 +154,26 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) Reference<XContentProviderManager> xCPM = cb->getContentProviderManagerInterface(); #if 0 + try + { - Reference<XContentProviderFactory> xCPF( - xServiceFactory->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.ucb.ContentProviderProxyFactory")), - UNO_QUERY); - if(xCPF.is()) - xCPM->registerContentProvider( - xCPF->createContentProvider( + Reference<XContentProviderFactory> xCPF( + xServiceFactory->createInstance( rtl::OUString::createFromAscii( - "com.sun.star.ucb.GnomeVFSContentProvider" - ) - ), - rtl::OUString::createFromAscii(".*"), - false); + "com.sun.star.ucb.ContentProviderProxyFactory")), + UNO_QUERY); + if(xCPF.is()) + xCPM->registerContentProvider( + xCPF->createContentProvider( + rtl::OUString::createFromAscii( + "com.sun.star.ucb.GnomeVFSContentProvider" + ) + ), + rtl::OUString::createFromAscii(".*"), + false); + } catch (...) + { + } #else // Workaround for P1 #124597#. Instanciate GNOME-VFS-UCP in the thread that initialized @@ -176,18 +181,23 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) // a different thread. The latter may happen when calling the Office remotely via UNO. // THIS IS NOT A FIX, JUST A WORKAROUND! - Reference<XContentProvider> xCP( - xServiceFactory->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.ucb.GnomeVFSContentProvider")), - UNO_QUERY); - if(xCP.is()) - xCPM->registerContentProvider( - xCP, - rtl::OUString::createFromAscii(".*"), - false); -#endif + try + { + Reference<XContentProvider> xCP( + xServiceFactory->createInstance( + rtl::OUString::createFromAscii( + "com.sun.star.ucb.GnomeVFSContentProvider")), + UNO_QUERY); + if(xCP.is()) + xCPM->registerContentProvider( + xCP, + rtl::OUString::createFromAscii(".*"), + false); + } catch (...) + { + } } +#endif } } catch (RuntimeException e) { } |