diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 14:16:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 08:39:11 +0200 |
| commit | 6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85 (patch) | |
| tree | abdd40004f9a98c3be7f37e8e0027639456cd688 /i18npool/source/calendar | |
| parent | use the new gbuild way to update config.* (diff) | |
| download | core-6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85.tar.gz core-6ce77cac03123f2bf5c9b6698a3f80e32d7fbe85.zip | |
move stuff in i18npool/i18nutil in own namespace
instead of trying to share the css::i18n namespace, which is just very
confusing and should be left to actual UNO artifacts
Change-Id: I2f5c36bf1af9a2a98c4f997dd450d015e75ed3f6
Reviewed-on: https://gerrit.libreoffice.org/43079
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18npool/source/calendar')
| -rw-r--r-- | i18npool/source/calendar/calendarImpl.cxx | 5 | ||||
| -rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 5 | ||||
| -rw-r--r-- | i18npool/source/calendar/calendar_hijri.cxx | 5 | ||||
| -rw-r--r-- | i18npool/source/calendar/calendar_jewish.cxx | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index d6820155b38c..dbb95fd7489f 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -23,9 +23,10 @@ #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { #define ERROR RuntimeException() @@ -348,6 +349,6 @@ CalendarImpl::getSupportedServiceNames() 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 78fd7457927c..f89f5fa046e3 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -122,10 +122,11 @@ static void debug_i18n_cal_dump( const ::icu::Calendar & r ) using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { #define ERROR RuntimeException() @@ -989,6 +990,6 @@ Calendar_gregorian::getSupportedServiceNames() return aRet; } -}}}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index eeabf6d47472..ae8f78fd38a6 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -25,10 +25,11 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::i18n; #define GREGORIAN_CROSSOVER 2299161 -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { // not used //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call. @@ -327,6 +328,6 @@ Calendar_hijri::getJulianDay(sal_Int32 day, sal_Int32 month, sal_Int32 year) return (double) intgr; } -}}}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index f9130450895e..4e05bbba9868 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -24,9 +24,10 @@ #include "calendar_jewish.hxx" using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; -namespace com { namespace sun { namespace star { namespace i18n { +namespace i18npool { // not used //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call. @@ -292,6 +293,6 @@ Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNa return Calendar_gregorian::getDisplayString(nCalendarDisplayCode, nNativeNumberMode ); } -}}}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |