diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-12-05 19:29:07 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-12-05 19:29:07 +0100 |
| commit | 8d669bc21b9d1976842ba8252d2f0fb953160bdd (patch) | |
| tree | 63e5a53c8ff9c4cdff33070e177eda653922f28a /shell/inc | |
| parent | f232b25c1eceb8e1c32cfd917d666b3a16b14405 (diff) | |
| parent | 875ac20478f16e5107acb222c0b851b99d2e0f27 (diff) | |
merge to m67
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/internal/config.hxx | 5 | ||||
| -rw-r--r-- | shell/inc/internal/utilities.hxx | 20 |
2 files changed, 25 insertions, 0 deletions
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx index 47394730c761..e9b3e0fd59ac 100644 --- a/shell/inc/internal/config.hxx +++ b/shell/inc/internal/config.hxx @@ -39,8 +39,13 @@ #include <tchar.h> #endif +#ifdef _AMD64_ +#define MODULE_NAME TEXT("shlxthdl_x64.dll") +#define MODULE_NAME_FILTER TEXT("ooofilt_x64.dll") +#else #define MODULE_NAME TEXT("shlxthdl.dll") #define MODULE_NAME_FILTER TEXT("ooofilt.dll") +#endif #define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Column Handler") #define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice.org Infotip Handler") diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index a552516400bc..f0f7022dc02c 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -47,6 +47,7 @@ #include "internal/types.hxx" #include <string> +#include <strsafe.h> //--------------------------------- /** Convert a string to a wstring @@ -89,4 +90,23 @@ bool HasOnlySpaces(const std::wstring& String); LCID LocaleSetToLCID( const LocaleSet_t & Locale ); #endif +//---------------------------------------------------------- +#ifdef DEBUG +inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) +{ + CHAR buffer[1024]; + va_list args; + + va_start( args, pFormat ); + StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args ); + OutputDebugStringA( buffer ); +} +#else +static inline void OutputDebugStringFormat( LPCSTR, ... ) +{ +} +#endif +//---------------------------------------------------------- + + #endif |