From e65e90562432a8b8279a9c79a5e347aad0090e81 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 30 Nov 2012 16:33:19 +0100
Subject: Find a more sensible place for css

Change-Id: I33fe83c47954f62d8b678430e97cf711a98568d1
---
 sal/inc/sal/types.h | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'sal')

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index a6be1552f5fb..53d1645eedd1 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -374,20 +374,27 @@ typedef struct _sal_Sequence
 #define SAL_THROW_EXTERN_C()
 #endif
 
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #ifdef __cplusplus
+
 enum __sal_NoAcquire
 {
     /** definition of a no acquire enum for ctors
     */
     SAL_NO_ACQUIRE
 };
-#endif /* __cplusplus */
 
+namespace com { namespace sun { namespace star { } } }
+
+/** short-circuit extra-verbose API namespaces
+
+ @since LibreOffice 4.0
+*/
+namespace css = ::com::sun::star;
 
-#ifdef __cplusplus
-}
 #endif /* __cplusplus */
 
 #ifdef __cplusplus
@@ -411,14 +418,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
 
 }
 
-namespace com { namespace sun { namespace star { } } }
-
-/** short-circuit extra-verbose API namespaces
-
- @since LibreOffice 4.0
-*/
-namespace css = ::com::sun::star;
-
 #else /* __cplusplus */
 
 /**
-- 
cgit v1.2.3