[Libreoffice-commits] .: i18npool/source

Kohei Yoshida kohei at kemper.freedesktop.org
Thu Feb 24 23:18:18 PST 2011


 i18npool/source/calendar/calendar_hijri.cxx  |    6 ++++--
 i18npool/source/calendar/calendar_jewish.cxx |    7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 6e25b37524be235e85637a2f57e3a5b6fd920135
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Feb 25 02:17:38 2011 -0500

    More on using real namespace scopes.

diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index 60601fe..b38eaf9 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -36,13 +36,13 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::i18n;
-using namespace ::rtl;
 
 #define ERROR RuntimeException()
 
 #define GREGORIAN_CROSSOVER 2299161
 
+namespace com { namespace sun { namespace star { namespace i18n {
+
 // not used
 //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call.
 
@@ -341,4 +341,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 a0b3146..8a6e782 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -36,11 +36,12 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::i18n;
-using namespace ::rtl;
+using ::rtl::OUString;
 
 #define ERROR RuntimeException()
 
+namespace com { namespace sun { namespace star { namespace i18n {
+
 // not used
 //static UErrorCode status; // status is shared in all calls to Calendar, it has to be reset for each call.
 
@@ -306,4 +307,6 @@ Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNa
         return Calendar_gregorian::getDisplayString(nCalendarDisplayCode, nNativeNumberMode );
 }
 
+}}}}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list