diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-04-21 13:26:30 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-04-21 13:27:51 +0200 |
| commit | ea822495b776a8b0b9d6b99299fdbc7bfc8db340 (patch) | |
| tree | 545b39a7239452339c5f36ced6dcf1afd0a199b6 /fpicker | |
| parent | 9894f158a287bdfe9933df96ab117a9527e9195b (diff) | |
Partially revert: "Replace css macro with namespace for nicer namespacing"
To fix the build. I can't test it on win32, thought it would work...
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx | 8 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/vistatypes.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index ca1b223f745c..47909d7953c9 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -45,7 +45,11 @@ // namespace //----------------------------------------------------------------------------- -namespace css = ::com::sun::star; +#ifdef css + #error "Clash on using CSS as namespace define." +#else + #define css ::com::sun::star +#endif namespace fpicker{ namespace win32{ @@ -69,6 +73,8 @@ class IVistaFilePickerInternalNotify }}} +#undef css + #endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h index e1b1fc580923..08b4613f6d25 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -40,7 +40,11 @@ // namespace //----------------------------------------------------------------------------- -namespace css = ::com::sun::star; +#ifdef css + #error "Clash on using CSS as namespace define." +#else + #define css ::com::sun::star +#endif namespace fpicker{ namespace win32{ @@ -60,6 +64,8 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize } // namespace win32 } // namespace fpicker +#undef css + #endif // FPICKER_WIN32_VISTA_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |