diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-02 12:02:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-02 11:46:18 +0000 |
| commit | b40b6010077f875565ce90cd995222451e37321c (patch) | |
| tree | 5ad869c146407c8fa16197cd461991f78e500402 /desktop/source/app/appinit.cxx | |
| parent | daa869222edc3aded82f0fc3e73f126b6cfd08ad (diff) | |
ditch gnome-vfs2 support
Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db
Reviewed-on: https://gerrit.libreoffice.org/18262
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/app/appinit.cxx')
| -rw-r--r-- | desktop/source/app/appinit.cxx | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 794071953dcd..7928ad027e13 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -72,33 +72,6 @@ static void configureUcb() // For backwards compatibility, in case some code still uses plain // createInstance w/o args directly to obtain an instance: UniversalContentBroker::create(comphelper::getProcessComponentContext()); - -#if ENABLE_GNOME_VFS - try { - // Instantiate GNOME-VFS UCP in the thread that initialized GNOME in order - // to avoid a deadlock that may occur in case the UCP gets initialized from - // a different thread (which may happen when calling remotely via UNO); this - // is not a fix, just a workaround: - Reference< XCurrentContext > xCurrentContext(getCurrentContext()); - Any aValue(xCurrentContext->getValueByName("system.desktop-environment")); - OUString aDesktopEnvironment; - if ((aValue >>= aDesktopEnvironment) && aDesktopEnvironment == "GNOME") - { - Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - UniversalContentBroker::create(xContext) - ->registerContentProvider( - Reference<XContentProvider>( - xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.ucb.GnomeVFSContentProvider", xContext), - UNO_QUERY_THROW), - ".*", false); - } - } - catch ( const Exception & ) - { - SAL_WARN( "desktop.app", "missing gnome-vfs component to initialize thread workaround" ); - } -#endif // ENABLE_GNOME_VFS } void Desktop::InitApplicationServiceManager() |