From 2abba84aa7c639011956721a4922653130dd09a6 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 21 Apr 2012 01:30:38 +0200 Subject: Replace css macro with namespace for nicer namespacing --- unotools/source/config/itemholder1.hxx | 6 +----- unotools/source/i18n/instance.hxx | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'unotools') diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index e04b423152ba..aa0775ea176b 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.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; //----------------------------------------------- // definitions diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx index 4c18d38cfd04..6a1a069ab476 100644 --- a/unotools/source/i18n/instance.hxx +++ b/unotools/source/i18n/instance.hxx @@ -33,8 +33,7 @@ #include #include -// ugly but so is this namespacing evil. -#define css ::com::sun::star +namespace css = ::com::sun::star; // Helper to share code between activators with a fallback MSF. // Potentially this may also needs to find the library the component -- cgit