Replace css macro with namespace for nicer namespacing

4 files changed, 7 insertions, 27 deletions

diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx
index 692daaa11447..da9e8366a9e2 100644
--- a/framework/inc/framework/preventduplicateinteraction.hxx
+++ b/framework/inc/framework/preventduplicateinteraction.hxx
@@ -52,13 +52,9 @@
 //  namespace
 //_________________________________________________________________________________________________________________
 
-namespace framework{
+namespace css = ::com::sun::star;
 
-#ifdef css
-    #error "Conflict during define of namespace alias ..."
-#else
-    #define css ::com::sun::star
-#endif
+namespace framework{
 
 //_________________________________________________________________________________________________________________
 //  exported const
@@ -266,8 +262,6 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
                                                   PreventDuplicateInteraction::InteractionInfo* pReturn     ) const;
 };
 
-#undef css
-
 } // namespace framework
 
 #endif // #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index 6b3ba6ce1fc6..a86bbaf95b34 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -57,13 +57,9 @@
 //_______________________________________________
 // namespace
 
-namespace framework{
+namespace css = ::com::sun::star;
 
-#ifdef css
-    #error "Ambigious namespace definition of css."
-#else
-    #define css ::com::sun::star
-#endif
+namespace framework{
 
 //_______________________________________________
 // definitions
@@ -220,8 +216,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
         ::cppu::OMultiTypeInterfaceContainerHelper m_aListener;
 };
 
-#undef css
-
 } // namespace framework
 
 #endif // _FRAMEWORK_TITLEHELPER_HXX_
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 741e9718e2d6..78c1a28d39f2 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -51,15 +51,11 @@
 //===============================================
 // namespace
 
+namespace css = ::com::sun::star;
+
 namespace framework
 {
 
-#ifdef css
-    #error "Who defines css? I will use it as namespace alias inside header."
-#else
-    #define css ::com::sun::star
-#endif
-
 //===============================================
 // definitions
 
@@ -251,8 +247,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
             static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath);
 };
 
-#undef css // dont let it out!
-
 } // namespace framework
 
 #endif // __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index ef15fe75c06d..9afe6d95e7ca 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -69,9 +69,7 @@
 #include <rtl/logfile.hxx>
 
 using namespace ::com::sun::star;
-#ifndef css
-#define css ::com::sun::star
-#endif
+namespace css = ::com::sun::star;
 
 static const char HELPID_PREFIX[] = "helpid:";