diff options
author | Isamu Mogi <saturday6c@gmail.com> | 2014-05-30 20:18:49 +0900 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-06-01 16:22:12 +0000 |
commit | 4452ac23224cc6fc9c575f1b128dd71f79e12d88 (patch) | |
tree | b6eba110e5439f6734988e502f8f2960e5def7d2 /i18npool | |
parent | c84c2e4abad318f1be98d12599787a051dce2b50 (diff) |
Fix hungarian prefix for calendars
Change-Id: I78b3c0a8d32610e86e09ab5ad6da6cc4e0395926
Reviewed-on: https://gerrit.libreoffice.org/9566
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/inc/calendarImpl.hxx | 2 | ||||
-rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 2 | ||||
-rw-r--r-- | i18npool/source/calendar/calendarImpl.cxx | 4 | ||||
-rw-r--r-- | i18npool/source/calendar/calendar_gregorian.cxx | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index 9fd6dc31bdba..7ec10debd5ad 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -58,7 +58,7 @@ public: virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDateTime(double fTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 43bc4612e423..bd99d187b8f3 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -57,7 +57,7 @@ public: // Methods in XCalendar virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDateTime(double fTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index b0f897705eee..e6bf29fb3f28 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -138,10 +138,10 @@ CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, s } void SAL_CALL -CalendarImpl::setDateTime( double timeInDays ) throw(RuntimeException, std::exception) +CalendarImpl::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exception) { if (xCalendar.is()) - xCalendar->setDateTime( timeInDays ); + xCalendar->setDateTime( fTimeInDays ); else throw ERROR ; } diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index e5f6fc82fd0f..35e01e2d5ff4 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -282,7 +282,7 @@ Calendar_gregorian::getUniqueID() throw(RuntimeException, std::exception) } void SAL_CALL -Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException, std::exception) +Calendar_gregorian::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exception) { // ICU handles dates in milliseconds as double values and uses floor() // to obtain integer values, which may yield a date decremented by one @@ -291,7 +291,7 @@ Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException, std // pass a value without fraction here. If not, that may lead to // fdo#44286 or fdo#52619 and the like, e.g. when passing // -2136315212000.000244 instead of -2136315212000.000000 - double fM = timeInDays * U_MILLIS_PER_DAY; + double fM = fTimeInDays * U_MILLIS_PER_DAY; double fR = rtl::math::round( fM ); SAL_INFO_IF( fM != fR, "i18npool", "Calendar_gregorian::setDateTime: " << std::fixed << fM << " rounded to " << fR); @@ -309,9 +309,9 @@ Calendar_gregorian::getDateTime() throw(RuntimeException, std::exception) getValue(); } UErrorCode status; - double r = body->getTime(status = U_ZERO_ERROR); + double fR = body->getTime(status = U_ZERO_ERROR); if ( !U_SUCCESS(status) ) throw ERROR; - return r / U_MILLIS_PER_DAY; + return fR / U_MILLIS_PER_DAY; } // map field value from gregorian calendar to other calendar, it can be overwritten by derived class. |