diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
commit | 7e6737cc865d9f0ba44a88b4be0c8460325d7b84 (patch) | |
tree | 1a77c19de7eb263e582261883c19c36a2032e9ec /desktop | |
parent | 72339a084c6879c8437aee34a1f9daac50d2366e (diff) |
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/appinit.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/makefile.mk | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 5345b81140c5..3bf38d1e2b61 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -134,6 +134,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) bool ret = ::ucbhelper::ContentBroker::initialize( xServiceFactory, aArgs ) != false; +#ifdef GNOME_VFS_ENABLED // register GnomeUCP if necessary ::ucbhelper::ContentBroker* cb = ::ucbhelper::ContentBroker::get(); if(cb) { @@ -191,6 +192,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) } catch (RuntimeException e) { } } +#endif // GNOME_VFS_ENABLED return ret;; } diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index 7ae735148e5c..f0948baf6477 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -40,6 +40,10 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(ENABLE_GNOMEVFS)"=="TRUE" +CFLAGS+=-DGNOME_VFS_ENABLED +.ENDIF + SHL1TARGET = sofficeapp SHL1OBJS = \ $(SLO)$/app.obj \ |