diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-30 23:32:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-31 10:43:26 +0100 |
commit | 0aeacaf4e8be61091b578d96d5f540cd81f84d2b (patch) | |
tree | 03e9d553e2b5bf7fcba1608e2739a05dcf47727b /sfx2/source/appl/app.cxx | |
parent | f267b791f8eb9b32442ad98613a491737e3fc334 (diff) |
various unused code
Diffstat (limited to 'sfx2/source/appl/app.cxx')
-rw-r--r-- | sfx2/source/appl/app.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index ed3695cdb940..f5be7bd92e0e 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -121,10 +121,6 @@ #include <sfx2/mnuitem.hxx> #endif -#if defined( WNT ) -#define DDE_AVAILABLE -#endif - #include <unotools/saveopt.hxx> #include <unotools/undoopt.hxx> #include <svtools/helpopt.hxx> @@ -323,11 +319,10 @@ SfxApplication::SfxApplication() RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ initialize DDE" ); -#ifdef DDE_AVAILABLE -#ifndef DBG_UTIL - InitializeDde(); -#else - if( !InitializeDde() ) + sal_Bool bOk = InitializeDde(); + +#ifdef DBG_UTIL + if( !bOk ) { rtl::OStringBuffer aStr( RTL_CONSTASCII_STRINGPARAM("No DDE-Service possible. Error: ")); @@ -337,7 +332,8 @@ SfxApplication::SfxApplication() aStr.append('?'); DBG_ASSERT( sal_False, aStr.getStr() ); } -#endif +#else + (void)bOk; #endif pSfxHelp = new SfxHelp; |