diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-04-21 01:30:38 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-04-21 05:53:30 +0200 |
| commit | 2abba84aa7c639011956721a4922653130dd09a6 (patch) | |
| tree | 01f062a3991438ab99111fb5012effa22120a2bb /fpicker | |
| parent | 18a9e9e844d2f3ebad52e6c45095e3c50422db1a (diff) | |
Replace css macro with namespace for nicer namespacing
Diffstat (limited to 'fpicker')
6 files changed, 6 insertions, 42 deletions
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 47909d7953c9..ca1b223f745c 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -45,11 +45,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -73,8 +69,6 @@ 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/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index 1a46ca0e1504..1c0dd48ab3b4 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -57,11 +57,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -311,8 +307,6 @@ public: } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_FILEPICKER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 76e680500cb5..a63fbf8b9fc2 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -57,11 +57,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -224,8 +220,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#undef css - #endif // __IFileDialogCustomize_INTERFACE_DEFINED__ #endif // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index a8a07a2349ff..f7dae0ebeb3f 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -71,11 +71,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -363,8 +359,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#undef css - #endif // __IFileDialogCustomize_INTERFACE_DEFINED__ #endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index ba9b07eae995..7e7c9de93735 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -45,11 +45,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -223,8 +219,6 @@ class AsyncRequests : private ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_ASYNCREQUESTS_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 08b4613f6d25..e1b1fc580923 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -40,11 +40,7 @@ // namespace //----------------------------------------------------------------------------- -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif +namespace css = ::com::sun::star; namespace fpicker{ namespace win32{ @@ -64,8 +60,6 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |