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 /framework/inc | |
| parent | 18a9e9e844d2f3ebad52e6c45095e3c50422db1a (diff) | |
Replace css macro with namespace for nicer namespacing
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/framework/preventduplicateinteraction.hxx | 10 | ||||
| -rw-r--r-- | framework/inc/framework/titlehelper.hxx | 10 |
2 files changed, 4 insertions, 16 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_ |