Replace css macro with namespace for nicer namespacing

2 files changed, 2 insertions, 16 deletions

diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx
index ec2a69e1edfd..321c53869657 100644
--- a/svtools/inc/svtools/acceleratorexecute.hxx
+++ b/svtools/inc/svtools/acceleratorexecute.hxx
@@ -58,11 +58,7 @@
 //===============================================
 // namespace
 
-#ifdef css
-    #error "Conflict on using css as namespace alias!"
-#else
-    #define css ::com::sun::star
-#endif
+namespace css = ::com::sun::star;
 
 namespace svt
 {
@@ -271,8 +267,6 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
 
 } // namespace svt
 
-#undef css
-
 #endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 1e0ade748546..bd4ac34003e8 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -39,11 +39,7 @@
 //-----------------------------------------------
 // namespaces
 
-#ifdef css
-#error "Cant use css as namespace alias."
-#else
-#define css ::com::sun::star
-#endif
+namespace css = ::com::sun::star;
 
 namespace svtools {
 //-----------------------------------------------
@@ -84,10 +80,6 @@ class ItemHolder2 : private ItemHolderMutexBase
 };
 
 } // namespace svtools
-//-----------------------------------------------
-// namespaces
-
-#undef css
 
 #endif // INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_