diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-02-25 01:52:11 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-02-25 01:53:57 -0500 |
| commit | bed2edc309d8a3ad29c43f3971fceedd3a70d569 (patch) | |
| tree | d7d79a80d586f658743af7ab4fd1987212f70de0 | |
| parent | c04955e4da30163a1e42b08d730884b3b4cfbfec (diff) | |
Use real namespace scopes. The old scheme screwed up context tagging.
| -rw-r--r-- | i18npool/source/calendar/calendarImpl.cxx | 5 | ||||
| -rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 296fad980c87..61acdc822c0d 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -35,9 +35,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::i18n; using namespace ::rtl; +namespace com { namespace sun { namespace star { namespace i18n { + #define ERROR RuntimeException() CalendarImpl::CalendarImpl(const Reference< XMultiServiceFactory > &rxMSF) : xMSF(rxMSF) @@ -323,4 +324,6 @@ CalendarImpl::getSupportedServiceNames(void) throw( RuntimeException ) return aRet; } +}}}} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 54041aa08553..2a94504ebed5 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -129,9 +129,10 @@ static void debug_i18n_cal_dump( const ::icu::Calendar & r ) using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::i18n; using namespace ::rtl; +namespace com { namespace sun { namespace star { namespace i18n { + #define ERROR RuntimeException() Calendar_gregorian::Calendar_gregorian() @@ -1086,4 +1087,6 @@ Calendar_gregorian::getSupportedServiceNames(void) throw( RuntimeException ) return aRet; } +}}}} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |