[Libreoffice-commits] .: fpicker/source

[Thomas Arnhold]

 fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |    8 +++++++-
 fpicker/source/win32/filepicker/vistatypes.h                       |    8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit ea822495b776a8b0b9d6b99299fdbc7bfc8db340
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sat Apr 21 13:26:30 2012 +0200

    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...

diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index ca1b223..47909d7 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 e1b1fc5..08b4613 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: */