diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
203 files changed, 676 insertions, 778 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 2dc79fa716a0..9551c7017754 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -411,9 +411,9 @@ void MediaControl::implUpdateTimeField( double fCurTime ) SvtSysLocale aSysLocale; const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData(); - aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) ) + + aTimeString += rLocaleData.getDuration( tools::Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) ) + " / " + - rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) ); + rLocaleData.getDuration( tools::Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) ); if( maTimeEdit.GetText() != aTimeString ) maTimeEdit.SetText( aTimeString ); diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 7e79bef3c337..8bb671841749 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -382,7 +382,7 @@ void lcl_printTimeOutput( void ) { // Overall time output lcl_lineOut( "" ); - lcl_lineOut( "***** Time Output *****" ); + lcl_lineOut( "***** tools::Time Output *****" ); char TimeBuffer[500]; double dTotalTime = GpTimer->getElapsedTime() - GdStartTime; sprintf( TimeBuffer, "Total execution time = %f ms", dTotalTime*1000.0 ); @@ -606,7 +606,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl ) { double dDiffTime = dCurTime - GdLastTime; GdLastTime = dCurTime; - sprintf( TimeBuffer, "\t\t// Time = %f ms / += %f ms", dCurTime*1000.0, dDiffTime*1000.0 ); + sprintf( TimeBuffer, "\t\t// tools::Time = %f ms / += %f ms", dCurTime*1000.0, dDiffTime*1000.0 ); } #endif @@ -802,7 +802,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, sal_Int32 nCallL char TimeBuffer[200]; if( GbTimerOn && bLeave ) { - sprintf( TimeBuffer, " // Execution Time = %f ms", dExecutionTime*1000.0 ); + sprintf( TimeBuffer, " // Execution tools::Time = %f ms", dExecutionTime*1000.0 ); pPostStr = TimeBuffer; } #endif diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 0d8ff6426158..53880946bde8 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -2360,7 +2360,7 @@ RTLFUNC(Second) double Now_Impl() { Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); double aSerial = (double)GetDayDiff( aDate ); long nSeconds = aTime.GetHour(); nSeconds *= 3600; @@ -2388,7 +2388,7 @@ RTLFUNC(Time) if ( !bWrite ) { - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); SbxVariable* pMeth = rPar.Get( 0 ); OUString aRes; if( pMeth->IsFixed() ) @@ -2442,7 +2442,7 @@ RTLFUNC(Timer) (void)pBasic; (void)bWrite; - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); long nSeconds = aTime.GetHour(); nSeconds *= 3600; nSeconds += aTime.GetMin() * 60; @@ -3212,7 +3212,7 @@ RTLFUNC(FileDateTime) else { OUString aPath = rPar.Get(1)->GetOUString(); - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); Date aDate( Date::EMPTY ); if( hasUno() ) { @@ -3222,7 +3222,7 @@ RTLFUNC(FileDateTime) try { util::DateTime aUnoDT = xSFI->getDateTimeModified( aPath ); - aTime = Time( aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds, aUnoDT.NanoSeconds ); + aTime = tools::Time( aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds, aUnoDT.NanoSeconds ); aDate = Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ); } catch(const Exception & ) @@ -3241,7 +3241,7 @@ RTLFUNC(FileDateTime) oslDateTime aDT; osl_getDateTimeFromTimeValue( &aTimeVal, &aDT ); - aTime = Time( aDT.Hours, aDT.Minutes, aDT.Seconds, aDT.NanoSeconds ); + aTime = tools::Time( aDT.Hours, aDT.Minutes, aDT.Seconds, aDT.NanoSeconds ); aDate = Date( aDT.Day, aDT.Month, aDT.Year ); } @@ -4954,11 +4954,11 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& double implTimeSerial( sal_Int16 nHours, sal_Int16 nMinutes, sal_Int16 nSeconds ) { return - static_cast<double>( nHours * ::Time::secondPerHour + - nMinutes * ::Time::secondPerMinute + + static_cast<double>( nHours * ::tools::Time::secondPerHour + + nMinutes * ::tools::Time::secondPerMinute + nSeconds) / - static_cast<double>( ::Time::secondPerDay ); + static_cast<double>( ::tools::Time::secondPerDay ); } bool implDateTimeSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 81ad39c62bbc..43b4d01858f2 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1412,7 +1412,7 @@ RTLFUNC(GetSystemTicks) StarBASIC::Error( SbERR_BAD_ARGUMENT ); return; } - rPar.Get(0)->PutLong( Time::GetSystemTicks() ); + rPar.Get(0)->PutLong( tools::Time::GetSystemTicks() ); } RTLFUNC(GetPathSeparator) diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index 5f0bcca909fc..b2f5be0f6d97 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -280,7 +280,7 @@ start: // if the whole-number part is 0, we want no year! if( n <= -1.0 || n >= 1.0 ) { - // Time only if != 00:00:00 + // tools::Time only if != 00:00:00 if( floor( n ) == n ) { switch( eDate ) diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 0e31e4f1cb84..24e41dd9ab93 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -173,7 +173,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b } break; case DataType::TIME: { - Time aTime; + css::util::Time aTime; bool bOk = false; if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE) { diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index cd1365c08cba..38626ba58988 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -293,7 +293,7 @@ void ORowSetValue::free() break; case DataType::TIME: delete (::com::sun::star::util::Time*)m_aValue.m_pValue; - TRACE_FREE( Time ) + TRACE_FREE( tools::Time ) m_aValue.m_pValue = NULL; break; case DataType::TIMESTAMP: @@ -369,7 +369,7 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) break; case DataType::TIME: m_aValue.m_pValue = new Time(*(Time*)_rRH.m_aValue.m_pValue); - TRACE_ALLOC( Time ) + TRACE_ALLOC( tools::Time ) break; case DataType::TIMESTAMP: m_aValue.m_pValue = new DateTime(*(DateTime*)_rRH.m_aValue.m_pValue); @@ -512,7 +512,7 @@ ORowSetValue& ORowSetValue::operator=(const Date& _rRH) return *this; } -ORowSetValue& ORowSetValue::operator=(const Time& _rRH) +ORowSetValue& ORowSetValue::operator=(const css::util::Time& _rRH) { if(m_eTypeKind != DataType::TIME) free(); @@ -520,7 +520,7 @@ ORowSetValue& ORowSetValue::operator=(const Time& _rRH) if(m_bNull) { m_aValue.m_pValue = new Time(_rRH); - TRACE_ALLOC( Time ) + TRACE_ALLOC( tools::Time ) m_eTypeKind = DataType::TIME; m_bNull = false; } @@ -750,19 +750,19 @@ ORowSetValue& ORowSetValue::operator=(const Any& _rAny) } -bool operator==(const Date& _rLH,const Date& _rRH) +bool operator==(const Date& _rLH, const Date& _rRH) { return _rLH.Day == _rRH.Day && _rLH.Month == _rRH.Month && _rLH.Year == _rRH.Year; } -bool operator==(const Time& _rLH,const Time& _rRH) +bool operator==(const css::util::Time& _rLH, const css::util::Time& _rRH) { return _rLH.Minutes == _rRH.Minutes && _rLH.Hours == _rRH.Hours && _rLH.Seconds == _rRH.Seconds && _rLH.NanoSeconds == _rRH.NanoSeconds; } -bool operator==(const DateTime& _rLH,const DateTime& _rRH) +bool operator==(const DateTime& _rLH, const DateTime& _rRH) { return _rLH.Day == _rRH.Day && _rLH.Month == _rRH.Month && _rLH.Year == _rRH.Year && _rLH.Minutes == _rRH.Minutes && _rLH.Hours == _rRH.Hours && _rLH.Seconds == _rRH.Seconds && _rLH.NanoSeconds == _rRH.NanoSeconds; @@ -2153,7 +2153,7 @@ namespace detail virtual float getFloat() const = 0; virtual double getDouble() const = 0; virtual Date getDate() const = 0; - virtual Time getTime() const = 0; + virtual css::util::Time getTime() const = 0; virtual DateTime getTimestamp() const = 0; virtual Sequence< sal_Int8 > getBytes() const = 0; virtual Reference< XBlob > getBlob() const = 0; @@ -2183,7 +2183,7 @@ namespace detail virtual float getFloat() const SAL_OVERRIDE { return m_xRow->getFloat( m_nPos ); }; virtual double getDouble() const SAL_OVERRIDE { return m_xRow->getDouble( m_nPos ); }; virtual Date getDate() const SAL_OVERRIDE { return m_xRow->getDate( m_nPos ); }; - virtual Time getTime() const SAL_OVERRIDE { return m_xRow->getTime( m_nPos ); }; + virtual css::util::Time getTime() const SAL_OVERRIDE { return m_xRow->getTime( m_nPos ); }; virtual DateTime getTimestamp() const SAL_OVERRIDE { return m_xRow->getTimestamp( m_nPos ); }; virtual Sequence< sal_Int8 > getBytes() const SAL_OVERRIDE { return m_xRow->getBytes( m_nPos ); }; virtual Reference< XBlob > getBlob() const SAL_OVERRIDE { return m_xRow->getBlob( m_nPos ); }; @@ -2214,7 +2214,7 @@ namespace detail virtual float getFloat() const SAL_OVERRIDE { return m_xColumn->getFloat(); }; virtual double getDouble() const SAL_OVERRIDE { return m_xColumn->getDouble(); }; virtual Date getDate() const SAL_OVERRIDE { return m_xColumn->getDate(); }; - virtual Time getTime() const SAL_OVERRIDE { return m_xColumn->getTime(); }; + virtual css::util::Time getTime() const SAL_OVERRIDE { return m_xColumn->getTime(); }; virtual DateTime getTimestamp() const SAL_OVERRIDE { return m_xColumn->getTimestamp(); }; virtual Sequence< sal_Int8 > getBytes() const SAL_OVERRIDE { return m_xColumn->getBytes(); }; virtual Reference< XBlob > getBlob() const SAL_OVERRIDE { return m_xColumn->getBlob(); }; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index e1c2d5fff040..b385eb7ac7f4 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1080,7 +1080,7 @@ try if (hasProperty(sPropDefaultTime, xNewProps) && !bIsString) { // Completely analogous to time - Time aTime = DBTypeConversion::toTime(getDouble(aEffectiveDefault)); + css::util::Time aTime = DBTypeConversion::toTime(getDouble(aEffectiveDefault)); xNewProps->setPropertyValue(sPropDefaultTime, makeAny(aTime)); } diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 12577dfd70ea..c862d05b694f 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -307,7 +307,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& setParameter(parameterIndex,adDBDate,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) { setParameter(parameterIndex,adDBTime,sizeof(x),x); } diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 1d6db8d1d625..ee201ee3c0b4 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -362,12 +362,12 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x { double fCellVal = xCell->getValue(); double fTime = fCellVal - rtl::math::approxFloor( fCellVal ); - sal_Int64 nIntTime = static_cast<sal_Int64>(rtl::math::round( fTime * static_cast<double>(::Time::nanoSecPerDay) )); - if ( nIntTime == ::Time::nanoSecPerDay) + sal_Int64 nIntTime = static_cast<sal_Int64>(rtl::math::round( fTime * static_cast<double>(::tools::Time::nanoSecPerDay) )); + if ( nIntTime == ::tools::Time::nanoSecPerDay) nIntTime = 0; // 23:59:59.9999999995 and above is 00:00:00.00 ::com::sun::star::util::Time aTime; - aTime.NanoSeconds = (sal_uInt32)( nIntTime % ::Time::nanoSecPerSec ); - nIntTime /= ::Time::nanoSecPerSec; + aTime.NanoSeconds = (sal_uInt32)( nIntTime % ::tools::Time::nanoSecPerSec ); + nIntTime /= ::tools::Time::nanoSecPerSec; aTime.Seconds = (sal_uInt16)( nIntTime % 60 ); nIntTime /= 60; aTime.Minutes = (sal_uInt16)( nIntTime % 60 ); @@ -386,8 +386,8 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x double fDays = ::rtl::math::approxFloor( fCellVal ); double fTime = fCellVal - fDays; long nIntDays = (long)fDays; - sal_Int64 nIntTime = ::rtl::math::round( fTime * static_cast<double>(::Time::nanoSecPerDay) ); - if ( nIntTime == ::Time::nanoSecPerDay ) + sal_Int64 nIntTime = ::rtl::math::round( fTime * static_cast<double>(::tools::Time::nanoSecPerDay) ); + if ( nIntTime == ::tools::Time::nanoSecPerDay ) { nIntTime = 0; // 23:59:59.9999999995 and above is 00:00:00.00 ++nIntDays; // (next day) @@ -395,8 +395,8 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x ::com::sun::star::util::DateTime aDateTime; - aDateTime.NanoSeconds = (sal_uInt16)( nIntTime % ::Time::nanoSecPerSec ); - nIntTime /= ::Time::nanoSecPerSec; + aDateTime.NanoSeconds = (sal_uInt16)( nIntTime % ::tools::Time::nanoSecPerSec ); + nIntTime /= ::tools::Time::nanoSecPerSec; aDateTime.Seconds = (sal_uInt16)( nIntTime % 60 ); nIntTime /= 60; aDateTime.Minutes = (sal_uInt16)( nIntTime % 60 ); diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index ece475a29484..7994275976fe 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -187,7 +187,7 @@ void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, co } -void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTime", *this ); } diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index f6bfca8af207..8e7e5f21ddfc 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -262,7 +262,7 @@ ORowSetValue OOp_CurTime::operate(const ::std::vector<ORowSetValue>& lhs) const if ( !lhs.empty() ) return ORowSetValue(); - Time aCurTime( Time::SYSTEM ); + tools::Time aCurTime( tools::Time::SYSTEM ); return ::com::sun::star::util::Time(aCurTime.GetNanoSec(), aCurTime.GetSec(), aCurTime.GetMin(), aCurTime.GetHour(), false); diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index bd8fdaa27b14..065440716bfd 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -401,7 +401,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate) setValue< ISC_DATE >(nIndex, aISCDate, SQL_TYPE_DATE); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const Time& rTime) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Time& rTime) throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 6d702b2b3cb2..caf5c7ad7a3b 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -621,7 +621,7 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 nIndex) Time SAL_CALL OResultSet::getTime(sal_Int32 nIndex) throw(SQLException, RuntimeException, std::exception) { - return safelyRetrieveValue< Time >(nIndex, SQL_TYPE_TIME); + return safelyRetrieveValue< css::util::Time >(nIndex, SQL_TYPE_TIME); } DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex) diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index e8eddc4e87dc..87f58b491032 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -93,7 +93,7 @@ namespace comphelper { namespace log { namespace convert } - OUString convertLogArgToString( const Time& _rTime ) + OUString convertLogArgToString( const css::util::Time& _rTime ) { char buffer[ 30 ]; const size_t buffer_size = sizeof( buffer ); diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index 300bd261e5ca..6b1c9d741d2c 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -189,66 +189,42 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", NULL); } void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBoolean", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", NULL); } void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setByte", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setByte", NULL); } void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setShort", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setShort", NULL); } void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setInt", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setInt", NULL); } void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("", NULL); } void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setFloat", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setFloat", NULL); } void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setDouble", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setDouble", NULL); } void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException, std::exception) @@ -263,50 +239,33 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OU void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBytes", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBytes", NULL); } void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setDate", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setDate", NULL); } -void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setTime", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setTime", NULL); } void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException, std::exception) { - - -::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", NULL); } void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", NULL); } void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", NULL); } void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException, std::exception) @@ -319,47 +278,32 @@ void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const An void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", NULL); } void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setRef", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setRef", NULL); } void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBlob", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBlob", NULL); } void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setClob", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setClob", NULL); } void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException, std::exception) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setArray", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setArray", NULL); } void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException, std::exception) { -::dbtools::throwFunctionNotSupportedSQLException("clearParameters", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", NULL); } void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index ab79cfcd795f..8db816f9ddfb 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -338,7 +338,7 @@ cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw( nRet.Hours = nRevision.time().hour(); nRet.Minutes = nRevision.time().minute(); nRet.Seconds = nRevision.time().second(); - nRet.NanoSeconds = nRevision.time().msec() * ::Time::nanoPerMilli; + nRet.NanoSeconds = nRevision.time().msec() * ::tools::Time::nanoPerMilli; return nRet; } } diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 71508eac57fc..cdcb8f10ffe4 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -202,66 +202,42 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", NULL); } void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBoolean", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", NULL); } void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setByte", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setByte", NULL); } void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setShort", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setShort", NULL); } void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setInt", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setInt", NULL); } void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setLong", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setLong", NULL); } void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setFloat", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setFloat", NULL); } void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setDouble", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setDouble", NULL); } void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) @@ -276,50 +252,33 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBytes", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBytes", NULL); } void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setDate", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setDate", NULL); } -void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException) { - - -::dbtools::throwFunctionNotSupportedSQLException("setTime", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setTime", NULL); } void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", NULL); } void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", NULL); } void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", NULL); } void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) @@ -336,47 +295,32 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", NULL); } void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setRef", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setRef", NULL); } void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setBlob", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setBlob", NULL); } void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setClob", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setClob", NULL); } void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - - - -::dbtools::throwFunctionNotSupportedSQLException("setArray", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("setArray", NULL); } void SAL_CALL MacabPreparedStatement::clearParameters() throw(SQLException, RuntimeException) { -::dbtools::throwFunctionNotSupportedSQLException("clearParameters", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", NULL); } void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 17ea20ca5dde..35a8717254f2 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -377,7 +377,7 @@ Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLExcep ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getBytes", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getBytes", NULL); return Sequence< sal_Int8 >(); } @@ -387,7 +387,7 @@ Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeExce ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getDate", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getDate", NULL); Date aRet; return aRet; @@ -398,9 +398,9 @@ Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeExce ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getTime", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getTime", NULL); - Time nRet; + css::util::Time nRet; return nRet; } @@ -436,7 +436,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) th ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getBinaryStream", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getBinaryStream", NULL); return NULL; } @@ -446,7 +446,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getCharacterStream", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getCharacterStream", NULL); return NULL; } @@ -456,7 +456,7 @@ Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< ::com::sun::s ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getObject", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getObject", NULL); return Any(); } @@ -466,7 +466,7 @@ Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getRef", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getRef", NULL); return NULL; } @@ -476,7 +476,7 @@ Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLExceptio ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedSQLException("getBlob", NULL); + ::dbtools::throwFunctionNotSupportedSQLException("getBlob", NULL); return NULL; } @@ -823,7 +823,7 @@ void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) throw(SQLExcept checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 7d96805fd520..55fdee52d5bb 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -228,7 +228,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const D -void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this ); } diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index 0de6749dfd78..402c65646461 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -238,7 +238,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const D -void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this ); } diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 54f6a2638f26..a99900e88344 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -428,7 +428,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index a4073000bd76..a53e94503490 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -1102,7 +1102,7 @@ void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) thr } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) { TIME_STRUCT aVal = OTools::TimeToOdbcTime(x); updateValue(columnIndex,SQL_TIME,&aVal); diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index c20ad8608c82..622809553614 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -252,7 +252,7 @@ OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rPara OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const { - Time aTime = DBTypeConversion::toTime(rString); + css::util::Time aTime = DBTypeConversion::toTime(rString); Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier()); Reference< XNumberFormatTypes > xTypes(xSupplier->getNumberFormats(), UNO_QUERY); @@ -1065,7 +1065,7 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) } case DataType::TIME: { - Time aTime = DBTypeConversion::toTime(fValue); + css::util::Time aTime = DBTypeConversion::toTime(fValue); OUString aString = DBTypeConversion::toTimeString(aTime); pDateNode->append(new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, SQL_TOKEN_T)); pDateNode->append(new OSQLInternalNode(aString, SQL_NODE_STRING)); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 3bec42caa6ad..67eb4ca287eb 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -182,7 +182,7 @@ IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl) IMPL_LINK_NOARG(SvxPostItDialog, Stamp) { Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); OUString aTmp( SvtUserOptions().GetID() ); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); OUString aStr( m_pEditED->GetText() ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 787cf6f0a7f2..255356f742a4 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -174,7 +174,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) officecfg::Office::Common::Cache::GraphicManager::ObjectCacheSize::set( objectCacheSize, batch); - const Time aTime( m_pTfGraphicObjectTime->GetTime() ); + const tools::Time aTime( m_pTfGraphicObjectTime->GetTime() ); sal_Int32 objectReleaseTime = aTime.GetSec() + aTime.GetMin() * 60 + aTime.GetHour() * 3600; officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime::set( @@ -227,7 +227,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) sal_Int32 nTime = officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime:: get(); - Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) ); + tools::Time aTime( (sal_uInt16)( nTime / 3600 ), (sal_uInt16)( ( nTime % 3600 ) / 60 ), (sal_uInt16)( ( nTime % 3600 ) % 60 ) ); m_pTfGraphicObjectTime->SetTime( aTime ); GraphicCacheConfigHdl(m_pNfGraphicCache); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 702373b53009..3a7c6715b2dc 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -108,7 +108,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() oslDateTime lastCheckedDT; Date aDate( Date::EMPTY ); - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); lastCheckedTV.Seconds = (sal_uInt32) lastChecked; osl_getLocalTimeFromSystemTime( &lastCheckedTV, &lastCheckedTV ); @@ -116,7 +116,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() if ( osl_getDateTimeFromTimeValue( &lastCheckedTV, &lastCheckedDT ) ) { aDate = Date( lastCheckedDT.Day, lastCheckedDT.Month, lastCheckedDT.Year ); - aTime = Time( lastCheckedDT.Hours, lastCheckedDT.Minutes ); + aTime = ::tools::Time( lastCheckedDT.Hours, lastCheckedDT.Minutes ); } LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType(); diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index a5a02abd7c0d..91da32dea2ae 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -81,7 +81,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe if (nFieldType != text::textfield::Type::TIME) { util::DateTime aDateTime = xPropSet->getPropertyValue(UNO_TC_PROP_DATE_TIME).get<util::DateTime>(); - Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); + tools::Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); bool bIsFixed = false; xPropSet->getPropertyValue(UNO_TC_PROP_IS_FIXED) >>= bIsFixed; @@ -787,7 +787,7 @@ SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData ); SvxExtTimeField::SvxExtTimeField() - : m_nFixTime( Time(Time::SYSTEM).GetTime() ) + : m_nFixTime( tools::Time(tools::Time::SYSTEM).GetTime() ) { eType = SVXTIMETYPE_VAR; eFormat = SVXTIMEFORMAT_STANDARD; @@ -795,7 +795,7 @@ SvxExtTimeField::SvxExtTimeField() -SvxExtTimeField::SvxExtTimeField( const Time& rTime, SvxTimeType eT, SvxTimeFormat eF ) +SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxTimeFormat eF ) : m_nFixTime( rTime.GetTime() ) { eType = eT; @@ -849,15 +849,15 @@ void SvxExtTimeField::Save( SvPersistStream & rStm ) OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); if ( eType == SVXTIMETYPE_FIX ) aTime.SetTime(m_nFixTime); else - aTime = Time( Time::SYSTEM ); // current time + aTime = tools::Time( tools::Time::SYSTEM ); // current time return GetFormatted( aTime, eFormat, rFormatter, eLang ); } -OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) +OUString SvxExtTimeField::GetFormatted( tools::Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang ) { switch( eFormat ) { @@ -1269,7 +1269,7 @@ void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ ) SvxDateTimeField::SvxDateTimeField() {} OUString SvxDateTimeField::GetFormatted( - Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ) + Date& rDate, tools::Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ) { OUString aRet; diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 191bbe833291..967ae2338931 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1551,7 +1551,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const LanguageTag& rLanguageTag, bool b SvxAutoCorrectLanguageListsPtr pLists = 0; - Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( Time::EMPTY ); + tools::Time nMinTime( 0, 2 ), nAktTime( tools::Time::SYSTEM ), nLastCheckTime( tools::Time::EMPTY ); std::map<LanguageTag, long>::iterator nFndPos = aLastFileTable.find(rLanguageTag); if(nFndPos != aLastFileTable.end() && @@ -1925,8 +1925,8 @@ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists( : sShareAutoCorrFile( rShareAutoCorrectFile ), sUserAutoCorrFile( rUserAutoCorrectFile ), aModifiedDate( Date::EMPTY ), - aModifiedTime( Time::EMPTY ), - aLastCheckTime( Time::EMPTY ), + aModifiedTime( tools::Time::EMPTY ), + aLastCheckTime( tools::Time::EMPTY ), pCplStt_ExcptLst( 0 ), pWrdStt_ExcptLst( 0 ), pAutocorr_List( 0 ), @@ -1947,12 +1947,12 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp() // Access the file system only every 2 minutes to check the date stamp bool bRet = false; - Time nMinTime( 0, 2 ); - Time nAktTime( Time::SYSTEM ); + tools::Time nMinTime( 0, 2 ); + tools::Time nAktTime( tools::Time::SYSTEM ); if( aLastCheckTime > nAktTime || // overflow? ( nAktTime -= aLastCheckTime ) > nMinTime ) // min time past { - Date aTstDate( Date::EMPTY ); Time aTstTime( Time::EMPTY ); + Date aTstDate( Date::EMPTY ); tools::Time aTstTime( tools::Time::EMPTY ); if( FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile, &aTstDate, &aTstTime ) && ( aModifiedDate != aTstDate || aModifiedTime != aTstTime )) @@ -1967,7 +1967,7 @@ bool SvxAutoCorrectLanguageLists::IsFileChanged_Imp() delete pAutocorr_List, pAutocorr_List = 0; nFlags &= ~(CplSttLstLoad | WrdSttLstLoad | ChgWordLstLoad ); } - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); } return bRet; } @@ -2038,7 +2038,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp( // Set time stamp FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile, &aModifiedDate, &aModifiedTime ); - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); } } @@ -2138,7 +2138,7 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList() // Set time stamp FStatHelper::GetModifiedDateTimeOfFile( sShareAutoCorrFile, &aModifiedDate, &aModifiedTime ); - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); return pAutocorr_List; } @@ -2184,7 +2184,7 @@ bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const OUString& rNew) // Set time stamp FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile, &aModifiedDate, &aModifiedTime ); - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); aRet = true; } return aRet; @@ -2205,7 +2205,7 @@ bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const OUString& rNew) // Set time stamp FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile, &aModifiedDate, &aModifiedTime ); - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); aRet = true; } return aRet; @@ -2238,7 +2238,7 @@ void SvxAutoCorrectLanguageLists::SaveCplSttExceptList() // Set time stamp FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile, &aModifiedDate, &aModifiedTime ); - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); } void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList ) @@ -2282,7 +2282,7 @@ void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList() // Set time stamp FStatHelper::GetModifiedDateTimeOfFile( sUserAutoCorrFile, &aModifiedDate, &aModifiedTime ); - aLastCheckTime = Time( Time::SYSTEM ); + aLastCheckTime = tools::Time( tools::Time::SYSTEM ); } void SvxAutoCorrectLanguageLists::SetWrdSttExceptList( SvStringsISortDtor* pList ) diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index e84482e707e3..8d46c15f8729 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -201,7 +201,7 @@ static util::DateTime getTime(sal_Int64 const nTime) util::DateTime aTime; memset( &aTime, 0, sizeof( util::DateTime ) ); - Time aTempTime( nTime ); + tools::Time aTempTime( nTime ); aTime.NanoSeconds = aTempTime.GetNanoSec(); aTime.Seconds = aTempTime.GetSec(); @@ -211,9 +211,9 @@ static util::DateTime getTime(sal_Int64 const nTime) return aTime; } -inline Time setTime( util::DateTime& rDate ) +inline tools::Time setTime( util::DateTime& rDate ) { - return Time( rDate.Hours, rDate.Minutes, rDate.Seconds, rDate.NanoSeconds ); + return tools::Time( rDate.Hours, rDate.Minutes, rDate.Seconds, rDate.NanoSeconds ); } @@ -398,7 +398,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() { if( mnServiceId != text::textfield::Type::TIME && mnServiceId != text::textfield::Type::DATE ) { - Time aTime( setTime( mpImpl->maDateTime ) ); + tools::Time aTime( setTime( mpImpl->maDateTime ) ); pData = new SvxExtTimeField( aTime, mpImpl->mbBoolean1?SVXTIMETYPE_FIX:SVXTIMETYPE_VAR ); if( mpImpl->mnInt32 >= SVXTIMEFORMAT_APPDEFAULT && mpImpl->mnInt32 <= SVXTIMEFORMAT_AM_HMSH ) diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index cd9815167d8d..2e22d16c9b0b 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -87,7 +87,7 @@ namespace pcr } else { - ::Time aTime( aUNOTime.Hours, aUNOTime.Minutes, aUNOTime.Seconds, aUNOTime.NanoSeconds ); + ::tools::Time aTime( aUNOTime.Hours, aUNOTime.Minutes, aUNOTime.Seconds, aUNOTime.NanoSeconds ); getTypedControlWindow()->SetTime( aTime ); } } diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 9007f570aef8..ed2a27d0e359 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -130,7 +130,7 @@ namespace pcr case NUMBERFORMAT_TIME: case NUMBERFORMAT_DATETIME: { - Time aCurrentTime( Time::SYSTEM ); + tools::Time aCurrentTime( tools::Time::SYSTEM ); nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(aCurrentTime.GetTime())); } break; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0d99c9d57418..a098b94fe6b6 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2661,7 +2661,7 @@ void ImportComment10( SvxMSDffManager& rMan, SvStream& rStCtrl, SdrPage* pPage, .ReadInt32( nPosX ) .ReadInt32( nPosY ); - aDateTime.NanoSeconds *= ::Time::nanoPerMilli; + aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli; } break; } @@ -6299,7 +6299,7 @@ void PPTFieldEntry::SetDateTime( sal_uInt32 nVal ) pField1 = new SvxFieldItem( SvxDateField( Date( Date::SYSTEM ), SVXDATETYPE_VAR, eDateFormat ), EE_FEATURE_FIELD ); if ( eTimeFormat != SVXTIMEFORMAT_APPDEFAULT ) { - SvxFieldItem* pFieldItem = new SvxFieldItem( SvxExtTimeField( Time( Time::SYSTEM ), SVXTIMETYPE_VAR, eTimeFormat ), EE_FEATURE_FIELD ); + SvxFieldItem* pFieldItem = new SvxFieldItem( SvxExtTimeField( tools::Time( tools::Time::SYSTEM ), SVXTIMETYPE_VAR, eTimeFormat ), EE_FEATURE_FIELD ); if ( pField1 ) pField2 = pFieldItem; else diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 9f3a640155d1..8350a1a94da6 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -64,7 +64,7 @@ DateTime DTTM2DateTime( long lDTTM ) Friday=5 Saturday=6) */ - DateTime aDateTime(Date( 0 ), Time( 0 )); + DateTime aDateTime(Date( 0 ), ::tools::Time( 0 )); if( lDTTM ) { sal_uInt16 lMin = (sal_uInt16)(lDTTM & 0x0000003F); @@ -76,7 +76,7 @@ DateTime DTTM2DateTime( long lDTTM ) sal_uInt16 lMon = (sal_uInt16)(lDTTM & 0x0000000F); lDTTM >>= 4; sal_uInt16 lYear= (sal_uInt16)(lDTTM & 0x000001FF) + 1900; - aDateTime = DateTime(Date(lDay, lMon, lYear), Time(lHour, lMin)); + aDateTime = DateTime(Date(lDay, lMon, lYear), tools::Time(lHour, lMin)); } return aDateTime; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 676fb1897863..26430aa926e2 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -790,7 +790,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc } break; case FormComponentType::TIMEFIELD: { - // <name>=<value> // Value is a Time with the format HH:MM:SS + // <name>=<value> // Value is a tools::Time with the format HH:MM:SS // no value (NULL) means empty value if( hasProperty(PROPERTY_TIME, xComponentSet) ) { @@ -799,7 +799,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc sal_Int32 nInt32Val = 0; if (aVal >>= nInt32Val) { - ::Time aTime(nInt32Val); + ::tools::Time aTime(nInt32Val); OUStringBuffer aBuffer; appendDigits( aTime.GetHour(), 2, aBuffer ); aBuffer.append( '-' ); diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 6b8ca643fdae..e5858535411e 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -127,7 +127,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t { util::Time aTime; OSL_VERIFY(m_aDefault >>= aTime); - _rxOutStream->writeHyper(::Time(aTime).GetTime()); + _rxOutStream->writeHyper(::tools::Time(aTime).GetTime()); } else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE) { @@ -193,7 +193,7 @@ void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) thro } else if ((nAnyMask & DEFAULT_TIME) == DEFAULT_TIME) { - m_aDefault <<= ::Time(_rxInStream->readHyper()).GetUNOTime(); + m_aDefault <<= ::tools::Time(_rxInStream->readHyper()).GetUNOTime(); } else if ((nAnyMask & DEFAULT_DATE) == DEFAULT_DATE) { diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 6c8d643ecd13..84d9eb9dabf7 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -804,11 +804,11 @@ namespace xforms { Any aTypedValue = Convert::get().toAny( value, getCppuType() ); - Time aValue; + css::util::Time aValue; if ( !( aTypedValue >>= aValue ) ) return false; - ::Time aToolsTime( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ); + ::tools::Time aToolsTime( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ); // no loss/rounding; IEEE 754 double-precision floating-point // has a mantissa of 53 bits; we need at the very most 50 bits: // format of aToolsTime.GetTime() is (in decimal) hhmmssnnnnnnnnn @@ -830,9 +830,9 @@ namespace xforms void OTimeType::normalizeValue( const Any& _rValue, double& _rDoubleValue ) const { - Time aValue; + css::util::Time aValue; OSL_VERIFY( _rValue >>= aValue ); - ::Time aToolsTime( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ); + ::tools::Time aToolsTime( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ); _rDoubleValue = aToolsTime.GetTime(); } @@ -855,7 +855,7 @@ namespace xforms { ::DateTime aToolsValue( ::Date( _rValue.Day, _rValue.Month, _rValue.Year ), - ::Time( _rValue.Hours, _rValue.Minutes, _rValue.Seconds, _rValue.NanoSeconds ) + ::tools::Time( _rValue.Hours, _rValue.Minutes, _rValue.Seconds, _rValue.NanoSeconds ) ); double fValue = 0; diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index b20c2ab79597..776a264f9a88 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -233,7 +233,7 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlXPathReturnEmptyString(ctxt); } -// Date and Time Functions +// Date and tools::Time Functions static OString makeDateTimeString (const DateTime& aDateTime, bool bUTC = true) { @@ -277,7 +277,7 @@ void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int /*nargs*/) 3.2.7.2 Canonical representation The canonical representation for dateTime is defined by prohibiting certain options from the Lexical representation (par.3.2.7.1). Specifically, either the time zone must - be omitted or, if present, the time zone must be Coordinated Universal Time (UTC) + be omitted or, if present, the time zone must be Coordinated Universal tools::Time (UTC) indicated by a "Z". */ DateTime aDateTime( DateTime::SYSTEM ); @@ -317,7 +317,7 @@ static bool parseDateTime(const OUString& aString, DateTime& aDateTime) sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32(); Date tmpDate((sal_uInt16)nDay, (sal_uInt16)nMonth, (sal_uInt16)nYear); - Time tmpTime(nHour, nMinute, nSecond); + tools::Time tmpTime(nHour, nMinute, nSecond); DateTime tmpDateTime(tmpDate, tmpTime); if (aString.indexOf(aUTCString) < 0) tmpDateTime.ConvertToUTC(); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 74b612f40ed1..183bddfa7e11 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -113,7 +113,7 @@ using namespace InternalFilePickerElementIds; #define GET_DECODED_NAME(aObj) \ aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ) -// Time to wait while traveling in the filterbox until +// tools::Time to wait while traveling in the filterbox until // the browsebox gets filtered ( in ms). #define TRAVELFILTER_TIMEOUT 750 diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8efe331da265..8c186c482fd4 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -372,7 +372,7 @@ private: bool m_bListenForConfigChanges; /** @short specify the time intervall between two save actions. - @descr Time is measured in [min]. + @descr tools::Time is measured in [min]. */ sal_Int32 m_nAutoSaveTimeIntervall; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index ee9084433462..c09432dca484 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -646,7 +646,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException) DUMP_ICU_CAL_MSG(("%s\n","setValue() after Zone/DST glitch resubmit")); DUMP_I18N_CAL_MSG(("%s\n","setValue() after Zone/DST glitch resubmit")); - // Time zone transition => resubmit. + // tools::Time zone transition => resubmit. // TZ=America/St_Johns date <= 1935-03-30 // -3:30:52 (!) instead of -3:30 // if first submission included time zone -3:30 that would be wrong. diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index a0200417fa39..b1381d8c7efd 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -115,7 +115,7 @@ Calendar_hijri::NewMoon(sal_Int32 n) { double jd, t, t2, t3, k, ma, sa, tf, xtra; k = n; - t = k/1236.85; // Time in Julian centuries from 1900 January 0.5 + t = k/1236.85; // tools::Time in Julian centuries from 1900 January 0.5 t2 = t * t; t3 = t2 * t; @@ -160,7 +160,7 @@ Calendar_hijri::NewMoon(sal_Int32 n) + 0.0010 * sin(tf - ma) + 0.0005 * sin(sa + 2 * ma); - // convert from Ephemeris Time (ET) to (approximate) Universal Time (UT) + // convert from Ephemeris tools::Time (ET) to (approximate) Universal tools::Time (UT) jd += xtra - (0.41 + 1.2053 * t + 0.4992 * t2)/1440; return (jd); diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 532e30af1a8a..e35e503b0c37 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -276,12 +276,12 @@ private: public: SV_DECL_PERSIST1( SvxExtTimeField, SvxFieldData, com::sun::star::text::textfield::Type::EXTENDED_TIME ) SvxExtTimeField(); - explicit SvxExtTimeField( const Time& rTime, + explicit SvxExtTimeField( const tools::Time& rTime, SvxTimeType eType = SVXTIMETYPE_VAR, SvxTimeFormat eFormat = SVXTIMEFORMAT_STANDARD ); sal_Int64 GetFixTime() const { return m_nFixTime; } - void SetFixTime( const Time& rTime ) { m_nFixTime = rTime.GetTime(); } + void SetFixTime( const tools::Time& rTime ) { m_nFixTime = rTime.GetTime(); } SvxTimeType GetType() const { return eType; } void SetType( SvxTimeType eTp ) { eType = eTp; } @@ -292,7 +292,7 @@ public: // If eLanguage==LANGUAGE_DONTKNOW the language/country // used in number formatter initialization is taken. OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; - static OUString GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); + static OUString GetFormatted( tools::Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const SAL_OVERRIDE; virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; @@ -418,7 +418,7 @@ public: SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_DATE_TIME ) SvxDateTimeField(); - static OUString GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); + static OUString GetFormatted( Date& rDate, tools::Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); virtual SvxFieldData* Clone() const SAL_OVERRIDE; virtual bool operator==( const SvxFieldData& ) const SAL_OVERRIDE; diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index aff3c036f4e3..8ad8564e699a 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -171,7 +171,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists OUString sShareAutoCorrFile, sUserAutoCorrFile; // If the AutoCorr file is newer Date aModifiedDate; - Time aModifiedTime, aLastCheckTime; + tools::Time aModifiedTime, aLastCheckTime; SvStringsISortDtor* pCplStt_ExcptLst; SvStringsISortDtor* pWrdStt_ExcptLst; diff --git a/include/postx.h b/include/postx.h index 0952f7ebabf4..195786fcee85 100644 --- a/include/postx.h +++ b/include/postx.h @@ -26,7 +26,6 @@ /* X Types */ #undef Icon -#undef Time #undef Min #undef Max diff --git a/include/prex.h b/include/prex.h index 7b1a3574fb70..a7db2bdc1100 100644 --- a/include/prex.h +++ b/include/prex.h @@ -29,9 +29,6 @@ */ #define Icon HIDE_XLIB_Icon -/* Types from <X11/X.h> that clash, but we do use. */ -#define Time XLIB_Time - #if defined __cplusplus extern "C" { #endif diff --git a/include/svl/fstathelper.hxx b/include/svl/fstathelper.hxx index feb43cefa7fa..f6e4343f4108 100644 --- a/include/svl/fstathelper.hxx +++ b/include/svl/fstathelper.hxx @@ -24,7 +24,7 @@ #include <svl/svldllapi.h> class Date; -class Time; +namespace tools { class Time; } namespace FStatHelper { @@ -39,7 +39,7 @@ namespace FStatHelper { @return it was be able to get the date/time stamp */ SVL_DLLPUBLIC bool GetModifiedDateTimeOfFile( const OUString& rURL, - Date* pDate, Time* pTime ); + Date* pDate, tools::Time* pTime ); /** Return if under the URL a document exist. This is only a wrapper for the UCB.IsContent. diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 685696106672..eca260ae844a 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -120,8 +120,8 @@ public: void SetDateTimeMode(sal_uInt16 nMode); void SetFirstDate(const Date&); void SetLastDate(const Date&); - void SetFirstTime(const Time&); - void SetLastTime(const Time&); + void SetFirstTime(const tools::Time&); + void SetLastTime(const tools::Time&); void SetFilterAuthor(bool bFlag=true); void SetAuthor(const OUString &); void SetFilterComment(bool bFlag=true); @@ -209,13 +209,13 @@ public: Date GetFirstDate() const; void SetFirstDate(const Date &aDate); - Time GetFirstTime() const; - void SetFirstTime(const Time &aTime); + tools::Time GetFirstTime() const; + void SetFirstTime(const tools::Time &aTime); Date GetLastDate() const; void SetLastDate(const Date &aDate); - Time GetLastTime() const; - void SetLastTime(const Time &aTime); + tools::Time GetLastTime() const; + void SetLastTime(const tools::Time &aTime); void SetDateMode(sal_uInt16 nMode); sal_uInt16 GetDateMode(); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 4feff17a0f2c..5336de75ebb2 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -39,12 +39,12 @@ struct ExchangeData GalleryTheme* pTheme; OUString aEditedTitle; Date aThemeChangeDate; - Time aThemeChangeTime; + tools::Time aThemeChangeTime; ExchangeData() : pTheme(NULL) , aThemeChangeDate( Date::EMPTY ) - , aThemeChangeTime( Time::EMPTY ) + , aThemeChangeTime( tools::Time::EMPTY ) { } }; diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx index c5e45ec72734..256bb7258622 100644 --- a/include/tools/datetime.hxx +++ b/include/tools/datetime.hxx @@ -23,7 +23,7 @@ #include <tools/date.hxx> #include <tools/time.hxx> -class TOOLS_DLLPUBLIC SAL_WARN_UNUSED DateTime : public Date, public Time +class TOOLS_DLLPUBLIC SAL_WARN_UNUSED DateTime : public Date, public tools::Time { public: enum DateTimeInitSystem @@ -42,8 +42,8 @@ public: DateTime( const DateTime& rDateTime ) : Date( rDateTime ), Time( rDateTime ) {} DateTime( const Date& rDate ) : Date( rDate ), Time(0) {} - DateTime( const Time& rTime ) : Date(0), Time( rTime ) {} - DateTime( const Date& rDate, const Time& rTime ) : + DateTime( const tools::Time& rTime ) : Date(0), Time( rTime ) {} + DateTime( const Date& rDate, const tools::Time& rTime ) : Date( rDate ), Time( rTime ) {} bool IsBetween( const DateTime& rFrom, @@ -79,16 +79,16 @@ public: DateTime& operator +=( double fTimeInDays ); DateTime& operator -=( double fTimeInDays ) { return operator+=( -fTimeInDays ); } - DateTime& operator +=( const Time& rTime ); - DateTime& operator -=( const Time& rTime ); + DateTime& operator +=( const tools::Time& rTime ); + DateTime& operator -=( const tools::Time& rTime ); TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, long nDays ); TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, long nDays ); TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, double fTimeInDays ); TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, double fTimeInDays ) { return operator+( rDateTime, -fTimeInDays ); } - TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, const Time& rTime ); - TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, const Time& rTime ); + TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, const tools::Time& rTime ); + TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, const tools::Time& rTime ); TOOLS_DLLPUBLIC friend double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 ); TOOLS_DLLPUBLIC friend long operator -( const DateTime& rDateTime, const Date& rDate ) { return (const Date&) rDateTime - rDate; } diff --git a/include/tools/time.hxx b/include/tools/time.hxx index ac259bc4c7ff..cac4117e5426 100644 --- a/include/tools/time.hxx +++ b/include/tools/time.hxx @@ -31,6 +31,8 @@ class ResId; 25 hours or 10 minus 20 seconds being (non-negative) 10 seconds. */ +namespace tools { + class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Time { private: @@ -68,7 +70,7 @@ public: Time( TimeInitSystem ); Time( const ResId & rResId ); Time( sal_Int64 _nTime ) { Time::nTime = _nTime; } - Time( const Time& rTime ); + Time( const tools::Time& rTime ); Time( const ::com::sun::star::util::Time& rTime ); Time( sal_uInt32 nHour, sal_uInt32 nMin, sal_uInt32 nSec = 0, sal_uInt64 nNanoSec = 0 ); @@ -103,22 +105,22 @@ public: /// 12 hours == 0.5 days double GetTimeInDays() const; - bool IsBetween( const Time& rFrom, const Time& rTo ) const + bool IsBetween( const tools::Time& rFrom, const tools::Time& rTo ) const { return ((nTime >= rFrom.nTime) && (nTime <= rTo.nTime)); } - bool IsEqualIgnoreNanoSec( const Time& rTime ) const; + bool IsEqualIgnoreNanoSec( const tools::Time& rTime ) const; - bool operator ==( const Time& rTime ) const + bool operator ==( const tools::Time& rTime ) const { return (nTime == rTime.nTime); } - bool operator !=( const Time& rTime ) const + bool operator !=( const tools::Time& rTime ) const { return (nTime != rTime.nTime); } - bool operator >( const Time& rTime ) const + bool operator >( const tools::Time& rTime ) const { return (nTime > rTime.nTime); } - bool operator <( const Time& rTime ) const + bool operator <( const tools::Time& rTime ) const { return (nTime < rTime.nTime); } - bool operator >=( const Time& rTime ) const + bool operator >=( const tools::Time& rTime ) const { return (nTime >= rTime.nTime); } - bool operator <=( const Time& rTime ) const + bool operator <=( const tools::Time& rTime ) const { return (nTime <= rTime.nTime); } static Time GetUTCOffset(); @@ -127,15 +129,17 @@ public: void ConvertToUTC() { *this -= Time::GetUTCOffset(); } void ConvertToLocalTime() { *this += Time::GetUTCOffset(); } - Time& operator =( const Time& rTime ); + tools::Time& operator =( const tools::Time& rTime ); Time operator -() const { return Time( -nTime ); } - Time& operator +=( const Time& rTime ); - Time& operator -=( const Time& rTime ); - TOOLS_DLLPUBLIC friend Time operator +( const Time& rTime1, const Time& rTime2 ); - TOOLS_DLLPUBLIC friend Time operator -( const Time& rTime1, const Time& rTime2 ); + tools::Time& operator +=( const tools::Time& rTime ); + tools::Time& operator -=( const tools::Time& rTime ); + TOOLS_DLLPUBLIC friend Time operator +( const tools::Time& rTime1, const tools::Time& rTime2 ); + TOOLS_DLLPUBLIC friend Time operator -( const tools::Time& rTime1, const tools::Time& rTime2 ); }; +} /* namespace tools */ + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx index 306db2805e67..c7de9badd3f8 100644 --- a/include/unotools/datetime.hxx +++ b/include/unotools/datetime.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/util/DateTime.hpp> class Date; -class Time; +namespace tools { class Time; } class DateTime; namespace utl diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 15c9520e383a..77e580fb37da 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { } }}} class Date; -class Time; +namespace tools { class Time; } class CalendarWrapper; enum DateFormat { @@ -241,9 +241,9 @@ public: DateFormat getLongDateFormat() const; /// only numerical values of Gregorian calendar OUString getDate( const Date& rDate ) const; - OUString getTime( const Time& rTime, bool bSec = true, + OUString getTime( const tools::Time& rTime, bool bSec = true, bool b100Sec = false ) const; - OUString getDuration( const Time& rTime, + OUString getDuration( const tools::Time& rTime, bool bSec = true, bool b100Sec = false ) const; /** The CalendarWrapper already <b>MUST</b> diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 35648a839639..f3d6c8209bdd 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -405,26 +405,26 @@ public: class VCL_DLLPUBLIC TimeFormatter : public FormatterBase { private: - Time maLastTime; - Time maMin; - Time maMax; - Time maCorrectedTime; + tools::Time maLastTime; + tools::Time maMin; + tools::Time maMax; + tools::Time maCorrectedTime; TimeFieldFormat meFormat; - sal_uInt16 mnTimeFormat; + sal_uInt16 mnTimeFormat; bool mbDuration; bool mbEnforceValidValue; SAL_DLLPRIVATE void ImplInit(); protected: - Time maFieldTime; + tools::Time maFieldTime; TimeFormatter(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE bool ImplTimeReformat( const OUString& rStr, OUString& rOutStr ); - SAL_DLLPRIVATE void ImplNewFieldValue( const Time& rTime ); - SAL_DLLPRIVATE void ImplSetUserTime( const Time& rNewTime, Selection* pNewSelection = NULL ); + SAL_DLLPRIVATE void ImplNewFieldValue( const tools::Time& rTime ); + SAL_DLLPRIVATE void ImplSetUserTime( const tools::Time& rNewTime, Selection* pNewSelection = NULL ); SAL_DLLPRIVATE bool ImplAllowMalformedInput() const; public: @@ -439,10 +439,10 @@ public: virtual void Reformat() SAL_OVERRIDE; virtual void ReformatAll() SAL_OVERRIDE; - void SetMin( const Time& rNewMin ); - const Time& GetMin() const { return maMin; } - void SetMax( const Time& rNewMax ); - const Time& GetMax() const { return maMax; } + void SetMin( const tools::Time& rNewMin ); + const tools::Time& GetMin() const { return maMin; } + void SetMax( const tools::Time& rNewMax ); + const tools::Time& GetMax() const { return maMax; } void SetTimeFormat( TimeFormat eNewFormat ); TimeFormat GetTimeFormat() const { return (TimeFormat)mnTimeFormat;} @@ -453,14 +453,14 @@ public: void SetDuration( bool mbDuration ); bool IsDuration() const { return mbDuration; } - void SetTime( const Time& rNewTime ); - void SetUserTime( const Time& rNewTime ); - Time GetTime() const; + void SetTime( const tools::Time& rNewTime ); + void SetUserTime( const tools::Time& rNewTime ); + tools::Time GetTime() const; void SetEmptyTime() { FormatterBase::SetEmptyFieldValue(); } bool IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); } - Time GetCorrectedTime() const { return maCorrectedTime; } + tools::Time GetCorrectedTime() const { return maCorrectedTime; } - static Time GetInvalidTime() { return Time( 99, 99, 99 ); } + static tools::Time GetInvalidTime() { return tools::Time( 99, 99, 99 ); } /** enables or disables the enforcement of valid values @@ -662,8 +662,8 @@ public: class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter { private: - Time maFirst; - Time maLast; + tools::Time maFirst; + tools::Time maLast; protected: SAL_DLLPRIVATE void ImplTimeSpinArea( bool bUp ); @@ -685,10 +685,10 @@ public: virtual void First() SAL_OVERRIDE; virtual void Last() SAL_OVERRIDE; - void SetFirst( const Time& rNewFirst ) { maFirst = rNewFirst; } - Time GetFirst() const { return maFirst; } - void SetLast( const Time& rNewLast ) { maLast = rNewLast; } - Time GetLast() const { return maLast; } + void SetFirst( const tools::Time& rNewFirst ) { maFirst = rNewFirst; } + tools::Time GetFirst() const { return maFirst; } + void SetLast( const tools::Time& rNewLast ) { maLast = rNewLast; } + tools::Time GetLast() const { return maLast; } void SetExtFormat( ExtTimeFieldFormat eFormat ); }; diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index f41e0d379998..32c3d13e6183 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -44,7 +44,7 @@ // predeclarations -class Time; +namespace tools { class Time; } namespace com { namespace sun { namespace star { namespace util { struct DateTime; } diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx index 04d12b62c319..188e94a3dda6 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx @@ -55,7 +55,7 @@ ************************************************************************/ /************************************************************************* * @file - * Time style. The TIme format for time field. + * tools::Time style. The TIme format for time field. ************************************************************************/ #include "xftimestyle.hxx" diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 6ec219d45959..b3e0bbdb4752 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -374,7 +374,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData /* {{{ OPreparedStatement::setTime() -I- */ -void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) +void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const tools::Time& aVal) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("OPreparedStatement::setTime"); diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 3541ec2b83e2..32916005a402 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -524,7 +524,7 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column) MutexGuard aGuard(m_aMutex); checkColumnIndex(column); - Time t; + tools::Time t; OUString timeString = getString(column); OUString token; sal_Int32 nIndex, i=0; @@ -562,7 +562,7 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column) checkColumnIndex(column); DateTime dt; Date d = getDate(column); - Time t = getTime(column); + tools::Time t = getTime(column); dt.Year = d.Year; dt.Month = d.Month; @@ -1088,7 +1088,7 @@ void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */) /* }}} */ /* {{{ OResultSet::updateTime() -U- */ -void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */) +void SAL_CALL OResultSet::updateTime(sal_Int32 column, const tools::Time& /* x */) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("OResultSet::updateTime"); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx index 1e9563a55f23..1474d7a09e20 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx @@ -197,7 +197,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index ed3498101e16..af8b5a0e2e58 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -326,13 +326,13 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept } -Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); - Time nRet; + css::util::Time nRet; return nRet; } @@ -657,7 +657,7 @@ void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) thr } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 2523156ade0d..b8a6f725e2ae 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -97,17 +97,17 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, case 9: // DateTime dd/mm/yy H:MM:SS PM lclCreateTextFields( aFields, xModel, "datetime13" ); break; - case 10: // Time H:MM + case 10: // tools::Time H:MM bIsDate = false; break; - case 11: // Time H:MM:SS + case 11: // tools::Time H:MM:SS bIsDate = false; // this is the default format break; - case 12: // Time H:MM PM + case 12: // tools::Time H:MM PM bIsDate = false; break; - case 13: // Time H:MM:SS PM + case 13: // tools::Time H:MM:SS PM bIsDate = false; break; } diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 59711c0a4fd5..1143e6a284b6 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2202,7 +2202,7 @@ util::DateTime InputObjectBase::dumpFileTime( const String& rName ) // file time is in 10^-7 seconds (100 nanoseconds), convert to nanoseconds nFileTime *= 100; // entire days - sal_Int64 nDays = nFileTime / sal_Int64( ::Time::nanoSecPerDay ); + sal_Int64 nDays = nFileTime / sal_Int64( ::tools::Time::nanoSecPerDay ); // number of entire years sal_Int64 nYears = (nDays - (nDays / (4 * 365)) + (nDays / (100 * 365)) - (nDays / (400 * 365))) / 365; // remaining days in the year @@ -2225,16 +2225,16 @@ util::DateTime InputObjectBase::dumpFileTime( const String& rName ) // the day aDateTime.Day = static_cast< sal_uInt16 >( nDaysInYear + 1 ); // number of nanoseconds in the day - sal_Int64 nTimeInDay = nFileTime % sal_Int64( ::Time::nanoSecPerDay ); + sal_Int64 nTimeInDay = nFileTime % sal_Int64( ::tools::Time::nanoSecPerDay ); // nanoseconds - aDateTime.NanoSeconds = static_cast< sal_uInt32 >( nTimeInDay % ::Time::nanoSecPerSec ); - nTimeInDay /= ::Time::nanoSecPerSec; + aDateTime.NanoSeconds = static_cast< sal_uInt32 >( nTimeInDay % ::tools::Time::nanoSecPerSec ); + nTimeInDay /= ::tools::Time::nanoSecPerSec; // seconds - aDateTime.Seconds = static_cast< sal_uInt16 >( nTimeInDay % ::Time::secondPerMinute ); - nTimeInDay /= ::Time::secondPerMinute; + aDateTime.Seconds = static_cast< sal_uInt16 >( nTimeInDay % ::tools::Time::secondPerMinute ); + nTimeInDay /= ::tools::Time::secondPerMinute; // minutes - aDateTime.Minutes = static_cast< sal_uInt16 >( nTimeInDay % ::Time::minutePerHour ); - nTimeInDay /= ::Time::minutePerHour; + aDateTime.Minutes = static_cast< sal_uInt16 >( nTimeInDay % ::tools::Time::minutePerHour ); + nTimeInDay /= ::tools::Time::minutePerHour; // hours aDateTime.Hours = static_cast< sal_uInt16 >( nTimeInDay ); diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 942cf3ff59e4..8ac22eb137c8 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -288,7 +288,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TYPE_TIME: { OSL_ENSURE(((sal_uInt32)nValue) == 0, - "OPropertyImport::convertString: a Time value with more than a fractional part?"); + "OPropertyImport::convertString: a tools::Time value with more than a fractional part?"); aReturn <<= implGetTime(nValue); } break; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 7de87826a339..e77d254610cd 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -177,7 +177,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con double nValue = 0; if ( _bTime ) { - Time aCurrentTime( Time::SYSTEM ); + tools::Time aCurrentTime( tools::Time::SYSTEM ); nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(aCurrentTime.GetTime())); } else diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx index 8372f49d4fea..0a4eb45b09f2 100644 --- a/sal/workben/measure_oustrings.cxx +++ b/sal/workben/measure_oustrings.cxx @@ -86,7 +86,7 @@ public: std::cout << "Unavailable" << std::endl; currenttest++; #ifndef HAVE_CALLGRIND - std::cout << " Elapsed Time is: " << m_nEndTime - m_nStartTime << "ms" << std::endl; + std::cout << " Elapsed tools::Time is: " << m_nEndTime - m_nStartTime << "ms" << std::endl; #endif } }; diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index 899d6c325d6a..e4c34d8db1cf 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -87,16 +87,16 @@ Timer::Timer() { } -Timer::Timer( const TTimeValue& Time ) - : m_aTimeOut( Time ), +Timer::Timer( const TTimeValue& rTime ) + : m_aTimeOut( rTime ), m_aExpired( 0 ), m_aRepeatDelta( 0 ), m_pNext( NULL ) { } -Timer::Timer( const TTimeValue& Time, const TTimeValue& Repeat ) - : m_aTimeOut( Time ), +Timer::Timer( const TTimeValue& rTime, const TTimeValue& Repeat ) + : m_aTimeOut( rTime ), m_aExpired( 0 ), m_aRepeatDelta( Repeat ), m_pNext( NULL ) diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 4acb1834b590..142650fa9fa1 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -196,7 +196,7 @@ struct ScHeaderFieldData OUString aShortDocName; // pure file name OUString aTabName; Date aDate; - Time aTime; + tools::Time aTime; long nPageNo; long nTotalPages; SvxNumType eNumType; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 383186ef715f..8a2d3a4dcfa4 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -419,9 +419,9 @@ private: struct SrcShell { SfxObjectShellRef maShell; - Time maLastAccess; + tools::Time maLastAccess; - SrcShell() : maLastAccess( Time::SYSTEM ) {} + SrcShell() : maLastAccess( tools::Time::SYSTEM ) {} }; typedef ::boost::unordered_map<sal_uInt16, SrcShell> DocShellMap; diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index 66aa2e2e2c84..f99aaf0a2213 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -105,10 +105,10 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB NUMBERFORMAT_TIME, ScGlobal::eLnge ); util::Time aTime = xRow->getTime(nRowPos); - nVal = aTime.Hours / static_cast<double>(::Time::hourPerDay) + - aTime.Minutes / static_cast<double>(::Time::minutePerDay) + - aTime.Seconds / static_cast<double>(::Time::secondPerDay) + - aTime.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay); + nVal = aTime.Hours / static_cast<double>(::tools::Time::hourPerDay) + + aTime.Minutes / static_cast<double>(::tools::Time::minutePerDay) + + aTime.Seconds / static_cast<double>(::tools::Time::secondPerDay) + + aTime.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerDay); bEmptyFlag = xRow->wasNull(); bValue = true; } @@ -123,10 +123,10 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB util::DateTime aStamp = xRow->getTimestamp(nRowPos); nVal = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - *pFormTable->GetNullDate() ) + - aStamp.Hours / static_cast<double>(::Time::hourPerDay) + - aStamp.Minutes / static_cast<double>(::Time::minutePerDay) + - aStamp.Seconds / static_cast<double>(::Time::secondPerDay) + - aStamp.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay); + aStamp.Hours / static_cast<double>(::tools::Time::hourPerDay) + + aStamp.Minutes / static_cast<double>(::tools::Time::minutePerDay) + + aStamp.Seconds / static_cast<double>(::tools::Time::secondPerDay) + + aStamp.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerDay); bEmptyFlag = xRow->wasNull(); bValue = true; } diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 88169a589134..ddb8acdbd5dc 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -474,7 +474,7 @@ public: IdleCalcTextWidthScope(ScDocument& rDoc, ScAddress& rCalcPos) : mrDoc(rDoc), mrCalcPos(rCalcPos), - mnStartTime(Time::GetSystemTicks()), + mnStartTime(tools::Time::GetSystemTicks()), mpStylePool(rDoc.GetStyleSheetPool()), mnOldSearchMask(mpStylePool->GetSearchMask()), meOldFamily(mpStylePool->GetSearchFamily()), @@ -683,7 +683,7 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers // Quit if either 1) its duration exceeds 50 ms, or 2) there is any // pending event after processing 32 cells. - if ((50L < Time::GetSystemTicks() - aScope.getStartTime()) || (nCount > 31 && Application::AnyInput(ABORT_EVENTS))) + if ((50L < tools::Time::GetSystemTicks() - aScope.getStartTime()) || (nCount > 31 && Application::AnyInput(ABORT_EVENTS))) nCount = CALCMAX; } diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 472d8eba4dd5..64d072b245eb 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -220,10 +220,10 @@ void DBConnector::getValue(long nCol, ScDPItemData &rData, short& rNumType) cons rNumType = NUMBERFORMAT_TIME; util::Time aTime = mxRow->getTime(nCol+1); - fValue = aTime.Hours / static_cast<double>(::Time::hourPerDay) + - aTime.Minutes / static_cast<double>(::Time::minutePerDay) + - aTime.Seconds / static_cast<double>(::Time::secondPerDay) + - aTime.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay); + fValue = aTime.Hours / static_cast<double>(::tools::Time::hourPerDay) + + aTime.Minutes / static_cast<double>(::tools::Time::minutePerDay) + + aTime.Seconds / static_cast<double>(::tools::Time::secondPerDay) + + aTime.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerDay); rData.SetValue(fValue); break; } @@ -233,10 +233,10 @@ void DBConnector::getValue(long nCol, ScDPItemData &rData, short& rNumType) cons util::DateTime aStamp = mxRow->getTimestamp(nCol+1); fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - maNullDate ) + - aStamp.Hours / static_cast<double>(::Time::hourPerDay) + - aStamp.Minutes / static_cast<double>(::Time::minutePerDay) + - aStamp.Seconds / static_cast<double>(::Time::secondPerDay) + - aStamp.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay); + aStamp.Hours / static_cast<double>(::tools::Time::hourPerDay) + + aStamp.Minutes / static_cast<double>(::tools::Time::minutePerDay) + + aStamp.Seconds / static_cast<double>(::tools::Time::secondPerDay) + + aStamp.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerDay); rData.SetValue(fValue); break; } diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 17185aafb8bf..01f830c2ccf7 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -135,7 +135,7 @@ void ScChangeViewSettings::AdjustDateMode( const ScDocument& rDoc ) // Set the next minute as the start time and assume that // the document isn't saved, reloaded, edited and filter set // all together during the gap between those two times. - aFirstDateTime += Time( 0, 1 ); + aFirstDateTime += tools::Time( 0, 1 ); aFirstDateTime.SetSec(0); aFirstDateTime.SetNanoSec(0); } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 50b2b6c8fee3..245831f49ab2 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -780,7 +780,7 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType) ScHeaderFieldData::ScHeaderFieldData() : aDate( Date::EMPTY ), - aTime( Time::EMPTY ) + aTime( tools::Time::EMPTY ) { nPageNo = nTotalPages = 0; eNumType = SVX_ARABIC; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index f5179a89426e..cadc47b79205 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -108,11 +108,11 @@ void ScInterpreter::ScGetActTime() nFuncFmtType = NUMBERFORMAT_DATETIME; Date aActDate( Date::SYSTEM ); long nDiff = aActDate - *(pFormatter->GetNullDate()); - Time aActTime( Time::SYSTEM ); - double nTime = aActTime.GetHour() / static_cast<double>(::Time::hourPerDay) + - aActTime.GetMin() / static_cast<double>(::Time::minutePerDay) + - aActTime.GetSec() / static_cast<double>(::Time::secondPerDay) + - aActTime.GetNanoSec() / static_cast<double>(::Time::nanoSecPerDay); + tools::Time aActTime( tools::Time::SYSTEM ); + double nTime = aActTime.GetHour() / static_cast<double>(::tools::Time::hourPerDay) + + aActTime.GetMin() / static_cast<double>(::tools::Time::minutePerDay) + + aActTime.GetSec() / static_cast<double>(::tools::Time::secondPerDay) + + aActTime.GetNanoSec() / static_cast<double>(::tools::Time::nanoSecPerDay); PushDouble( (double) nDiff + nTime ); } @@ -141,15 +141,15 @@ void ScInterpreter::ScGetMin() { double fTime = GetDouble(); fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg - long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::Time::secondPerHour; - PushDouble( (double) (nVal / ::Time::secondPerMinute) ); + long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::tools::Time::secondPerHour; + PushDouble( (double) (nVal / ::tools::Time::secondPerMinute) ); } void ScInterpreter::ScGetSec() { double fTime = GetDouble(); fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg - long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::Time::secondPerMinute; + long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::tools::Time::secondPerMinute; PushDouble( (double) nVal ); } @@ -157,7 +157,7 @@ void ScInterpreter::ScGetHour() { double fTime = GetDouble(); fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg - long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) / ::Time::secondPerHour; + long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) / ::tools::Time::secondPerHour; PushDouble((double) nVal); } @@ -459,7 +459,7 @@ void ScInterpreter::ScGetTime() double nSec = GetDouble(); double nMin = GetDouble(); double nHour = GetDouble(); - double fTime = fmod( (nHour * ::Time::secondPerHour) + (nMin * ::Time::secondPerMinute) + nSec, DATE_TIME_FACTOR) / DATE_TIME_FACTOR; + double fTime = fmod( (nHour * ::tools::Time::secondPerHour) + (nMin * ::tools::Time::secondPerMinute) + nSec, DATE_TIME_FACTOR) / DATE_TIME_FACTOR; if (fTime < 0) PushIllegalArgument(); else diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 6fb756f09f6f..cce7b0226f98 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -160,7 +160,7 @@ void XclImpPCItem::ReadSxdatetime( XclImpStream& rStrm ) sal_uInt16 nYear, nMonth; sal_uInt8 nDay, nHour, nMin, nSec; rStrm >> nYear >> nMonth >> nDay >> nHour >> nMin >> nSec; - SetDateTime( DateTime( Date( nDay, nMonth, nYear ), Time( nHour, nMin, nSec ) ) ); + SetDateTime( DateTime( Date( nDay, nMonth, nYear ), tools::Time( nHour, nMin, nSec ) ) ); } void XclImpPCItem::ReadSxempty( XclImpStream& rStrm ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index fdf1dfaf8f64..9e87e0320b48 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -156,7 +156,7 @@ static void lcl_AddStamp( OUString& rStr, const OUString& rName, const LocaleDataWrapper& rLoc ) { Date aD(rDateTime.Day, rDateTime.Month, rDateTime.Year); - Time aT(rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds, + tools::Time aT(rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds, rDateTime.NanoSeconds); DateTime aDateTime(aD,aT); diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index b9a491f3d21a..cab987616a80 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -124,7 +124,7 @@ const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020; /** Adjusts the weird date format read from binary streams. Dates before 1900-Mar-01 are stored including the non-existing leap day - 1900-02-29. Time values (without date) are stored as times of day + 1900-02-29. tools::Time values (without date) are stored as times of day 1900-Jan-00. Nothing has to be done when the workbook is stored in 1904 date mode (dates before 1904-Jan-01 will not occur in this case). */ diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx index cab30a371f03..45ad6de90335 100644 --- a/sc/source/filter/oox/revisionfragment.cxx +++ b/sc/source/filter/oox/revisionfragment.cxx @@ -301,7 +301,7 @@ void RevisionHeadersFragment::importHeader( const AttributeList& rAttribs ) util::DateTime aDateTime; sax::Converter::parseDateTime(aDateTime, 0, aDateTimeStr); Date aDate(aDateTime.Day, aDateTime.Month, aDateTime.Year); - Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); + tools::Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); aMetadata.maDateTime.SetDate(aDate.GetDate()); aMetadata.maDateTime.SetTime(aTime.GetTime()); } diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 72811c63a3b3..3735f28c82b2 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -242,16 +242,16 @@ void ScOrcusSheet::set_date_time( Date aDate(day, month, year); sal_uInt32 nSec = floor(second); - sal_uInt32 nNanoSec = (second - nSec) * ::Time::nanoSecPerSec; - Time aTime(hour, minute, nSec, nNanoSec); + sal_uInt32 nNanoSec = (second - nSec) * ::tools::Time::nanoSecPerSec; + tools::Time aTime(hour, minute, nSec, nNanoSec); Date aNullDate(*pFormatter->GetNullDate()); long nDateDiff = aDate - aNullDate; double fTime = - static_cast<double>(aTime.GetNanoSec()) / ::Time::nanoSecPerSec + + static_cast<double>(aTime.GetNanoSec()) / ::tools::Time::nanoSecPerSec + aTime.GetSec() + - aTime.GetMin() * ::Time::secondPerMinute + - aTime.GetHour() * ::Time::secondPerHour; + aTime.GetMin() * ::tools::Time::secondPerMinute + + aTime.GetHour() * ::tools::Time::secondPerHour; fTime /= DATE_TIME_FACTOR; diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index ee54d244c099..e4fe55c0cd1a 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -433,7 +433,7 @@ void ScXMLChangeTrackingImportHelper::EndChangeAction() void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, OUString& rUser, DateTime& aDateTime) { Date aDate(aInfo.aDateTime.Day, aInfo.aDateTime.Month, aInfo.aDateTime.Year); - Time aTime(aInfo.aDateTime.Hours, aInfo.aDateTime.Minutes, aInfo.aDateTime.Seconds, aInfo.aDateTime.NanoSeconds); + tools::Time aTime(aInfo.aDateTime.Hours, aInfo.aDateTime.Minutes, aInfo.aDateTime.Seconds, aInfo.aDateTime.NanoSeconds); aDateTime.SetDate( aDate.GetDate() ); aDateTime.SetTime( aTime.GetTime() ); @@ -454,7 +454,7 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, O ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction) { - DateTime aDateTime( Date(0), Time(0) ); + DateTime aDateTime( Date(0), tools::Time(0) ); OUString aUser; ConvertInfo(pAction->aInfo, aUser, aDateTime); @@ -467,7 +467,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsActio ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction) { - DateTime aDateTime( Date(0), Time(0) ); + DateTime aDateTime( Date(0), tools::Time(0) ); OUString aUser; ConvertInfo(pAction->aInfo, aUser, aDateTime); @@ -483,7 +483,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction OSL_ENSURE(pAction->pMoveRanges, "no move ranges"); if (pAction->pMoveRanges) { - DateTime aDateTime( Date(0), Time(0) ); + DateTime aDateTime( Date(0), tools::Time(0) ); OUString aUser; ConvertInfo(pAction->aInfo, aUser, aDateTime); @@ -498,7 +498,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction) { - DateTime aDateTime( Date(0), Time(0) ); + DateTime aDateTime( Date(0), tools::Time(0) ); OUString aUser; ConvertInfo(pAction->aInfo, aUser, aDateTime); @@ -519,7 +519,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContent sInputString = pAction->pCellInfo->sInputString; } - DateTime aDateTime( Date(0), Time(0) ); + DateTime aDateTime( Date(0), tools::Time(0) ); OUString aUser; ConvertInfo(pAction->aInfo, aUser, aDateTime); diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 7f08774cdd75..4e4fb3143aa3 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -331,7 +331,7 @@ void ScXMLConverter::ConvertCoreToAPIDateTime(const DateTime& aDateTime, util::D void ScXMLConverter::ConvertAPIToCoreDateTime(const util::DateTime& aDateTime, DateTime& rDateTime) { Date aDate(aDateTime.Day, aDateTime.Month, aDateTime.Year); - Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); + tools::Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); DateTime aTempDateTime (aDate, aTime); rDateTime = aTempDateTime; } diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 9ba5f255481b..8c210054bc23 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -86,7 +86,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, OUString aComment(sCreatedBy + " " + aUserOpt.GetFirstName() + " " +aUserOpt.GetLastName() + ", " + sOn + " " + ScGlobal::GetpLocaleData()->getDate(Date(Date::SYSTEM)) - + ", " + ScGlobal::GetpLocaleData()->getTime(Time(Time::SYSTEM))); + + ", " + ScGlobal::GetpLocaleData()->getTime(tools::Time(tools::Time::SYSTEM))); m_pEdComment->SetText(aComment); m_pEdName->SetText(rName); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 6449cbcae873..ba92b732dbbb 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2071,7 +2071,7 @@ void ScExternalRefManager::enableDocTimer( bool bEnable ) { DocShellMap::iterator it = maDocShells.begin(), itEnd = maDocShells.end(); for (; it != itEnd; ++it) - it->second.maLastAccess = Time(Time::SYSTEM); + it->second.maLastAccess = tools::Time(tools::Time::SYSTEM); maSrcDocTimer.Start(); } @@ -2272,7 +2272,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) // document already loaded. SfxObjectShell* p = itr->second.maShell; - itr->second.maLastAccess = Time( Time::SYSTEM ); + itr->second.maLastAccess = tools::Time( tools::Time::SYSTEM ); return &static_cast<ScDocShell*>(p)->GetDocument(); } @@ -2283,7 +2283,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) //document is unsaved document SfxObjectShell* p = itr->second.maShell; - itr->second.maLastAccess = Time( Time::SYSTEM ); + itr->second.maLastAccess = tools::Time( tools::Time::SYSTEM ); return &static_cast<ScDocShell*>(p)->GetDocument(); } @@ -2747,13 +2747,13 @@ bool ScExternalRefManager::refreshSrcDocument(sal_uInt16 nFileId) { it->second.maShell->DoClose(); it->second.maShell = xDocShell; - it->second.maLastAccess = Time(Time::SYSTEM); + it->second.maLastAccess = tools::Time(tools::Time::SYSTEM); } else { SrcShell aSrcDoc; aSrcDoc.maShell = xDocShell; - aSrcDoc.maLastAccess = Time(Time::SYSTEM); + aSrcDoc.maLastAccess = tools::Time(tools::Time::SYSTEM); cacheNewDocShell(nFileId, aSrcDoc); } @@ -2947,7 +2947,7 @@ void ScExternalRefManager::purgeStaleSrcDocument(sal_Int32 nTimeOut) for (; itr != itrEnd; ++itr) { // in 100th of a second. - sal_Int32 nSinceLastAccess = (Time( Time::SYSTEM ) - itr->second.maLastAccess).GetTime(); + sal_Int32 nSinceLastAccess = (tools::Time( tools::Time::SYSTEM ) - itr->second.maLastAccess).GetTime(); if (nSinceLastAccess >= nTimeOut) { // Timed out. Let's close this, and exit the loop. diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index e6a247add44a..2d0f7ea502e6 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -48,7 +48,7 @@ private: long nTabStart; // First (real) page of the sheet long nDisplayStart; // same as above, relative to the start of counting Date aDate; - Time aTime; + tools::Time aTime; long nTotalPages; Size aPageSize; // for GetOptimalZoom ScPrintState aState; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 264ee8d9c367..1b99dd51da22 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -245,7 +245,7 @@ public: void SetOffset( const Point& rOfs ); void SetManualZoom( sal_uInt16 nNewZoom ); - void SetDateTime( const Date& rDate, const Time& rTime ); + void SetDateTime( const Date& rDate, const tools::Time& rTime ); void SetClearFlag( bool bFlag ); void SetUseStyleColor( bool bFlag ); diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index c7f5a684168d..bddfdef57fc0 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -214,9 +214,9 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) ScChgsDateMode eMode = (ScChgsDateMode) m_pFilterCtr->GetDateMode(); aChangeViewSet.SetTheDateMode( eMode ); Date aFirstDate( m_pFilterCtr->GetFirstDate() ); - Time aFirstTime( m_pFilterCtr->GetFirstTime() ); + tools::Time aFirstTime( m_pFilterCtr->GetFirstTime() ); Date aLastDate( m_pFilterCtr->GetLastDate() ); - Time aLastTime( m_pFilterCtr->GetLastTime() ); + tools::Time aLastTime( m_pFilterCtr->GetLastTime() ); aChangeViewSet.SetTheFirstDateTime( DateTime( aFirstDate, aFirstTime ) ); aChangeViewSet.SetTheLastDateTime( DateTime( aLastDate, aLastTime ) ); aChangeViewSet.SetHasAuthor(m_pFilterCtr->IsAuthor()); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 562342bf20e8..87b9bbe89f1c 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -174,7 +174,7 @@ void ScShareDocumentDlg::UpdateView() sal_uInt16 nHours = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); sal_uInt16 nMinutes = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() ); Date aDate( nDay, nMonth, nYear ); - Time aTime( nHours, nMinutes ); + tools::Time aTime( nHours, nMinutes ); DateTime aDateTime( aDate, aTime ); OUString aString( aUser ); @@ -229,7 +229,7 @@ void ScShareDocumentDlg::UpdateView() util::DateTime uDT(xDocProps->getModificationDate()); Date d(uDT.Day, uDT.Month, uDT.Year); - Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime aDateTime(d,t); aString += formatTime(aDateTime, *ScGlobal::pLocaleData); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 36da2966796b..e8afa40eab5b 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -944,7 +944,7 @@ void ScEditFieldObj::setPropertyValueDateTime(const OUString& rName, const uno:: else if (rName == SC_UNONAME_DATETIME) { maDateTime = rVal.get<util::DateTime>(); - Time aTime(maDateTime.Hours, maDateTime.Minutes, maDateTime.Seconds, maDateTime.NanoSeconds); + tools::Time aTime(maDateTime.Hours, maDateTime.Minutes, maDateTime.Seconds, maDateTime.NanoSeconds); p->SetFixTime(aTime); } else if (rName == SC_UNONAME_NUMFMT) @@ -1043,7 +1043,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) if (rName == SC_UNONAME_DATETIME) { - Time aT(p->GetFixTime()); + tools::Time aT(p->GetFixTime()); maDateTime.Year = 0; maDateTime.Month = 0; maDateTime.Day = 0; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index dbd970d60af7..e7cad9911d72 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -96,7 +96,7 @@ ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* nTabStart( 0 ), nDisplayStart( 0 ), aDate( Date::SYSTEM ), - aTime( Time::SYSTEM ), + aTime( tools::Time::SYSTEM ), nTotalPages( 0 ), pLocationData( NULL ), pDrawView( NULL ), @@ -695,7 +695,7 @@ void ScPreview::DataChanged(bool bNewTime) if (bNewTime) { aDate = Date( Date::SYSTEM ); - aTime = Time( Time::SYSTEM ); + aTime = tools::Time( tools::Time::SYSTEM ); } bValid = false; diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 87c65ee90c82..bb379604e695 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1032,7 +1032,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) else aFieldData.nTotalPages = nTotalPages; - SetDateTime( Date( Date::SYSTEM ), Time( Time::SYSTEM ) ); + SetDateTime( Date( Date::SYSTEM ), tools::Time( tools::Time::SYSTEM ) ); if( pDocShell->getDocProperties()->getTitle().getLength() != 0 ) aFieldData.aTitle = pDocShell->getDocProperties()->getTitle(); @@ -1068,7 +1068,7 @@ void ScPrintFunc::GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ) rDocFtr = aFtr.nHeight; } -void ScPrintFunc::SetDateTime( const Date& rDate, const Time& rTime ) +void ScPrintFunc::SetDateTime( const Date& rDate, const tools::Time& rTime ) { aFieldData.aDate = rDate; aFieldData.aTime = rTime; diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 838b82c43789..228e1b45703d 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -281,7 +281,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) break; case NUMBERFORMAT_TIME: { - Time aActTime( Time::SYSTEM ); + tools::Time aActTime( tools::Time::SYSTEM ); fVal = aActTime.GetTimeInDays(); } break; @@ -394,7 +394,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) break; case NUMBERFORMAT_TIME: { - Time aActTime( Time::SYSTEM ); + tools::Time aActTime( tools::Time::SYSTEM ); fVal = aActTime.GetTimeInDays(); } break; @@ -404,7 +404,7 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const OUString& rUndoStr) case NUMBERFORMAT_DATE: { double fDate = rtl::math::approxFloor( fCell); - Time aActTime( Time::SYSTEM ); + tools::Time aActTime( tools::Time::SYSTEM ); fVal = fDate + aActTime.GetTimeInDays(); } break; diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index d91803c1a817..a16cdd65f802 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -427,7 +427,7 @@ void lcl_Annotations( FixedText& aTimeText ) if (xPos && xControl) { - sal_uLong nStart = Time::GetSystemTicks(); + sal_uLong nStart = tools::Time::GetSystemTicks(); xAnnotationText->setText(L"bla"); xCursor->gotoEnd(false); @@ -441,7 +441,7 @@ void lcl_Annotations( FixedText& aTimeText ) xPos->setText(L"dumdi"); } - sal_uLong nEnd = Time::GetSystemTicks(); + sal_uLong nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String(nEnd-nStart)+String(" ms")); } } @@ -585,7 +585,7 @@ void lcl_Cells( FixedText& aTimeText ) if (xDoc) { long nCount = 0; - sal_uLong nStart = Time::GetSystemTicks(); + sal_uLong nStart = tools::Time::GetSystemTicks(); XActionLockableRef xLock = (XActionLockable*) xDoc->queryInterface(XActionLockable::getSmartUik()); @@ -624,7 +624,7 @@ void lcl_Cells( FixedText& aTimeText ) } } - sal_uLong nEnd = Time::GetSystemTicks(); + sal_uLong nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String(nCount)+String(" ")+String(nEnd-nStart)+String(" ms")); // if (xLock) @@ -1510,9 +1510,9 @@ IMPL_LINK_NOARG(MyWindow, CountHdl) { case 0: { - sal_uLong nStart = Time::GetSystemTicks(); + sal_uLong nStart = tools::Time::GetSystemTicks(); lcl_DoCount(); - sal_uLong nEnd = Time::GetSystemTicks(); + sal_uLong nEnd = tools::Time::GetSystemTicks(); aTimeText.SetText(String("Count: ")+String(nEnd-nStart)+String(" ms")); } break; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index e863d906f62a..3383f4c4d498 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1326,7 +1326,7 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign ) pPage2_ChgDefault->Check( !pDesign->m_bAutoSlide ); pPage2_ChgAuto->Check( pDesign->m_bAutoSlide ); - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); aTime.MakeTimeFromMS( pDesign->m_nSlideDuration * 1000 ); pPage2_Duration->SetTime( aTime ); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 21c703e7d6a5..e853d6fda758 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -160,7 +160,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio else if (aDate.IsValidAndGregorian() ) sRet = rLocalData.getDate(aDate); - Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds ); + ::tools::Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds ); if(aTime.GetTime() != 0) sRet = sRet + " " + rLocalData.getTime( aTime,false ); } diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index d0ba712f7716..2c83b2d5102e 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -378,7 +378,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) else { Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); LanguageType eLang = pInfo->GetOutliner()->GetLanguage( pInfo->GetPara(), pInfo->GetPos() ); aRepresentation = SvxDateTimeField::GetFormatted( aDate, aTime, (SvxDateFormat)rSettings.meDateTimeFormat, *GetNumberFormatter(), eLang ); } diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 5f77891592cb..2614ba4f2b95 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -227,7 +227,7 @@ SvxFieldData* SdFieldPopup::GetField() if( (pTimeField->GetType() == SVXTIMETYPE_VAR) && (eType == SVXTIMETYPE_FIX) ) { - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); ( (SvxExtTimeField*) pNewField )->SetFixTime( aTime ); } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index cb4f70bae1f6..019103ef4efb 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -252,7 +252,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); // calculate overall time - Time aTime( 0 ); + tools::Time aTime( 0 ); long nFullTime; if( aRbtBitmap.IsChecked() ) { @@ -296,7 +296,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) if( aRbtBitmap.IsChecked() ) { - Time *const pTime = m_FrameList[i].second; + tools::Time *const pTime = m_FrameList[i].second; assert(pTime); aTimeField.SetTime( *pTime ); @@ -378,7 +378,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) sal_uLong n = static_cast<sal_uLong>(aNumFldBitmap.GetValue()); if( n > 0 ) { - Time *const pTime = m_FrameList[n - 1].second; + tools::Time *const pTime = m_FrameList[n - 1].second; if( pTime ) aTimeField.SetTime( *pTime ); } @@ -506,7 +506,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl) { sal_uLong nPos = static_cast<sal_uLong>(aNumFldBitmap.GetValue() - 1); - Time *const pTime = m_FrameList[nPos].second; + tools::Time *const pTime = m_FrameList[nPos].second; *pTime = aTimeField.GetTime(); @@ -627,11 +627,11 @@ void AnimationWindow::ResetAttrs() void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { - clock_t aEnd = Time::GetSystemTicks() + nMilliSeconds; - clock_t aCurrent = Time::GetSystemTicks(); + clock_t aEnd = tools::Time::GetSystemTicks() + nMilliSeconds; + clock_t aCurrent = tools::Time::GetSystemTicks(); while (aCurrent < aEnd) { - aCurrent = Time::GetSystemTicks(); + aCurrent = tools::Time::GetSystemTicks(); if( pProgress ) pProgress->SetState( nTime + nMilliSeconds + aCurrent - aEnd ); @@ -847,7 +847,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) } long nTime = rAnimBmp.nWait; - Time* pTime = new Time( 0, 0, nTime / 100, nTime % 100 ); + ::tools::Time* pTime = new ::tools::Time( 0, 0, nTime / 100, nTime % 100 ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, ::std::make_pair(pBitmapEx, pTime)); @@ -874,7 +874,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) SdrExchangeView::GetObjGraphic( pSnapShot->GetModel(), pSnapShot).GetBitmapEx() ); - Time* pTime = new Time( aTimeField.GetTime() ); + ::tools::Time* pTime = new ::tools::Time( aTimeField.GetTime() ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, @@ -895,7 +895,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) BitmapEx *const pBitmapEx = new BitmapEx(rView.GetAllMarkedGraphic().GetBitmapEx()); - Time* pTime = new Time( aTimeField.GetTime() ); + ::tools::Time* pTime = new ::tools::Time( aTimeField.GetTime() ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, @@ -925,7 +925,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) SdrExchangeView::GetObjGraphic( pObject->GetModel(), pObject).GetBitmapEx() ); - Time* pTime = new Time( aTimeField.GetTime() ); + ::tools::Time* pTime = new ::tools::Time( aTimeField.GetTime() ); m_FrameList.insert( m_FrameList.begin() + m_nCurrentFrame + 1, @@ -1015,7 +1015,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) for (size_t i = 0; i < nCount; ++i) { - Time *const pTime = m_FrameList[i].second; + tools::Time *const pTime = m_FrameList[i].second; long nTime = pTime->GetNanoSec(); nTime += pTime->GetSec() * 100; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index dfbab91b5147..f822c0960c90 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -521,9 +521,9 @@ AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLin mpPage3PresTypeLiveRB->SetClickHdl( LINK(this,AssistentDlgImpl, PresTypeHdl )); mpPage3PresTypeKioskRB->SetClickHdl( LINK(this,AssistentDlgImpl, PresTypeHdl )); mpPage3PresTimeTMF->SetFormat( TIMEF_SEC ); - mpPage3PresTimeTMF->SetTime( Time( 0, 0, 10 ) ); + mpPage3PresTimeTMF->SetTime( ::tools::Time( 0, 0, 10 ) ); mpPage3BreakTMF->SetFormat( TIMEF_SEC ); - mpPage3BreakTMF->SetTime( Time( 0, 0, 10 ) ); + mpPage3BreakTMF->SetTime( ::tools::Time( 0, 0, 10 ) ); mpPage3LogoCB->Check(); // set cursor in timefield diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index b3c7a836fe16..4b17fc718543 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -467,7 +467,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat ) mpCBDateTimeFormat->Clear(); Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); int nFormat; for( nFormat = 0; nFormat < nDateTimeFormatsCount; nFormat++ ) diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index a39d7e4a9110..21e1fedf2689 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -127,7 +127,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, const bool bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); - aTmfPause->SetTime( Time( 0, 0, nPause ) ); + aTmfPause->SetTime( tools::Time( 0, 0, nPause ) ); // set cursor in timefield Edit *pEdit = aTmfPause->GetField(); Selection aSel( pEdit->GetMaxTextLen(), pEdit->GetMaxTextLen() ); diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 09d94562604e..9e720ad04260 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -123,7 +123,7 @@ private: HelpButton aBtnHelp; vcl::Window* pWin; - ::std::vector< ::std::pair<BitmapEx*, Time*> > m_FrameList; + ::std::vector< ::std::pair<BitmapEx*, ::tools::Time*> > m_FrameList; static const size_t EMPTY_FRAMELIST = ULONG_MAX; size_t m_nCurrentFrame; SdDrawDocument* pMyDoc; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 019d2bb0d0c6..75e6a6cc05eb 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -187,7 +187,7 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) { // if this is not the first mouse move while hidden, see if // enough time has pasted to show mouse pointer again - sal_uLong nTime = Time::GetSystemTicks(); + sal_uLong nTime = ::tools::Time::GetSystemTicks(); if( (nTime - mnFirstMouseMove) >= SHOW_MOUSE_TIMEOUT ) { ShowPointer( true ); @@ -202,7 +202,7 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) // if this is the first mouse move, note current // time and start idle timer to cancel show mouse pointer // again if not enough mouse movement is measured - mnFirstMouseMove = Time::GetSystemTicks(); + mnFirstMouseMove = ::tools::Time::GetSystemTicks(); maMouseTimer.SetTimeout( 2*SHOW_MOUSE_TIMEOUT ); maMouseTimer.Start(); } @@ -516,7 +516,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData(); aText += " ( "; - aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) ); + aText += aLocaleData.getDuration( ::tools::Time( 0, 0, mnPauseTimeout ) ); aText += " )"; aVDev.DrawText( Point( aOffset.Width(), 0 ), aText ); DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, aVDev ); diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index a873e4e1399e..8b7bd44fad73 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -82,7 +82,7 @@ public: ::std::vector<Point> maStartOffset; /// Target offset of each item in the run at the end of the current animation. ::std::vector<Point> maEndOffset; - /// Time at which the current animation started. + /// tools::Time at which the current animation started. double mnStartTime; class Comparator diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 085cb8e2ecc9..4525b36be635 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -115,12 +115,12 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback) // Execute as many steps as fit into the time span of length // mnMaxTimePerStep. Note that the last step may take longer // than allowed. - sal_uInt32 nStartTime (Time( Time::SYSTEM ).GetMSFromTime()); + sal_uInt32 nStartTime (::tools::Time( ::tools::Time::SYSTEM ).GetMSFromTime()); SAL_INFO("sd.tools", OSL_THIS_FUNC << ": starting TimerBasedTaskExecution at " << nStartTime); do { mpTask->RunNextStep(); - sal_uInt32 nDuration (Time( Time::SYSTEM ).GetMSFromTime()-nStartTime); + sal_uInt32 nDuration (::tools::Time( ::tools::Time::SYSTEM ).GetMSFromTime()-nStartTime); SAL_INFO("sd.tools", OSL_THIS_FUNC << ": executed step in " << nDuration); if (nDuration > mnMaxTimePerStep) break; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 6cf0bcc87ccd..291733159378 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1604,7 +1604,7 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF util::DateTime aDateTime( xAnnotation->getDateTime() ); Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); - Time aTime( Time::EMPTY ); + ::tools::Time aTime( ::tools::Time::EMPTY ); OUString aStr( SvxDateTimeField::GetFormatted( aDate, aTime, SVXDATEFORMAT_B, *(SD_MOD()->GetNumberFormatter()), eLanguage ) ); vcl::PDFNote aNote; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 2a85683d56da..3e67f53192dd 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1447,7 +1447,7 @@ private: } if (mpOptions->IsTime()) - aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false ); + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( ::tools::Time( ::tools::Time::SYSTEM ), false, false ); // Draw should use specified paper size when printing, except for booklets if (!mpOptions->IsBooklet() && mrBase.GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW) diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index c6e7718021e0..4ac1be5ff2e7 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1893,7 +1893,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_INSERT_FLD_TIME_FIX: pFieldItem.reset(new SvxFieldItem( - SvxExtTimeField( Time( Time::SYSTEM ), SVXTIMETYPE_FIX ), EE_FEATURE_FIELD )); + SvxExtTimeField( ::tools::Time( ::tools::Time::SYSTEM ), SVXTIMETYPE_FIX ), EE_FEATURE_FIELD )); break; case SID_INSERT_FLD_TIME_VAR: diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index ca46d998eaf3..0c8f960749c1 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -503,7 +503,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_INSERT_FLD_TIME_FIX: pFieldItem.reset(new SvxFieldItem( - SvxExtTimeField( Time( Time::SYSTEM ), SVXTIMETYPE_FIX ), EE_FEATURE_FIELD )); + SvxExtTimeField( ::tools::Time( ::tools::Time::SYSTEM ), SVXTIMETYPE_FIX ), EE_FEATURE_FIELD )); break; case SID_INSERT_FLD_TIME_VAR: diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 8221d3af3866..4c4242390c38 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -81,7 +81,7 @@ Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference) OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper) { Date aDate(22, 12, 2000); - Time aTime(22, 59, 59); + tools::Time aTime(22, 59, 59); DateTime aDateTime(aDate, aTime); return formatTime(aDateTime, rWrapper); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index c1d220eb7a4b..ccbf9139908a 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -176,7 +176,7 @@ OUString ConvertDateTime_Impl( const OUString& rName, const util::DateTime& uDT, const LocaleDataWrapper& rWrapper ) { Date aD(uDT.Day, uDT.Month, uDT.Year); - Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); const OUString pDelim ( ", " ); OUString aStr( rWrapper.getDate( aD ) ); aStr += pDelim; @@ -719,7 +719,7 @@ namespace const LocaleDataWrapper& rWrapper( Application::GetSettings().GetLocaleDataWrapper() ); Date aDate( _nDate ); - Time aTime( _nTime ); + tools::Time aTime( _nTime ); OUString aStr( rWrapper.getDate( aDate ) ); aStr += ", "; aStr += rWrapper.getTime( aTime ); @@ -809,7 +809,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) OUString aEmpty; m_pChangeValFt->SetText( aEmpty ); m_pPrintValFt->SetText( aEmpty ); - const Time aTime( 0 ); + const tools::Time aTime( 0 ); m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aTime ) ); m_pDocNoValFt->SetText(OUString('1')); bHandleDelete = true; @@ -1093,7 +1093,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) const long nTime = m_pInfoItem->getEditingDuration(); if ( m_bUseUserData ) { - const Time aT( nTime/3600, (nTime%3600)/60, nTime%60 ); + const tools::Time aT( nTime/3600, (nTime%3600)/60, nTime%60 ); m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aT ) ); m_pDocNoValFt->SetText( OUString::number( m_pInfoItem->getEditingCycles() ) ); @@ -1804,7 +1804,7 @@ void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) else if ( rAny >>= aTmpDateTime ) { pNewLine->m_aDateField.SetDate( Date( aTmpDateTime.Day, aTmpDateTime.Month, aTmpDateTime.Year ) ); - pNewLine->m_aTimeField.SetTime( Time( aTmpDateTime.Hours, aTmpDateTime.Minutes, aTmpDateTime.Seconds, aTmpDateTime.NanoSeconds ) ); + pNewLine->m_aTimeField.SetTime( tools::Time( aTmpDateTime.Hours, aTmpDateTime.Minutes, aTmpDateTime.Seconds, aTmpDateTime.NanoSeconds ) ); pNewLine->m_aTimeField.m_isUTC = aTmpDateTime.IsUTC; nType = CUSTOM_TYPE_DATETIME; } @@ -1819,7 +1819,7 @@ void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) { util::DateTime const& rDT(aTmpDateTimeTZ.DateTimeInTZ); pNewLine->m_aDateField.SetDate( Date( rDT.Day, rDT.Month, rDT.Year ) ); - pNewLine->m_aTimeField.SetTime( Time( rDT.Hours, rDT.Minutes, + pNewLine->m_aTimeField.SetTime( tools::Time( rDT.Hours, rDT.Minutes, rDT.Seconds, rDT.NanoSeconds ) ); pNewLine->m_aTimeField.m_isUTC = rDT.IsUTC; pNewLine->m_aDateField.m_TZ = aTmpDateTimeTZ.Timezone; @@ -1939,7 +1939,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c else if ( CUSTOM_TYPE_DATETIME == nType ) { Date aTmpDate = pLine->m_aDateField.GetDate(); - Time aTmpTime = pLine->m_aTimeField.GetTime(); + tools::Time aTmpTime = pLine->m_aTimeField.GetTime(); util::DateTime const aDateTime(aTmpTime.GetNanoSec(), aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(), aTmpDate.GetDay(), aTmpDate.GetMonth(), aTmpDate.GetYear(), @@ -2211,7 +2211,7 @@ CmisDateTime::CmisDateTime( vcl::Window* pParent, const util::DateTime& aDateTim m_aDateField->Show( true ); m_aTimeField->Show( true ); m_aDateField->SetDate( Date( aDateTime.Day, aDateTime.Month, aDateTime.Year ) ); - m_aTimeField->SetTime( Time( aDateTime.Hours, aDateTime.Minutes, + m_aTimeField->SetTime( tools::Time( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds ) ); } @@ -2495,7 +2495,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con it != pLine->m_aDateTimes.end(); ++it, ++k) { Date aTmpDate = (*it)->m_aDateField->GetDate(); - Time aTmpTime = (*it)->m_aTimeField->GetTime(); + tools::Time aTmpTime = (*it)->m_aTimeField->GetTime(); util::DateTime aDateTime( aTmpTime.GetNanoSec(), aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(), aTmpDate.GetDay(), aTmpDate.GetMonth(), diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 16788ee79baf..970a5c5f683c 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -95,7 +95,7 @@ SfxVersionTableDtor::SfxVersionTableDtor( const uno::Sequence < util::RevisionTa pInfo->aAuthor = rInfo[n].Author; Date aDate ( rInfo[n].TimeStamp.Day, rInfo[n].TimeStamp.Month, rInfo[n].TimeStamp.Year ); - Time aTime ( rInfo[n].TimeStamp.Hours, rInfo[n].TimeStamp.Minutes, rInfo[n].TimeStamp.Seconds, rInfo[n].TimeStamp.NanoSeconds ); + tools::Time aTime ( rInfo[n].TimeStamp.Hours, rInfo[n].TimeStamp.Minutes, rInfo[n].TimeStamp.Seconds, rInfo[n].TimeStamp.NanoSeconds ); pInfo->aCreationDate = DateTime( aDate, aTime ); aTableList.push_back( pInfo ); @@ -112,7 +112,7 @@ SfxVersionTableDtor::SfxVersionTableDtor( const uno::Sequence < document::CmisVe pInfo->aAuthor = rInfo[n].Author; Date aDate ( rInfo[n].TimeStamp.Day, rInfo[n].TimeStamp.Month, rInfo[n].TimeStamp.Year ); - Time aTime ( rInfo[n].TimeStamp.Hours, rInfo[n].TimeStamp.Minutes, rInfo[n].TimeStamp.Seconds, rInfo[n].TimeStamp.NanoSeconds ); + tools::Time aTime ( rInfo[n].TimeStamp.Hours, rInfo[n].TimeStamp.Minutes, rInfo[n].TimeStamp.Seconds, rInfo[n].TimeStamp.NanoSeconds ); pInfo->aCreationDate = DateTime( aDate, aTime ); aTableList.push_back( pInfo ); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 0eb060b5e307..6f08db6a1b1c 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -967,7 +967,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet) OUString("date"))); } else if (type == ::cppu::UnoType<css::util::Time>::get()) { // #i97029#: replaced by Duration - // Time is supported for backward compatibility with OOo 3.x, x<=2 + // tools::Time is supported for backward compatibility with OOo 3.x, x<=2 css::util::Time ut; any >>= ut; css::util::Duration ud; @@ -2274,7 +2274,7 @@ void SfxDocumentMetaData::createUserDefined() types[ 9] = ::cppu::UnoType<sal_Int16>::get(); types[10] = ::cppu::UnoType<sal_Int32>::get(); types[11] = ::cppu::UnoType<sal_Int64>::get(); - // Time is supported for backward compatibility with OOo 3.x, x<=2 + // tools::Time is supported for backward compatibility with OOo 3.x, x<=2 types[12] = ::cppu::UnoType<css::util::Time>::get(); // #i94175#: ODF allows empty user-defined property names! m_xUserDefined.set( diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a844e2134a82..e48a5cff78f6 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -272,7 +272,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) : m_pInStream(NULL), m_pOutStream(NULL), pOrigFilter( 0 ), - aExpireTime( Date( Date::SYSTEM ) + 10, Time( Time::SYSTEM ) ), + aExpireTime( Date( Date::SYSTEM ) + 10, tools::Time( tools::Time::SYSTEM ) ), pTempFile( NULL ), nLastStorageError( 0 ), m_nSignatureState( SIGNATURESTATE_NOSIGNATURES ) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 330f6b9e1384..de320ed56cf4 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -216,10 +216,10 @@ void SfxObjectShell::UpdateDocInfoForSave() static void -lcl_add(util::Duration & rDur, Time const& rTime) +lcl_add(util::Duration & rDur, tools::Time const& rTime) { // here we don't care about overflow: rDur is converted back to seconds - // anyway, and Time cannot store more than ~4000 hours + // anyway, and tools::Time cannot store more than ~4000 hours rDur.Hours += rTime.GetHour(); rDur.Minutes += rTime.GetMin(); rDur.Seconds += rTime.GetSec(); @@ -236,9 +236,9 @@ void SfxObjectShell::UpdateTime_Impl( // Initialize some local member! Its necessary for wollow operations! DateTime aNow( DateTime::SYSTEM ); // Date and time at current moment - Time n24Time (24,0,0,0) ; // Time-value for 24 hours - see follow calculation + tools::Time n24Time (24,0,0,0) ; // Time-value for 24 hours - see follow calculation sal_uIntPtr nDays = 0 ; // Count of days between now and last editing - Time nAddTime (0) ; // Value to add on aOldTime + tools::Time nAddTime (0) ; // Value to add on aOldTime // Safe impossible cases! // User has changed time to the past between last editing and now ... its not possible!!! @@ -254,7 +254,7 @@ void SfxObjectShell::UpdateTime_Impl( if (nDays==0) { // If no day between now and last editing - calculate time directly. - nAddTime = (const Time&)aNow - (const Time&)pImp->nTime ; + nAddTime = (const tools::Time&)aNow - (const tools::Time&)pImp->nTime ; } else if (nDays<=31) { @@ -265,7 +265,7 @@ void SfxObjectShell::UpdateTime_Impl( // nAddTime = (24h - nTime) + (nDays * 24h) + aNow --nDays; nAddTime = nDays*n24Time.GetTime() ; - nAddTime += n24Time-(const Time&)pImp->nTime ; + nAddTime += n24Time-(const tools::Time&)pImp->nTime ; nAddTime += aNow ; } diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 717dd8bb6f8a..9516e31871cb 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::makeAny; using namespace ::com::sun::star; -#define TIMESTAMP_INVALID_DATETIME ( DateTime ( Date ( 1, 1, 1601 ), Time ( 0, 0, 0 ) ) ) /// Invalid value for date and time to create invalid instance of TimeStamp. +#define TIMESTAMP_INVALID_DATETIME ( DateTime ( Date ( 1, 1, 1601 ), tools::Time ( 0, 0, 0 ) ) ) /// Invalid value for date and time to create invalid instance of TimeStamp. /// Invalid value for date and time to create invalid instance of TimeStamp. #define TIMESTAMP_INVALID_UTILDATETIME (util::DateTime(0, 0, 0, 0, 1, 1, 1601, false)) /// Invalid value for date to create invalid instance of TimeStamp. @@ -592,7 +592,7 @@ void SfxOleFileTimeProperty::ImplSave( SvStream& rStrm ) static_cast< sal_uInt16 >( maDateTime.Day ), static_cast< sal_uInt16 >( maDateTime.Month ), static_cast< sal_uInt16 >( maDateTime.Year ) ), - Time( + tools::Time( static_cast< sal_uIntPtr >( maDateTime.Hours ), static_cast< sal_uIntPtr >( maDateTime.Minutes ), static_cast< sal_uIntPtr >( maDateTime.Seconds ), diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx index 537ca8d36ab1..678acfbec4f7 100644 --- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx +++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx @@ -65,7 +65,7 @@ std::wstring iso8601_date_to_local_date(const std::wstring& isoDate ) else ws8601DateTime = StringToWString( asDateTime ); - //get Time info from structure + //get tools::Time info from structure WCHAR TimeBuffer[ MAX_PATH ]; int TimeSize = GetTimeFormatW( diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 21c3213c3110..c08d45570d80 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -157,11 +157,11 @@ private: animations. */ canvas::tools::ElapsedTime maTimer; - /** Time between the display of frames. Enforced only when mbIsActive + /** tools::Time between the display of frames. Enforced only when mbIsActive is <TRUE/>. */ const double mnFrameDuration; - /** Time (of maTimer) when the next frame shall be displayed. + /** tools::Time (of maTimer) when the next frame shall be displayed. Synchronize() will wait until this time. */ double mnNextFrameTargetTime; @@ -2086,7 +2086,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) // commit frame to screen maScreenUpdater.commitUpdates(); } - // Time held until here + // tools::Time held until here const bool bActivitiesLeft = (! maActivitiesQueue.isEmpty()); const bool bTimerEventsLeft = (! maEventQueue.isEmpty()); diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index a9781b03e94c..ce804988a52c 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::ucb; using namespace ::rtl; bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL, - Date* pDate, Time* pTime ) + Date* pDate, tools::Time* pTime ) { bool bRet = false; try @@ -48,7 +48,7 @@ bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& rURL, if( pDate ) *pDate = Date( pDT->Day, pDT->Month, pDT->Year ); if( pTime ) - *pTime = Time( pDT->Hours, pDT->Minutes, + *pTime = tools::Time( pDT->Hours, pDT->Minutes, pDT->Seconds, pDT->NanoSeconds ); } } diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index c8f25e7b047e..acf89b5f4fb4 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -156,7 +156,7 @@ void ODocumentInfoPreview::insertDateTime( { DateTime aToolsDT( Date(value.Day, value.Month, value.Year), - Time( + tools::Time( value.Hours, value.Minutes, value.Seconds, value.NanoSeconds)); if (aToolsDT.IsValidAndGregorian()) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 40f63fc282de..db9b9c8de25a 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -52,7 +52,7 @@ namespace svt #define CONVERT_DATETIME( aUnoDT, aToolsDT ) \ aToolsDT = ::DateTime( Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ), \ - Time( aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds, aUnoDT.NanoSeconds ) ); + tools::Time( aUnoDT.Hours, aUnoDT.Minutes, aUnoDT.Seconds, aUnoDT.NanoSeconds ) ); using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 7360ccf3b8cd..9c4fc546657c 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2653,14 +2653,14 @@ bool TabBar::SwitchPage( const Point& rPos ) if ( nSwitchId != mnSwitchId ) { mnSwitchId = nSwitchId; - mnSwitchTime = Time::GetSystemTicks(); + mnSwitchTime = tools::Time::GetSystemTicks(); } else { // change only after 500 ms if ( mnSwitchId != GetCurPageId() ) { - if ( Time::GetSystemTicks() > mnSwitchTime+500 ) + if ( tools::Time::GetSystemTicks() > mnSwitchTime+500 ) { mbInSwitching = true; if ( ImplDeactivatePage() ) diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 09c7c8fcf3a3..9a561267149b 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -58,7 +58,7 @@ namespace svt SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate ) { - sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti ); + sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / tools::Time::nanoPerCenti ); _rStorage.WriteUInt16( hundredthSeconds ); _rStorage.WriteUInt16( _rDate.Seconds ); @@ -76,7 +76,7 @@ namespace svt { sal_uInt16 hundredthSeconds; _rStorage.ReadUInt16( hundredthSeconds ); - _rDate.NanoSeconds = static_cast< sal_uInt32 >( hundredthSeconds ) * Time::nanoPerCenti; + _rDate.NanoSeconds = static_cast< sal_uInt32 >( hundredthSeconds ) * tools::Time::nanoPerCenti; _rStorage.ReadUInt16( _rDate.Seconds ); _rStorage.ReadUInt16( _rDate.Minutes ); diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index e7796727f356..bf4021360272 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -2154,7 +2154,7 @@ bool HTMLParser::ParseMetaOptionsImpl( comphelper::string::getTokenCount(aContent, ';') == 2 ) { Date aDate( (sal_uLong)aContent.getToken(0, ';').toInt32() ); - Time aTime( (sal_uLong)aContent.getToken(1, ';').toInt32() ); + tools::Time aTime( (sal_uLong)aContent.getToken(1, ';').toInt32() ); DateTime aDateTime( aDate, aTime ); ::util::DateTime uDT(aDateTime.GetNanoSec(), aDateTime.GetSec(), aDateTime.GetMin(), diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index c3dfd593c6ad..b18b05043d4d 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -76,7 +76,7 @@ namespace svt double lcl_convertTimeToDays( long const i_hours, long const i_minutes, long const i_seconds, long const i_100thSeconds ) { - return Time( i_hours, i_minutes, i_seconds, i_100thSeconds ).GetTimeInDays(); + return tools::Time( i_hours, i_minutes, i_seconds, i_100thSeconds ).GetTimeInDays(); } } @@ -296,7 +296,7 @@ namespace svt // extract UnoTime aTimeValue; - ENSURE_OR_RETURN( i_value >>= aTimeValue, "allowed for Time values only", returnValue ); + ENSURE_OR_RETURN( i_value >>= aTimeValue, "allowed for tools::Time values only", returnValue ); // convert returnValue += lcl_convertTimeToDays( diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 6125f0f3870a..e88c880d6ee3 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -199,8 +199,8 @@ void SvxRedlinTable::UpdateFilterTest() sal_uInt16 nYEAR=aDateMax.GetYear()+100; aDateMax.SetYear(nYEAR); Date aDateMin(1,1,1989); - Time aTMin(0); - Time aTMax(23,59,59); + tools::Time aTMin(0); + tools::Time aTMax(23,59,59); DateTime aDTMin(aDateMin); @@ -257,12 +257,12 @@ void SvxRedlinTable::SetLastDate(const Date& aDate) aDaTiLast.SetDate(aDate.GetDate()); } -void SvxRedlinTable::SetFirstTime(const Time& aTime) +void SvxRedlinTable::SetFirstTime(const tools::Time& aTime) { aDaTiFirst.SetTime(aTime.GetTime()); } -void SvxRedlinTable::SetLastTime(const Time& aTime) +void SvxRedlinTable::SetLastTime(const tools::Time& aTime) { aDaTiLast.SetTime(aTime.GetTime()); } @@ -586,7 +586,7 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent) RowEnableHdl(m_pCbComment); Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); m_pDfDate->SetDate(aDate); m_pTfDate->SetTime(aTime); m_pDfDate2->SetDate(aDate); @@ -681,12 +681,12 @@ void SvxTPFilter::SetFirstDate(const Date &aDate) m_pDfDate->SetDate(aDate); } -Time SvxTPFilter::GetFirstTime() const +tools::Time SvxTPFilter::GetFirstTime() const { return m_pTfDate->GetTime(); } -void SvxTPFilter::SetFirstTime(const Time &aTime) +void SvxTPFilter::SetFirstTime(const tools::Time &aTime) { m_pTfDate->SetTime(aTime); } @@ -702,12 +702,12 @@ void SvxTPFilter::SetLastDate(const Date &aDate) m_pDfDate2->SetDate(aDate); } -Time SvxTPFilter::GetLastTime() const +tools::Time SvxTPFilter::GetLastTime() const { return m_pTfDate2->GetTime(); } -void SvxTPFilter::SetLastTime(const Time &aTime) +void SvxTPFilter::SetLastTime(const tools::Time &aTime) { m_pTfDate2->SetTime(aTime); } @@ -911,7 +911,7 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB ) IMPL_LINK( SvxTPFilter, TimeHdl, ImageButton*,pIB ) { Date aDate( Date::SYSTEM ); - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); if (pIB == m_pIbClock) { m_pDfDate->SetDate(aDate); @@ -1009,7 +1009,7 @@ IMPL_LINK( SvxTPFilter, ModifyDate, void*,pTF) { Date aDate( Date::SYSTEM ); - Time aTime(0); + tools::Time aTime(0); if (m_pDfDate==pTF) { if(m_pDfDate->GetText().isEmpty()) diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 8ecaf4f733d0..83c39b82a2b7 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2355,7 +2355,7 @@ namespace _rField.SetText( sTime ); else { - _rField.SetTime( ::Time( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ) ); + _rField.SetTime( ::tools::Time( aValue.Hours, aValue.Minutes, aValue.Seconds, aValue.NanoSeconds ) ); sTime = _rField.GetText(); } } @@ -2386,7 +2386,7 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel ) util::Time aTime; if ( _rxModel->getPropertyValue( FM_PROP_DATE ) >>= aTime ) - static_cast< TimeField* >( m_pWindow )->SetTime( ::Time( aTime ) ); + static_cast< TimeField* >( m_pWindow )->SetTime( ::tools::Time( aTime ) ); else static_cast< TimeField* >( m_pWindow )->SetText( OUString() ); } diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 3211331fb241..555d7937374e 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -171,7 +171,7 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory) case OBJ_FM_TIMEFIELD: sServiceSpecifier = FM_COMPONENT_TIMEFIELD; - aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( Time( 23, 59, 59, 999999999 ).GetUNOTime() ) ) ); + aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( tools::Time( 23, 59, 59, 999999999 ).GetUNOTime() ) ) ); break; case OBJ_FM_NUMERICFIELD: diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index e63b6f70363e..4eb1b6d1981c 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -576,7 +576,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s static bool bTimesInited(false); static sal_uInt32 nRepeatCount(10L); static double fLastTimes[REMEMBERED_TIMES_COUNT]; - const sal_uInt32 nStartTime(Time::GetSystemTicks()); + const sal_uInt32 nStartTime(tools::Time::GetSystemTicks()); sal_uInt32 count(1L); sal_uInt32 a; @@ -650,7 +650,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, s if(bDoTimerTest) { - const sal_uInt32 nStopTime(Time::GetSystemTicks()); + const sal_uInt32 nStopTime(tools::Time::GetSystemTicks()); const sal_uInt32 nNeededTime(nStopTime - nStartTime); const double fTimePerPaint((double)nNeededTime / (double)nRepeatCount); diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 7932c07cc03a..b0c527af522f 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -45,7 +45,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin virtual OUString GetAuthor() SAL_OVERRIDE; virtual Date GetDate() SAL_OVERRIDE; - virtual Time GetTime() SAL_OVERRIDE; + virtual tools::Time GetTime() SAL_OVERRIDE; virtual sal_uInt32 MoveCaret() SAL_OVERRIDE; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 3944f1b75654..290f8bbc42f9 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -103,7 +103,7 @@ class SwSidebarWin : public vcl::Window virtual OUString GetAuthor() = 0; virtual Date GetDate() = 0; - virtual Time GetTime() = 0; + virtual tools::Time GetTime() = 0; void ExecuteCommand(sal_uInt16 nSlot); void InitControls(); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 250be7f7fe46..a70c885f63dd 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -465,7 +465,7 @@ public: inline const DateTime GetDateTime() const { return aDateTime; } inline const Date GetDate() const { return aDateTime.GetDate(); } - inline const Time GetTime() const { return aDateTime.GetTime(); } + inline const tools::Time GetTime() const { return aDateTime.GetTime(); } /// Author virtual OUString GetPar1() const SAL_OVERRIDE; diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 8593b8d6d86b..2bfbec12cc6f 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -24,7 +24,7 @@ class DateTime; class Date; -class Time; +namespace tools { class Time; } enum SwDateFormat { @@ -115,7 +115,7 @@ public: inline long GetOffset() const { return nOffset; } Date GetDate(bool bUseOffset = false) const; - Time GetTime(bool bUseOffset = false) const; + tools::Time GetTime(bool bUseOffset = false) const; void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 3a0259b62d06..154e35008d1e 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -194,7 +194,7 @@ class SW_DLLPUBLIC Reader OUString aTemplateNm; Date aDStamp; - Time aTStamp; + tools::Time aTStamp; DateTime aChkDateTime; protected: diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index 923a82ffc969..ebe59144f1a0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -566,7 +566,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo81492, "fdo81492.docx") DECLARE_OOXMLEXPORT_TEST(testEditTime, "fdo81341.docx") { /* Issue was LO was not able to Import and Export EditTime in seconds format. - * It was supporting Time in "HH:MM" format. But if DOCX conatins Time in seconds, + * It was supporting tools::Time in "HH:MM" format. But if DOCX conatins tools::Time in seconds, * then LO was not able to display time in "HH:MM:SS" format. * While exporting LO was writing plian text instead of field entry. */ diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 728f349be297..6729812d07f5 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -1289,7 +1289,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN else { nDate = Date( Date::SYSTEM ).GetDate(); - nTime = Time( Time::SYSTEM ).GetTime(); + nTime = tools::Time( tools::Time::SYSTEM ).GetTime(); } sal_uInt16 aTypes[5] = { @@ -1354,7 +1354,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN { bChgd = true; ((SwDateTimeField*)pFmtFld->GetField())->SetDateTime( - DateTime(Date(nDate), Time(nTime)) ); + DateTime(Date(nDate), tools::Time(nTime)) ); } break; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index cdb45d7e3736..2a418333d55e 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1649,7 +1649,7 @@ void SwCompareData::SetRedlinesToDoc( bool bUseDocInfo ) ? xDocProps->getCreationDate() : xDocProps->getModificationDate() ); Date d(uDT.Day, uDT.Month, uDT.Year); - Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime aDT(d,t); if( !aTmp.isEmpty() ) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 178e31d28e1a..37894e7595d4 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -577,7 +577,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) } else if ( pField && pField->ISA(SvxExtTimeField)) { - // Time field + // tools::Time field pInfo->SetRepresentation( ((const SvxExtTimeField*) pField)->GetFormatted( *GetNumberFormatter( true ), LANGUAGE_SYSTEM) ); diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 422f6fd5dc75..f5c4aed0844f 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -240,7 +240,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, DateTime aTmplDate( DateTime::SYSTEM ); { - Time a2Min( 0 ); a2Min.SetMin( 2 ); + tools::Time a2Min( 0 ); a2Min.SetMin( 2 ); aTmplDate += a2Min; } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 0289c2ce7243..23f00f8087ff 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -903,13 +903,13 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, sal_Int32 dur = xDocProps->getEditingDuration(); // If Seconds > 0 then bSec should be TRUE otherwise Seconds // information will be lost if file has EditTime in Seconds format. - aStr = pLocalData->getTime( Time(dur/3600, (dur%3600)/60, dur%60), + aStr = pLocalData->getTime( tools::Time(dur/3600, (dur%3600)/60, dur%60), (dur%60 > 0 ? true : false), false); } else { sal_Int32 dur = xDocProps->getEditingDuration(); - double fVal = Time(dur/3600, (dur%3600)/60, dur%60).GetTimeInDays(); + double fVal = tools::Time(dur/3600, (dur%3600)/60, dur%60).GetTimeInDays(); aStr = ExpandValue(fVal, nFormat, nLang); } break; @@ -938,7 +938,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, OUString aName( xDocProps->getAuthor() ); util::DateTime uDT( xDocProps->getCreationDate() ); Date aD(uDT.Day, uDT.Month, uDT.Year); - Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime aDate(aD,aT); if( nSub == DI_CREATE ) ; // das wars schon!! @@ -947,7 +947,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, aName = xDocProps->getModifiedBy(); uDT = xDocProps->getModificationDate(); Date bD(uDT.Day, uDT.Month, uDT.Year); - Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime bDate(bD,bT); aDate = bDate; } @@ -956,7 +956,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, aName = xDocProps->getPrintedBy(); uDT = xDocProps->getPrintDate(); Date bD(uDT.Day, uDT.Month, uDT.Year); - Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time bT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime bDate(bD,bT); aDate = bDate; } diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index c410395b7d1b..da1be0abef08 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -148,15 +148,15 @@ Date SwDateTimeField::GetDate(bool bUseOffset) const return aDate; } -Time SwDateTimeField::GetTime(bool bUseOffset) const +tools::Time SwDateTimeField::GetTime(bool bUseOffset) const { double fDummy; double fFract = modf(GetValue(), &fDummy); DateTime aDT((long)fDummy, 0); aDT += fFract; if (bUseOffset) - aDT += Time(0, nOffset); - return (Time)aDT; + aDT += tools::Time(0, nOffset); + return (tools::Time)aDT; } bool SwDateTimeField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 263493d129cb..669fb0e6e3c4 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -61,7 +61,7 @@ protected: OUString sBaseURL; // base URL - has to be set at the Readers and Writers SwBlockNames aNames; // Liste aller Bausteine Date aDateModified; // fuers abgleichen bei den Aktionen - Time aTimeModified; + tools::Time aTimeModified; SwDoc* pDoc; // Austauschdokument sal_uInt16 nCur; // aktueller Index bool bReadOnly : 1; diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 1902a01dc0ba..6e1c537c3860 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -114,7 +114,7 @@ void SwLayAction::CheckWaitCrsr() } } -// Time over already? +// tools::Time over already? inline void SwLayAction::CheckIdleEnd() { if ( !IsInput() ) diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index b8a3c6b3967a..77427c508f87 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -87,7 +87,7 @@ short SwImpBlocks::GetFileType( const OUString& rFile ) SwImpBlocks::SwImpBlocks( const OUString& rFile, bool ) : aFile( rFile ), aDateModified( Date::EMPTY ), - aTimeModified( Time::EMPTY ), + aTimeModified( tools::Time::EMPTY ), pDoc( 0 ), nCur( (sal_uInt16)-1 ), bReadOnly( true ), bInPutMuchBlocks( false ), bInfoChanged(false) @@ -193,7 +193,7 @@ void SwImpBlocks::AddName( const OUString& rShort, const OUString& rLong, bool SwImpBlocks::IsFileChanged() const { Date aTempDateModified( aDateModified ); - Time aTempTimeModified( aTimeModified ); + tools::Time aTempTimeModified( aTimeModified ); return FStatHelper::GetModifiedDateTimeOfFile( aFile, &aTempDateModified, &aTempTimeModified ) && ( aDateModified != aTempDateModified || diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 2fa3f5490af9..aeee2a3a7f18 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -240,7 +240,7 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, ::Date( aStamp.Day, aStamp.Month, aStamp.Year ), - ::Time( aStamp.Hours, + ::tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds, aStamp.NanoSeconds )); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 2207df9411cf..b5e3ecd4d417 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1206,7 +1206,7 @@ void makeRedline( SwPaM& rPaM, if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); } SwRedlineExtraData_FormattingChanges* pRedlineExtraData = NULL; @@ -1328,7 +1328,7 @@ void makeTableRowRedline( SwTableLine& rTableLine, if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); } SwTableRowRedline* pRedline = new SwTableRowRedline( aRedlineData, rTableLine ); @@ -1385,7 +1385,7 @@ void makeTableCellRedline( SwTableBox& rTableBox, if( aDateTimeValue >>= aStamp ) { aRedlineData.SetTimeStamp( - DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); + DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), tools::Time( aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) ); } SwTableCellRedline* pRedline = new SwTableCellRedline( aRedlineData, rTableBox ); diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 9c7898f93037..497d11c3015f 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -426,7 +426,7 @@ SwReader::SwReader( const uno::Reference < embed::XStorage > &rStg, const OUStri Reader::Reader() : pTemplate(0), aDStamp( Date::EMPTY ), - aTStamp( Time::EMPTY ), + aTStamp( tools::Time::EMPTY ), aChkDateTime( DateTime::EMPTY ), pStrm(0), pMedium(0), bInsertMode(false), bTmplBrowseMode(false), bReadUTF8(false), bBlockMode(false), bOrganizerMode(false), @@ -467,7 +467,7 @@ SwDoc* Reader::GetTemplateDoc() if( !pTemplate || aCurrDateTime >= aChkDateTime ) { Date aTstDate( Date::EMPTY ); - Time aTstTime( Time::EMPTY ); + tools::Time aTstTime( tools::Time::EMPTY ); if( FStatHelper::GetModifiedDateTimeOfFile( aTDir.GetMainURL( INetURLObject::NO_DECODE ), &aTstDate, &aTstTime ) && @@ -480,7 +480,7 @@ SwDoc* Reader::GetTemplateDoc() // only one minute later check if it has changed aChkDateTime = aCurrDateTime; - aChkDateTime += Time( 0L, 1L ); + aChkDateTime += tools::Time( 0L, 1L ); } if( bLoad ) diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 079f4792104d..d41a69f92db3 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -325,7 +325,7 @@ void SwHTMLParser::NewField() case RES_TIMEFLD: { sal_uLong nNumFmt = 0; - sal_Int64 nTime = Time( Time::SYSTEM ).GetTime(); + sal_Int64 nTime = tools::Time( tools::Time::SYSTEM ).GetTime(); sal_Int32 nDate = Date( Date::SYSTEM ).GetDate(); sal_uInt16 nSub = 0; bool bValidFmt = false; @@ -371,7 +371,7 @@ void SwHTMLParser::NewField() nSub, nNumFmt ); if (nSub & FIXEDFLD) - ((SwDateTimeField *)pFld)->SetDateTime( DateTime(Date(nDate), Time(nTime)) ); + ((SwDateTimeField *)pFld)->SetDateTime( DateTime(Date(nDate), tools::Time(nTime)) ); } break; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index a8d89f0ac326..eeda7ee6d2da 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -386,15 +386,15 @@ static void WriteDop( WW8Export& rWrt ) { ::util::DateTime uDT = xDocProps->getCreationDate(); Date aD(uDT.Day, uDT.Month, uDT.Year); - Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); rDop.dttmCreated = sw::ms::DateTime2DTTM(DateTime(aD,aT)); uDT = xDocProps->getModificationDate(); Date aD2(uDT.Day, uDT.Month, uDT.Year); - Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT2(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); rDop.dttmRevised = sw::ms::DateTime2DTTM(DateTime(aD2,aT2)); uDT = xDocProps->getPrintDate(); Date aD3(uDT.Day, uDT.Month, uDT.Year); - Time aT3(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); + tools::Time aT3(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); rDop.dttmLastPrint = sw::ms::DateTime2DTTM(DateTime(aD3,aT3)); } diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 403906adba7d..2c58a9b927da 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -308,7 +308,7 @@ Date SwAnnotationWin::GetDate() return mpFld->GetDate(); } -Time SwAnnotationWin::GetTime() +tools::Time SwAnnotationWin::GetTime() { return mpFld->GetTime(); } diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 855c80ff002b..13d5af0bcc78 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -345,7 +345,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) aWin.Bottom() -= nMargin; if(!aWin.IsInside(aPixPt)) { static sal_uLong last_tick = 0; - sal_uLong current_tick = Time::GetSystemTicks(); + sal_uLong current_tick = tools::Time::GetSystemTicks(); if((current_tick-last_tick) > 500) { last_tick = current_tick; if(!m_bOldIdleSet) { diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index b2363d593415..fc2a2daef1ad 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -574,7 +574,7 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll) IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) { - Time aSyntaxCheckStart( Time::SYSTEM ); + tools::Time aSyntaxCheckStart( tools::Time::SYSTEM ); SAL_WARN_IF(pTextView == 0, "sw", "No View yet, but syntax highlighting?!"); bHighlighting = true; @@ -596,7 +596,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) nCount++; if(aSyntaxLineTable.empty()) break; - if((Time( Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime()) > MAX_HIGHLIGHTTIME ) + if((tools::Time( tools::Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime()) > MAX_HIGHLIGHTTIME ) { pTimer->SetTimeout( 2 * SYNTAX_HIGHLIGHT_TIMEOUT ); break; @@ -611,7 +611,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer ) DoSyntaxHighlight( nLine ); aSyntaxLineTable.erase(nLine); nCount ++; - if(Time( Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime() > MAX_HIGHLIGHTTIME) + if(tools::Time( tools::Time::SYSTEM ).GetTime() - aSyntaxCheckStart.GetTime() > MAX_HIGHLIGHTTIME) { pTimer->SetTimeout( 2 * SYNTAX_HIGHLIGHT_TIMEOUT ); break; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 8ad026f328b7..160fb15395bd 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1670,7 +1670,7 @@ sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberF fValue = aDate - *pNullDate; - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); sal_uLong nNumFmtTime = (sal_uLong)aTime.GetSec() + (sal_uLong)aTime.GetMin() * 60L + (sal_uLong)aTime.GetHour() * 3600L; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index be64e34366ae..026f42c1fcd7 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -3717,7 +3717,7 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT ); ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), false ); - // re-calc the Time property + // re-calc the tools::Time property uno::Reference < awt::XTimeField > xField( getPeer(), uno::UNO_QUERY ); uno::Any aValue; if ( !xField->isEmpty() ) diff --git a/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx index 3056bf89947b..667eef6efc56 100644 --- a/tools/source/datetime/datetime.cxx +++ b/tools/source/datetime/datetime.cxx @@ -30,7 +30,7 @@ bool DateTime::IsBetween( const DateTime& rFrom, const DateTime& rTo ) const bool DateTime::operator >( const DateTime& rDateTime ) const { if ( (Date::operator>( rDateTime )) || - (Date::operator==( rDateTime ) && Time::operator>( rDateTime )) ) + (Date::operator==( rDateTime ) && tools::Time::operator>( rDateTime )) ) return true; else return false; @@ -39,7 +39,7 @@ bool DateTime::operator >( const DateTime& rDateTime ) const bool DateTime::operator <( const DateTime& rDateTime ) const { if ( (Date::operator<( rDateTime )) || - (Date::operator==( rDateTime ) && Time::operator<( rDateTime )) ) + (Date::operator==( rDateTime ) && tools::Time::operator<( rDateTime )) ) return true; else return false; @@ -48,7 +48,7 @@ bool DateTime::operator <( const DateTime& rDateTime ) const bool DateTime::operator >=( const DateTime& rDateTime ) const { if ( (Date::operator>( rDateTime )) || - (Date::operator==( rDateTime ) && Time::operator>=( rDateTime )) ) + (Date::operator==( rDateTime ) && tools::Time::operator>=( rDateTime )) ) return true; else return false; @@ -57,7 +57,7 @@ bool DateTime::operator >=( const DateTime& rDateTime ) const bool DateTime::operator <=( const DateTime& rDateTime ) const { if ( (Date::operator<( rDateTime )) || - (Date::operator==( rDateTime ) && Time::operator<=( rDateTime )) ) + (Date::operator==( rDateTime ) && tools::Time::operator<=( rDateTime )) ) return true; else return false; @@ -78,9 +78,9 @@ long DateTime::GetSecFromDateTime( const Date& rDate ) const } } -DateTime& DateTime::operator +=( const Time& rTime ) +DateTime& DateTime::operator +=( const tools::Time& rTime ) { - Time aTime = *this; + tools::Time aTime = *this; aTime += rTime; sal_uInt16 nHours = aTime.GetHour(); if ( aTime.GetTime() > 0 ) @@ -102,14 +102,14 @@ DateTime& DateTime::operator +=( const Time& rTime ) Date::operator--(); aTime = Time( 24, 0, 0 )+aTime; } - Time::operator=( aTime ); + tools::Time::operator=( aTime ); return *this; } -DateTime& DateTime::operator -=( const Time& rTime ) +DateTime& DateTime::operator -=( const tools::Time& rTime ) { - Time aTime = *this; + tools::Time aTime = *this; aTime -= rTime; sal_uInt16 nHours = aTime.GetHour(); if ( aTime.GetTime() > 0 ) @@ -131,7 +131,7 @@ DateTime& DateTime::operator -=( const Time& rTime ) Date::operator--(); aTime = Time( 24, 0, 0 )+aTime; } - Time::operator=( aTime ); + tools::Time::operator=( aTime ); return *this; } @@ -150,14 +150,14 @@ DateTime operator -( const DateTime& rDateTime, long nDays ) return aDateTime; } -DateTime operator +( const DateTime& rDateTime, const Time& rTime ) +DateTime operator +( const DateTime& rDateTime, const tools::Time& rTime ) { DateTime aDateTime( rDateTime ); aDateTime += rTime; return aDateTime; } -DateTime operator -( const DateTime& rDateTime, const Time& rTime ) +DateTime operator -( const DateTime& rDateTime, const tools::Time& rTime ) { DateTime aDateTime( rDateTime ); aDateTime -= rTime; @@ -180,8 +180,8 @@ DateTime& DateTime::operator +=( double fTimeInDays ) Date::operator+=( long(fInt) ); // full days if ( fFrac ) { - Time aTime(0); // default ctor calls system time, we don't need that - fFrac *= ::Time::nanoSecPerDay; // time expressed in nanoseconds + tools::Time aTime(0); // default ctor calls system time, we don't need that + fFrac *= ::tools::Time::nanoSecPerDay; // time expressed in nanoseconds aTime.MakeTimeFromNS( static_cast<sal_Int64>(fFrac) ); // method handles negative ns operator+=( aTime ); } @@ -202,7 +202,7 @@ double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 ) if ( nTime ) { double fTime = double(nTime); - fTime /= ::Time::nanoSecPerDay; // convert from nanoseconds to fraction + fTime /= ::tools::Time::nanoSecPerDay; // convert from nanoseconds to fraction if ( nDays < 0 && fTime > 0.0 ) fTime = 1.0 - fTime; return double(nDays) + fTime; @@ -259,7 +259,7 @@ DateTime DateTime::CreateFromWin32FileDateTime( const sal_uInt32 & rLower, const Date _aDate( (sal_uInt16)( nDays + 1 ), nMonths, sal::static_int_cast< sal_uInt16 >(nYears + 1601) ); - Time _aTime( sal_uIntPtr( ( aTime / ( a100nPerSecond * 60 * 60 ) ) % sal_Int64( 24 ) ), + tools::Time _aTime( sal_uIntPtr( ( aTime / ( a100nPerSecond * 60 * 60 ) ) % sal_Int64( 24 ) ), sal_uIntPtr( ( aTime / ( a100nPerSecond * 60 ) ) % sal_Int64( 60 ) ), sal_uIntPtr( ( aTime / ( a100nPerSecond ) ) % sal_Int64( 60 ) ), (aTime % a100nPerSecond) * 100 ); diff --git a/tools/source/datetime/datetimeutils.cxx b/tools/source/datetime/datetimeutils.cxx index 417271c60eee..cc34d8e316e2 100644 --- a/tools/source/datetime/datetimeutils.cxx +++ b/tools/source/datetime/datetimeutils.cxx @@ -57,7 +57,7 @@ OString DateTimeToOString( const DateTime& rDateTime ) OString DateToOString( const Date& rDate ) { - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); return DateTimeToOString( DateTime( rDate, aTime ) ); } diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx index 66d16b4ce059..d5b83a3ad7de 100644 --- a/tools/source/datetime/ttime.cxx +++ b/tools/source/datetime/ttime.cxx @@ -49,7 +49,7 @@ namespace { const sal_Int16 secInMin = 60; const sal_Int16 minInHour = 60; - sal_Int64 TimeToNanoSec( const Time& rTime ) + sal_Int64 TimeToNanoSec( const tools::Time& rTime ) { short nSign = (rTime.GetTime() >= 0) ? +1 : -1; sal_Int32 nHour = rTime.GetHour(); @@ -65,7 +65,7 @@ namespace { return (nRet * nSign); } - Time NanoSecToTime( sal_Int64 nNanoSec ) + tools::Time NanoSecToTime( sal_Int64 nNanoSec ) { short nSign; if ( nNanoSec < 0 ) @@ -76,13 +76,15 @@ namespace { else nSign = 1; - Time aTime( 0, 0, 0, nNanoSec ); + tools::Time aTime( 0, 0, 0, nNanoSec ); aTime.SetTime( aTime.GetTime() * nSign ); return aTime; } } // anonymous namespace +namespace tools { + Time::Time( TimeInitSystem ) { #if defined( WNT ) @@ -133,7 +135,7 @@ Time::Time( TimeInitSystem ) #endif // WNT } -Time::Time( const Time& rTime ) +Time::Time( const tools::Time& rTime ) { nTime = rTime.nTime; } @@ -146,7 +148,7 @@ Time::Time( const ::com::sun::star::util::Time &_rTime ) { init(_rTime.Hours, _rTime.Minutes, _rTime.Seconds, _rTime.NanoSeconds); } -void Time::init( sal_uInt32 nHour, sal_uInt32 nMin, sal_uInt32 nSec, sal_uInt64 nNanoSec ) +void tools::Time::init( sal_uInt32 nHour, sal_uInt32 nMin, sal_uInt32 nSec, sal_uInt64 nNanoSec ) { // normalize time nSec += nNanoSec / nanoSecInSec; @@ -163,7 +165,7 @@ void Time::init( sal_uInt32 nHour, sal_uInt32 nMin, sal_uInt32 nSec, sal_uInt64 nHour * hourMask; } -void Time::SetHour( sal_uInt16 nNewHour ) +void tools::Time::SetHour( sal_uInt16 nNewHour ) { short nSign = (nTime >= 0) ? +1 : -1; sal_Int32 nMin = GetMin(); @@ -177,7 +179,7 @@ void Time::SetHour( sal_uInt16 nNewHour ) nNewHour * hourMask ); } -void Time::SetMin( sal_uInt16 nNewMin ) +void tools::Time::SetMin( sal_uInt16 nNewMin ) { short nSign = (nTime >= 0) ? +1 : -1; sal_Int32 nHour = GetHour(); @@ -194,7 +196,7 @@ void Time::SetMin( sal_uInt16 nNewMin ) nHour * hourMask ); } -void Time::SetSec( sal_uInt16 nNewSec ) +void tools::Time::SetSec( sal_uInt16 nNewSec ) { short nSign = (nTime >= 0) ? +1 : -1; sal_Int32 nHour = GetHour(); @@ -211,7 +213,7 @@ void Time::SetSec( sal_uInt16 nNewSec ) nHour * hourMask ); } -void Time::SetNanoSec( sal_uInt32 nNewNanoSec ) +void tools::Time::SetNanoSec( sal_uInt32 nNewNanoSec ) { short nSign = (nTime >= 0) ? +1 : -1; sal_Int32 nHour = GetHour(); @@ -228,7 +230,7 @@ void Time::SetNanoSec( sal_uInt32 nNewNanoSec ) nHour * hourMask ); } -sal_Int64 Time::GetNSFromTime() const +sal_Int64 tools::Time::GetNSFromTime() const { short nSign = (nTime >= 0) ? +1 : -1; sal_Int32 nHour = GetHour(); @@ -243,7 +245,7 @@ sal_Int64 Time::GetNSFromTime() const nHour * (minInHour * secInMin * nanoSecInSec) ); } -void Time::MakeTimeFromNS( sal_Int64 nNS ) +void tools::Time::MakeTimeFromNS( sal_Int64 nNS ) { short nSign; if ( nNS < 0 ) @@ -255,11 +257,11 @@ void Time::MakeTimeFromNS( sal_Int64 nNS ) nSign = 1; // avoid overflow when sal_uIntPtr is 32 bits - Time aTime( 0, 0, nNS/nanoSecInSec, nNS % nanoSecInSec ); + tools::Time aTime( 0, 0, nNS/nanoSecInSec, nNS % nanoSecInSec ); SetTime( aTime.GetTime() * nSign ); } -sal_Int32 Time::GetMSFromTime() const +sal_Int32 tools::Time::GetMSFromTime() const { short nSign = (nTime >= 0) ? +1 : -1; sal_Int32 nHour = GetHour(); @@ -274,7 +276,7 @@ sal_Int32 Time::GetMSFromTime() const nHour * 360000 ); } -void Time::MakeTimeFromMS( sal_Int32 nMS ) +void tools::Time::MakeTimeFromMS( sal_Int32 nMS ) { short nSign; if ( nMS < 0 ) @@ -286,11 +288,11 @@ void Time::MakeTimeFromMS( sal_Int32 nMS ) nSign = 1; // avoid overflow when sal_uIntPtr is 32 bits - Time aTime( 0, 0, nMS/1000, (nMS % 1000) * 1000000 ); + tools::Time aTime( 0, 0, nMS/1000, (nMS % 1000) * 1000000 ); SetTime( aTime.GetTime() * nSign ); } -double Time::GetTimeInDays() const +double tools::Time::GetTimeInDays() const { short nSign = (nTime >= 0) ? +1 : -1; double nHour = GetHour(); @@ -301,46 +303,46 @@ double Time::GetTimeInDays() const return (nHour + (nMin / 60) + (nSec / (minInHour * secInMin)) + (nNanoSec / (minInHour * secInMin * nanoSecInSec))) / 24 * nSign; } -Time& Time::operator =( const Time& rTime ) +Time& tools::Time::operator =( const tools::Time& rTime ) { nTime = rTime.nTime; return *this; } -Time& Time::operator +=( const Time& rTime ) +Time& tools::Time::operator +=( const tools::Time& rTime ) { nTime = NanoSecToTime( TimeToNanoSec( *this ) + TimeToNanoSec( rTime ) ).GetTime(); return *this; } -Time& Time::operator -=( const Time& rTime ) +Time& tools::Time::operator -=( const tools::Time& rTime ) { nTime = NanoSecToTime( TimeToNanoSec( *this ) - TimeToNanoSec( rTime ) ).GetTime(); return *this; } -Time operator +( const Time& rTime1, const Time& rTime2 ) +Time operator +( const tools::Time& rTime1, const tools::Time& rTime2 ) { return NanoSecToTime( TimeToNanoSec( rTime1 ) + TimeToNanoSec( rTime2 ) ); } -Time operator -( const Time& rTime1, const Time& rTime2 ) +Time operator -( const tools::Time& rTime1, const tools::Time& rTime2 ) { return NanoSecToTime( TimeToNanoSec( rTime1 ) - TimeToNanoSec( rTime2 ) ); } -bool Time::IsEqualIgnoreNanoSec( const Time& rTime ) const +bool tools::Time::IsEqualIgnoreNanoSec( const tools::Time& rTime ) const { sal_Int32 n1 = (nTime < 0 ? -static_cast<sal_Int32>(GetNanoSec()) : GetNanoSec() ); sal_Int32 n2 = (rTime.nTime < 0 ? -static_cast<sal_Int32>(rTime.GetNanoSec()) : rTime.GetNanoSec() ); return (nTime - n1) == (rTime.nTime - n2); } -Time Time::GetUTCOffset() +Time tools::Time::GetUTCOffset() { #if defined( WNT ) TIME_ZONE_INFORMATION aTimeZone; @@ -351,14 +353,14 @@ Time Time::GetUTCOffset() nTempTime += aTimeZone.StandardBias; else if ( nTimeZoneRet == TIME_ZONE_ID_DAYLIGHT ) nTempTime += aTimeZone.DaylightBias; - Time aTime( 0, (sal_uInt16)abs( nTempTime ) ); + tools::Time aTime( 0, (sal_uInt16)abs( nTempTime ) ); if ( nTempTime > 0 ) aTime = -aTime; return aTime; #else static sal_uIntPtr nCacheTicks = 0; static sal_Int32 nCacheSecOffset = -1; - sal_uIntPtr nTicks = Time::GetSystemTicks(); + sal_uIntPtr nTicks = tools::Time::GetSystemTicks(); time_t nTime; tm aTM; sal_Int32 nLocalTime; @@ -390,14 +392,14 @@ Time Time::GetUTCOffset() } nTempTime = abs( nCacheSecOffset ); - Time aTime( 0, (sal_uInt16)nTempTime ); + tools::Time aTime( 0, (sal_uInt16)nTempTime ); if ( nCacheSecOffset < 0 ) aTime = -aTime; return aTime; #endif } -sal_uIntPtr Time::GetSystemTicks() +sal_uIntPtr tools::Time::GetSystemTicks() { #if defined WNT static LARGE_INTEGER nTicksPerSecond; @@ -425,4 +427,6 @@ sal_uIntPtr Time::GetSystemTicks() #endif } +} /* namespace tools */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 01b753cf9f8a..3a527124587d 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -224,7 +224,7 @@ INetRFC822Message::~INetRFC822Message() /* ParseDateField and local helper functions. * - * Parses a String in (implied) GMT format into class Date and Time objects. + * Parses a String in (implied) GMT format into class Date and tools::Time objects. * Four formats are accepted: * * [Wkd,] 1*2DIGIT Mon 2*4DIGIT 00:00:00 [GMT] (rfc1123) @@ -335,7 +335,7 @@ bool INetRFC822Message::ParseDateField ( sal_uInt16 nOffset = ParseNumber (aDateField, nIndex); if (nOffset > 0) { - Time aDiff( Time::EMPTY ); + tools::Time aDiff( tools::Time::EMPTY ); aDiff.SetHour (nOffset / 100); aDiff.SetMin (nOffset % 100); aDiff.SetSec (0); @@ -352,7 +352,7 @@ bool INetRFC822Message::ParseDateField ( else if (comphelper::string::isdigitAsciiString(aDateField)) { // Format: delta seconds. - Time aDelta (0); + tools::Time aDelta (0); aDelta.SetTime (aDateField.toInt32() * 100); DateTime aNow( DateTime::SYSTEM ); @@ -977,7 +977,7 @@ bool INetMIMEMessage::EnableAttachChild (INetMessageContainerType eType) { // Generate a unique boundary from current time. sal_Char sTail[16 + 1]; - Time aCurTime( Time::SYSTEM ); + tools::Time aCurTime( tools::Time::SYSTEM ); sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32; sprintf (sTail, "%08X%08X", diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 5700f151ee46..a4bd8f269e18 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -39,6 +39,8 @@ void Resource::GetRes( const ResId& rResId ) IncrementRes( sizeof( RSHEADER_TYPE ) ); } +namespace tools { + Time::Time( const ResId& rResId ) { nTime = 0; @@ -59,9 +61,11 @@ Time::Time( const ResId& rResId ) // TODO: when we change the place that writes this binary resource format to match: // SetNanoSec( pResMgr->ReadLong() ); // In the meantime: - SetNanoSec( pResMgr->ReadShort() * ::Time::nanoPerCenti ); + SetNanoSec( pResMgr->ReadShort() * ::tools::Time::nanoPerCenti ); } +} /* namespace tools */ + Date::Date( const ResId& rResId ) : nDate(0) { rResId.SetRT( RSC_DATE ); diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index d8b38bac5fbc..335bdd8c3777 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -951,7 +951,7 @@ void UcbContent::open( const OUString & rName, const OUString& rInput, ULONG nTime = 0; if ( bTiming ) - nTime = Time::GetSystemTicks(); + nTime = tools::Time::GetSystemTicks(); uno::Any aResult = executeCommand( rName, aArg, bPrint ); @@ -1122,7 +1122,7 @@ void UcbContent::open( const OUString & rName, const OUString& rInput, if ( bTiming ) { - nTime = Time::GetSystemTicks() - nTime; + nTime = tools::Time::GetSystemTicks() - nTime; OUString aText = "Operation took " + OUString::number(nTime) + " ms."; print( aText ); } @@ -1134,7 +1134,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, { ULONG nTime = 0; if ( bTiming ) - nTime = Time::GetSystemTicks(); + nTime = tools::Time::GetSystemTicks(); OpenStack aStack; aStack.push( OpenStackEntry( m_xContent, 0 ) ); @@ -1197,7 +1197,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, if ( bTiming ) { - nTime = Time::GetSystemTicks() - nTime; + nTime = tools::Time::GetSystemTicks() - nTime; OUString aText = "Operation took " + OUString::number(nTime) + " ms."; print( aText ); } diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index 15e14a719f98..436c6dde2637 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -133,7 +133,7 @@ void FiltersTest::testDir(const OUString &rFilter, unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int nFilterVersion, bool bExport) { - fprintf(stderr, "File tested,Test Result,Execution Time (ms)\n"); + fprintf(stderr, "File tested,Test Result,Execution tools::Time (ms)\n"); recursiveScan(test::pass, rFilter, rURL + "pass", rUserData, nFilterFlags, nClipboardID, nFilterVersion, bExport); diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 14f118703b77..e0661175168c 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1331,7 +1331,7 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const return OUString(aBuf, pBuf-aBuf); } -OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec ) const +OUString LocaleDataWrapper::getTime( const tools::Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); //!TODO: leading zeros et al @@ -1403,13 +1403,13 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa return aStr; } -OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100Sec ) const +OUString LocaleDataWrapper::getDuration( const tools::Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[128]; sal_Unicode* pBuf = aBuf; - if ( rTime < Time( 0 ) ) + if ( rTime < tools::Time( 0 ) ) pBuf = ImplAddString( pBuf, ' ' ); if ( true /* IsTimeLeadingZero() */ ) diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index a8065287d90c..559cb3f9fa0d 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -205,7 +205,7 @@ void typeConvert(const DateTime& _rDateTime, css::util::DateTime& _rOut) void typeConvert(const css::util::DateTime& _rDateTime, DateTime& _rOut) { Date aDate(_rDateTime.Day, _rDateTime.Month, _rDateTime.Year); - Time aTime(_rDateTime.Hours, _rDateTime.Minutes, _rDateTime.Seconds, _rDateTime.NanoSeconds); + tools::Time aTime(_rDateTime.Hours, _rDateTime.Minutes, _rDateTime.Seconds, _rDateTime.NanoSeconds); _rOut = DateTime(aDate, aTime); } @@ -338,7 +338,7 @@ bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate) return bSuccess; } -/** convert ISO8601 Time String to util::Time */ +/** convert ISO8601 tools::Time String to util::Time */ bool ISO8601parseTime(const OUString &aTimeStr, css::util::Time& rTime) { bool bSuccess = true; diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 9b8d3b518cac..8acc2e48b5ab 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -210,7 +210,7 @@ public: osl::MutexGuard g(osl::Mutex::getGlobalMutex()); globalValue = ((globalValue == SAL_MAX_UINT32 - ? Time::GetSystemTicks() : globalValue + 1) + ? tools::Time::GetSystemTicks() : globalValue + 1) % max); v = globalValue; } diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index b0254ed8950c..407adadbdf7a 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -122,7 +122,7 @@ OUString getCasePreservingUrl(const INetURLObject& url) { DateTime convert(css::util::DateTime const & dt) { return DateTime( Date(dt.Day, dt.Month, dt.Year), - Time(dt.Hours, dt.Minutes, dt.Seconds, dt.NanoSeconds)); + tools::Time(dt.Hours, dt.Minutes, dt.Seconds, dt.NanoSeconds)); } } diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 4925d34064dc..17eef02621ea 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -111,10 +111,10 @@ getLocalizedDatTimeStr( { OUString aDateTimeStr; Date aDate( Date::EMPTY ); - Time aTime( Time::EMPTY ); + tools::Time aTime( tools::Time::EMPTY ); aDate = Date( rDateTime.Day, rDateTime.Month, rDateTime.Year ); - aTime = Time( rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds ); + aTime = tools::Time( rDateTime.Hours, rDateTime.Minutes, rDateTime.Seconds ); LanguageType eUILang = Application::GetSettings().GetUILanguageTag().getLanguageType(); SvNumberFormatter *pNumberFormatter = new SvNumberFormatter( xContext, eUILang ); diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 7110e7cf89cc..8dfe505fb47d 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -74,7 +74,7 @@ public: static double GetNow() { Date aDateNow( Date::SYSTEM ); - Time aTimeNow( Time::SYSTEM ); + tools::Time aTimeNow( tools::Time::SYSTEM ); Date aRefDate( 1,1,1900 ); long nDiffDays = (long)(aDateNow - aRefDate); nDiffDays += 2; // Change VisualBasic: 1.Jan.1900 == 2 diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 075cf79503fe..5f0e8941f710 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -276,7 +276,7 @@ protected: bool m_bUseRandRWrapper; // don't use randr on gtk, use gdk signals there - mutable XLIB_Time m_nLastUserEventTime; // mutable because changed on first access + mutable Time m_nLastUserEventTime; // mutable because changed on first access virtual bool Dispatch( XEvent *pEvent ) = 0; void InitXinerama(); @@ -353,7 +353,7 @@ public: const Pair &GetResolution() const { return aResolution_; } sal_uLong GetProperties() const { return PROPERTY_DEFAULT; } sal_uLong GetMaxRequestSize() const { return nMaxRequestSize_; } - XLIB_Time GetLastUserEventTime( bool bAlwaysReget = false ) const; + Time GetLastUserEventTime( bool bAlwaysReget = false ) const; bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const; SalXLib* GetXLib() const { return pXLib_; } diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index d85363a7aad8..637ef677a221 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -76,7 +76,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame X11SalGraphics *pGraphics_; // current frame graphics X11SalGraphics *pFreeGraphics_; // first free frame graphics - XLIB_Time nReleaseTime_; // timestamp of last key release + Time nReleaseTime_; // timestamp of last key release sal_uInt16 nKeyCode_; // last key code sal_uInt16 nKeyState_; // last key state int nCompose_; // compose state diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 9b29b001e2f1..85b452817549 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -685,7 +685,7 @@ void DbgDialogTest( vcl::Window* pWindow ) else if ( pChild->GetType() == WINDOW_TIMEFIELD ) { TimeField* pField = static_cast<TimeField*>(pChild); - if ( pField->GetMax() == Time( 23, 59, 59, 99 ) ) + if ( pField->GetMax() == tools::Time( 23, 59, 59, 99 ) ) bMaxWarning = true; } else if ( pChild->GetType() == WINDOW_DATEFIELD ) @@ -715,7 +715,7 @@ void DbgDialogTest( vcl::Window* pWindow ) else if ( pChild->GetType() == WINDOW_TIMEBOX ) { TimeBox* pBox = static_cast<TimeBox*>(pChild); - if ( pBox->GetMax() == Time( 23, 59, 59, 99 ) ) + if ( pBox->GetMax() == tools::Time( 23, 59, 59, 99 ) ) bMaxWarning = true; } else if ( pChild->GetType() == WINDOW_DATEBOX ) diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 5d0b1e382f01..1e44c4522b99 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -235,7 +235,7 @@ void Help::HideTip( sal_uLong nId ) // trigger update, so that a Paint is instantly triggered since we do not save the background pFrameWindow->ImplUpdateAll(); delete pHelpWin; - ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks(); + ImplGetSVData()->maHelpData.mnLastHelpHideTime = tools::Time::GetSystemTicks(); } HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : @@ -517,7 +517,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, sal_uIn if (!pHelpWin && !rHelpText.isEmpty()) { - sal_uLong nCurTime = Time::GetSystemTicks(); + sal_uLong nCurTime = tools::Time::GetSystemTicks(); if ( ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) < pParent->GetSettings().GetHelpSettings().GetTipDelay() ) || ( ( nStyle & QUICKHELP_NO_DELAY ) != 0 ) ) @@ -557,7 +557,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) pHelpWin->Hide(); delete pHelpWin; if( bUpdateHideTime ) - pSVData->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks(); + pSVData->maHelpData.mnLastHelpHideTime = tools::Time::GetSystemTicks(); } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e5640c7a7f94..2798d3fdcf3f 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -453,7 +453,7 @@ bool Application::AnyInput( sal_uInt16 nType ) sal_uLong Application::GetLastInputInterval() { - return (Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime); + return (tools::Time::GetSystemTicks()-ImplGetSVData()->maAppData.mnLastInputTime); } extern int nImplSysDialog; diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 703f7e81f03d..ecbfa7467cdc 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -92,7 +92,7 @@ void Timer::ImplTimerCallbackProc() ImplTimerData* pPrevTimerData; sal_uLong nMinPeriod = MAX_TIMER_PERIOD; sal_uLong nDeltaTime; - sal_uLong nTime = Time::GetSystemTicks(); + sal_uLong nTime = tools::Time::GetSystemTicks(); if ( pSVData->mbNoCallTimer ) return; @@ -133,7 +133,7 @@ void Timer::ImplTimerCallbackProc() } // determine new time - sal_uLong nNewTime = Time::GetSystemTicks(); + sal_uLong nNewTime = tools::Time::GetSystemTicks(); pPrevTimerData = NULL; pTimerData = pSVData->mpFirstTimerData; while ( pTimerData ) @@ -263,7 +263,7 @@ void Timer::Start() // insert timer and start mpTimerData = new ImplTimerData; mpTimerData->mpTimer = this; - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnUpdateTime = tools::Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; mpTimerData->mbDelete = false; mpTimerData->mbInTimeout = false; @@ -291,7 +291,7 @@ void Timer::Start() } else { - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnUpdateTime = tools::Time::GetSystemTicks(); mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; mpTimerData->mbDelete = false; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 4dd7e8568336..fbc74e3bfb39 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2053,7 +2053,7 @@ static bool ImplCutTimePortion( OUStringBuffer& _rStr, sal_Int32 _nSepPos, bool return true; } -static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, +static bool ImplTimeGetValue( const OUString& rStr, tools::Time& rTime, TimeFieldFormat eFormat, bool bDuration, const LocaleDataWrapper& rLocaleDataWrapper, bool _bSkipInvalidCharacters = true ) { @@ -2062,7 +2062,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, short nMinute = 0; short nSecond = 0; sal_Int64 nNanoSec = 0; - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( rStr.isEmpty() ) return false; @@ -2220,7 +2220,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, if ( (nHour == 12) && ( ( aUpperCaseStr.indexOf( aAM ) >= 0 ) || ( aUpperCaseStr.indexOf( aAM2 ) >= 0 ) ) ) nHour = 0; - aTime = Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, + aTime = tools::Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, (sal_uInt32)nNanoSec ); } else @@ -2238,7 +2238,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, nNanoSec = nNanoSec < 0 ? -nNanoSec : nNanoSec; } - aTime = Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, + aTime = tools::Time( (sal_uInt16)nHour, (sal_uInt16)nMinute, (sal_uInt16)nSecond, (sal_uInt32)nNanoSec ); if ( bNegative ) aTime = -aTime; @@ -2251,11 +2251,11 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) { - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( !ImplTimeGetValue( rStr, aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper() ) ) return true; - Time aTempTime = aTime; + tools::Time aTempTime = aTime; if ( aTempTime > GetMax() ) aTempTime = GetMax() ; else if ( aTempTime < GetMin() ) @@ -2266,11 +2266,11 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) maCorrectedTime = aTempTime; if ( !GetErrorHdl().Call( this ) ) { - maCorrectedTime = Time( Time::SYSTEM ); + maCorrectedTime = tools::Time( tools::Time::SYSTEM ); return false; } else - maCorrectedTime = Time( Time::SYSTEM ); + maCorrectedTime = tools::Time( tools::Time::SYSTEM ); } bool bSecond = false; @@ -2302,7 +2302,7 @@ bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) { if ( aTempTime.GetHour() > 12 ) { - Time aT( aTempTime ); + tools::Time aT( aTempTime ); aT.SetHour( aT.GetHour() % 12 ); rOutStr = ImplGetLocaleDataWrapper().getTime( aT, bSecond, b100Sec ); } @@ -2326,7 +2326,7 @@ void TimeField::ImplTimeSpinArea( bool bUp ) if ( GetField() ) { sal_Int32 nTimeArea = 0; - Time aTime( GetTime() ); + tools::Time aTime( GetTime() ); OUString aText( GetText() ); Selection aSelection( GetField()->GetSelection() ); @@ -2365,15 +2365,15 @@ void TimeField::ImplTimeSpinArea( bool bUp ) if ( nTimeArea ) { - Time aAddTime( 0, 0, 0 ); + tools::Time aAddTime( 0, 0, 0 ); if ( nTimeArea == 1 ) - aAddTime = Time( 1, 0 ); + aAddTime = tools::Time( 1, 0 ); else if ( nTimeArea == 2 ) - aAddTime = Time( 0, 1 ); + aAddTime = tools::Time( 0, 1 ); else if ( nTimeArea == 3 ) - aAddTime = Time( 0, 0, 1 ); + aAddTime = tools::Time( 0, 0, 1 ); else if ( nTimeArea == 4 ) - aAddTime = Time( 0, 0, 0, 1 ); + aAddTime = tools::Time( 0, 0, 0, 1 ); if ( !bUp ) aAddTime = -aAddTime; @@ -2381,10 +2381,10 @@ void TimeField::ImplTimeSpinArea( bool bUp ) aTime += aAddTime; if ( !IsDuration() ) { - Time aAbsMaxTime( 23, 59, 59, 999999999 ); + tools::Time aAbsMaxTime( 23, 59, 59, 999999999 ); if ( aTime > aAbsMaxTime ) aTime = aAbsMaxTime; - Time aAbsMinTime( 0, 0 ); + tools::Time aAbsMinTime( 0, 0 ); if ( aTime < aAbsMinTime ) aTime = aAbsMinTime; } @@ -2405,7 +2405,7 @@ TimeFormatter::TimeFormatter() : maLastTime( 0, 0 ), maMin( 0, 0 ), maMax( 23, 59, 59, 999999999 ), - maCorrectedTime( Time::SYSTEM ), + maCorrectedTime( tools::Time::SYSTEM ), mbEnforceValidValue( true ), maFieldTime( 0, 0 ) { @@ -2421,13 +2421,13 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) if ( TIMEFORMATTER_MIN & nMask ) { - SetMin( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); + SetMin( tools::Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } if ( TIMEFORMATTER_MAX & nMask ) { - SetMax( Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); + SetMax( tools::Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ) ); pMgr->Increment( ResMgr::GetObjSize( (RSHEADER_TYPE *)pMgr->GetClass() ) ); } @@ -2442,7 +2442,7 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) if ( TIMEFORMATTER_VALUE & nMask ) { - maFieldTime = Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); + maFieldTime = tools::Time( ResId( (RSHEADER_TYPE *)pMgr->GetClass(), *pMgr ) ); if ( maFieldTime > GetMax() ) maFieldTime = GetMax(); if ( maFieldTime < GetMin() ) @@ -2463,14 +2463,14 @@ void TimeFormatter::ReformatAll() Reformat(); } -void TimeFormatter::SetMin( const Time& rNewMin ) +void TimeFormatter::SetMin( const tools::Time& rNewMin ) { maMin = rNewMin; if ( !IsEmptyFieldValue() ) ReformatAll(); } -void TimeFormatter::SetMax( const Time& rNewMax ) +void TimeFormatter::SetMax( const tools::Time& rNewMax ) { maMax = rNewMax; if ( !IsEmptyFieldValue() ) @@ -2495,14 +2495,14 @@ void TimeFormatter::SetDuration( bool bNewDuration ) ReformatAll(); } -void TimeFormatter::SetTime( const Time& rNewTime ) +void TimeFormatter::SetTime( const tools::Time& rNewTime ) { SetUserTime( rNewTime ); maFieldTime = maLastTime; SetEmptyFieldValueData( false ); } -void TimeFormatter::ImplNewFieldValue( const Time& rTime ) +void TimeFormatter::ImplNewFieldValue( const tools::Time& rTime ) { if ( GetField() ) { @@ -2518,7 +2518,7 @@ void TimeFormatter::ImplNewFieldValue( const Time& rTime ) aSelection.Max() = SELECTION_MAX; } - Time aOldLastTime = maLastTime; + tools::Time aOldLastTime = maLastTime; ImplSetUserTime( rTime, &aSelection ); maLastTime = aOldLastTime; @@ -2531,9 +2531,9 @@ void TimeFormatter::ImplNewFieldValue( const Time& rTime ) } } -void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelection ) +void TimeFormatter::ImplSetUserTime( const tools::Time& rNewTime, Selection* pNewSelection ) { - Time aNewTime = rNewTime; + tools::Time aNewTime = rNewTime; if ( aNewTime > GetMax() ) aNewTime = GetMax(); else if ( aNewTime < GetMin() ) @@ -2573,7 +2573,7 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect { if ( aNewTime.GetHour() > 12 ) { - Time aT( aNewTime ); + tools::Time aT( aNewTime ); aT.SetHour( aT.GetHour() % 12 ); aStr = ImplGetLocaleDataWrapper().getTime( aT, bSec, b100Sec ); } @@ -2589,14 +2589,14 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect } } -void TimeFormatter::SetUserTime( const Time& rNewTime ) +void TimeFormatter::SetUserTime( const tools::Time& rNewTime ) { ImplSetUserTime( rNewTime ); } -Time TimeFormatter::GetTime() const +tools::Time TimeFormatter::GetTime() const { - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( GetField() ) { @@ -2680,12 +2680,12 @@ void TimeField::ImplLoadRes( const ResId& rResId ) if ( TIMEFIELD_FIRST & nMask ) { - maFirst = Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); + maFirst = tools::Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); } if ( TIMEFIELD_LAST & nMask ) { - maLast = Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); + maLast = tools::Time( ResId( (RSHEADER_TYPE *)GetClassRes(), *pMgr ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE *)GetClassRes() ) ); } } @@ -2720,7 +2720,7 @@ bool TimeField::Notify( NotifyEvent& rNEvt ) Reformat(); else { - Time aTime( 0, 0, 0 ); + tools::Time aTime( 0, 0, 0 ); if ( ImplTimeGetValue( GetText(), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper(), false ) ) // even with strict text analysis, our text is a valid time -> do a complete // reformat diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index edb66381a832..0a1eabf0bfce 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -3330,19 +3330,19 @@ void VclBuilder::mungeAdjustment(TimeField &rTarget, const Adjustment &rAdjustme if (rKey == "upper") { - Time aUpper(rValue.toInt32()); + tools::Time aUpper(rValue.toInt32()); rTarget.SetMax(aUpper); rTarget.SetLast(aUpper); } else if (rKey == "lower") { - Time aLower(rValue.toInt32()); + tools::Time aLower(rValue.toInt32()); rTarget.SetMin(aLower); rTarget.SetFirst(aLower); } else if (rKey == "value") { - Time aValue(rValue.toInt32()); + tools::Time aValue(rValue.toInt32()); rTarget.SetTime(aValue); } else diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index b6e1cf88dc80..cc4a86552448 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -122,7 +122,7 @@ static void InitKeyEvent( SalKeyEvent &rKeyEvent ) if (nRand < 0.001) rKeyEvent.mnTime = getRandom() * ULONG_MAX; else - rKeyEvent.mnTime = Time::GetSystemTicks(); + rKeyEvent.mnTime = tools::Time::GetSystemTicks(); if (getRandom() < 0.01) rKeyEvent.mnRepeat = getRandom() * 20; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 41bcaa7ce72f..d57ea8a78be2 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -74,7 +74,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ) : FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), - mnLastTicks( Time::GetSystemTicks() ), + mnLastTicks( tools::Time::GetSystemTicks() ), mbInMove( false ), mnLastUserEvent( 0 ) { @@ -187,7 +187,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) if( mpDockWin->IsDockable() && mpDockWin->GetWindow()->IsVisible() && - (Time::GetSystemTicks() - mnLastTicks > 500) && + (tools::Time::GetSystemTicks() - mnLastTicks > 500) && ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) && !(aState.mnState & KEY_MOD1) && // i43499 CTRL disables docking now bRealMove ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 83f0de88d7c4..bf04f1afc719 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -86,7 +86,7 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ) : FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), - mnLastTicks( Time::GetSystemTicks() ), + mnLastTicks( tools::Time::GetSystemTicks() ), mbInMove( false ), mnLastUserEvent( 0 ) { @@ -148,7 +148,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) mnLastUserEvent = 0; if( mpDockWin->IsDockable() && - (Time::GetSystemTicks() - mnLastTicks > 500) && + (tools::Time::GetSystemTicks() - mnLastTicks > 500) && ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) && !(aState.mnState & KEY_MOD1) ) // i43499 CTRL disables docking now { diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 0a9ab7a5ad48..1249ad4842c1 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -136,7 +136,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) { if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible ) { - sal_uLong nTime = Time::GetSystemTicks(); + sal_uLong nTime = tools::Time::GetSystemTicks(); long nX = mpWindowImpl->mpFrameData->mnLastMouseX; long nY = mpWindowImpl->mpFrameData->mnLastMouseY; sal_uInt16 nCode = nMouseCode; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 49606fb9e2a3..6e085b509c13 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -350,12 +350,12 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) if ( !ImplCallPreNotify( aNCmdEvt ) ) { - const sal_uLong nTime = Time::GetSystemTicks(); + const sal_uLong nTime = tools::Time::GetSystemTicks(); ImplDelData aDel( this ); pWindow->Command( aCEvt ); if( aDel.IsDead() ) return 0; - mnRepaintTime = std::max( Time::GetSystemTicks() - nTime, (sal_uLong)1 ); + mnRepaintTime = std::max( tools::Time::GetSystemTicks() - nTime, (sal_uLong)1 ); ImplRecalcScrollValues(); } } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index cb2bd92a250b..a677af194432 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -617,7 +617,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous nClicks = pChild->ImplGetFrameData()->mnClickCount; } - pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); + pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); } DBG_ASSERT( pChild, "ImplHandleMouseEvent: pChild == NULL" ); @@ -836,7 +836,7 @@ static vcl::Window* ImplGetKeyInputWindow( vcl::Window* pWindow ) ImplSVData* pSVData = ImplGetSVData(); // determine last input time - pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); + pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); // #127104# workaround for destroyed windows if( pWindow->ImplGetWindowImpl() == NULL ) @@ -915,7 +915,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bCtrlF6 = (aKeyCode.GetCode() == KEY_F6) && aKeyCode.IsMod1(); // determine last input time - pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); + pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); // handle tracking window if ( nSVEvent == EVENT_KEYINPUT ) @@ -2299,7 +2299,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, MouseEvent* pMouseEvt = (MouseEvent*) pEvent; SalMouseEvent aSalMouseEvent; - aSalMouseEvent.mnTime = Time::GetSystemTicks(); + aSalMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalMouseEvent.mnX = pMouseEvt->GetPosPixel().X(); aSalMouseEvent.mnY = pMouseEvt->GetPosPixel().Y(); aSalMouseEvent.mnButton = 0; @@ -2319,7 +2319,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, MouseEvent* pMouseEvt = (MouseEvent*) pEvent; SalMouseEvent aSalMouseEvent; - aSalMouseEvent.mnTime = Time::GetSystemTicks(); + aSalMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalMouseEvent.mnX = pMouseEvt->GetPosPixel().X(); aSalMouseEvent.mnY = pMouseEvt->GetPosPixel().Y(); aSalMouseEvent.mnButton = pMouseEvt->GetButtons(); @@ -2336,7 +2336,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, MouseEvent* pMouseEvt = (MouseEvent*) pEvent; SalMouseEvent aSalMouseEvent; - aSalMouseEvent.mnTime = Time::GetSystemTicks(); + aSalMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalMouseEvent.mnX = pMouseEvt->GetPosPixel().X(); aSalMouseEvent.mnY = pMouseEvt->GetPosPixel().Y(); aSalMouseEvent.mnButton = pMouseEvt->GetButtons(); @@ -2527,7 +2527,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, { ZoomEvent* pZoomEvent = (ZoomEvent*) pEvent; SalWheelMouseEvent aSalWheelMouseEvent; - aSalWheelMouseEvent.mnTime = Time::GetSystemTicks(); + aSalWheelMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalWheelMouseEvent.mnX = pZoomEvent->GetCenter().getX(); aSalWheelMouseEvent.mnY = pZoomEvent->GetCenter().getY(); // Pass on the scale as a percentage * 100 of current zoom factor @@ -2543,7 +2543,7 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, { ScrollEvent* pScrollEvent = (ScrollEvent*) pEvent; SalWheelMouseEvent aSalWheelMouseEvent; - aSalWheelMouseEvent.mnTime = Time::GetSystemTicks(); + aSalWheelMouseEvent.mnTime = tools::Time::GetSystemTicks(); aSalWheelMouseEvent.mbDeltaIsPixel = true; // event location holds delta values instead aSalWheelMouseEvent.mnX = long(pScrollEvent->GetXOffset()); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 325062954cdb..cd556c6b1b81 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -2292,7 +2292,7 @@ extern "C" } } -XLIB_Time SalDisplay::GetLastUserEventTime( bool i_bAlwaysReget ) const +Time SalDisplay::GetLastUserEventTime( bool i_bAlwaysReget ) const { if( m_nLastUserEventTime == CurrentTime || i_bAlwaysReget ) { diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 3a8f67a0d037..bbdd86a0e3cd 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -29,7 +29,7 @@ using namespace x11; DropTargetDropContext::DropTargetDropContext( ::Window aDropWindow, - XLIB_Time aTimestamp, + Time aTimestamp, SelectionManager& rManager ) : m_aDropWindow( aDropWindow ), m_nTimestamp( aTimestamp ), @@ -63,7 +63,7 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exceptio DropTargetDragContext::DropTargetDragContext( ::Window aDropWindow, - XLIB_Time aTimestamp, + Time aTimestamp, SelectionManager& rManager ) : m_aDropWindow( aDropWindow ), m_nTimestamp( aTimestamp ), @@ -92,7 +92,7 @@ void DropTargetDragContext::rejectDrag() throw(std::exception) DragSourceContext::DragSourceContext( ::Window aDropWindow, - XLIB_Time aTimestamp, + Time aTimestamp, SelectionManager& rManager ) : m_aDropWindow( aDropWindow ), m_nTimestamp( aTimestamp ), diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index bf162092024d..9fac72f058b0 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -39,11 +39,11 @@ namespace x11 { > { ::Window m_aDropWindow; - XLIB_Time m_nTimestamp; + Time m_nTimestamp; SelectionManager& m_rManager; com::sun::star::uno::Reference< XInterface > m_xManagerRef; public: - DropTargetDropContext( ::Window, XLIB_Time, SelectionManager& ); + DropTargetDropContext( ::Window, Time, SelectionManager& ); virtual ~DropTargetDropContext(); // XDropTargetDropContext @@ -58,11 +58,11 @@ namespace x11 { > { ::Window m_aDropWindow; - XLIB_Time m_nTimestamp; + Time m_nTimestamp; SelectionManager& m_rManager; com::sun::star::uno::Reference< XInterface > m_xManagerRef; public: - DropTargetDragContext( ::Window, XLIB_Time, SelectionManager& ); + DropTargetDragContext( ::Window, Time, SelectionManager& ); virtual ~DropTargetDragContext(); // XDropTargetDragContext @@ -76,11 +76,11 @@ namespace x11 { > { ::Window m_aDropWindow; - XLIB_Time m_nTimestamp; + Time m_nTimestamp; SelectionManager& m_rManager; com::sun::star::uno::Reference< XInterface > m_xManagerRef; public: - DragSourceContext( ::Window, XLIB_Time, SelectionManager& ); + DragSourceContext( ::Window, Time, SelectionManager& ); virtual ~DragSourceContext(); // XDragSourceContext diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 4082bab94404..22dbdb7d38d4 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -2259,7 +2259,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) * methods for XDropTargetDropContext */ -void SelectionManager::dropComplete( bool bSuccess, ::Window aDropWindow, XLIB_Time ) +void SelectionManager::dropComplete( bool bSuccess, ::Window aDropWindow, Time ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2448,7 +2448,7 @@ bool SelectionManager::updateDragAction( int modifierState ) return bRet; } -void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) +void SelectionManager::sendDropPosition( bool bForce, Time eventTime ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2825,7 +2825,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) return bHandled; } -void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow, XLIB_Time ) +void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow, Time ) { if( aDropWindow == m_aCurrentDropWindow ) { @@ -2845,7 +2845,7 @@ void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow, XLI } } -void SelectionManager::reject( ::Window aDropWindow, XLIB_Time ) +void SelectionManager::reject( ::Window aDropWindow, Time ) { if( aDropWindow == m_aCurrentDropWindow ) { @@ -3457,7 +3457,7 @@ void SelectionManager::dragDoDispatch() */ -void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow, XLIB_Time ) +void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow, Time ) { osl::MutexGuard aGuard( m_aMutex ); if( aDropWindow == m_aDropWindow && Cursor(cursor) != m_aCurrentCursor ) @@ -3471,7 +3471,7 @@ void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow, XLIB_T } } -void SelectionManager::setImage( sal_Int32, ::Window, XLIB_Time ) +void SelectionManager::setImage( sal_Int32, ::Window, Time ) { } @@ -3780,7 +3780,7 @@ sal_Bool SelectionManager::handleEvent(const Any& event) if( (event >>= aSeq) ) { XEvent* pEvent = (XEvent*)aSeq.getArray(); - XLIB_Time nTimestamp = CurrentTime; + Time nTimestamp = CurrentTime; if( pEvent->type == ButtonPress || pEvent->type == ButtonRelease ) nTimestamp = pEvent->xbutton.time; else if( pEvent->type == XLIB_KeyPress || pEvent->type == KeyRelease ) diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 489a915a62ad..4e7d71f3400e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -201,9 +201,9 @@ namespace x11 { bool m_bOwner; ::Window m_aLastOwner; PixmapHolder* m_pPixmap; - // m_nOrigXLIB_Timestamp contains the XLIB_Timestamp at which the seclection - // was acquired; needed for XLIB_TimeSTAMP target - XLIB_Time m_nOrigTimestamp; + // m_nOrigTimestamp contains the Timestamp at which the seclection + // was acquired; needed for TimeSTAMP target + Time m_nOrigTimestamp; Selection() : m_eState( Inactive ), m_pAdaptor( NULL ), @@ -253,7 +253,7 @@ namespace x11 { css::uno::Reference< css::awt::XDisplayConnection > m_xDisplayConnection; sal_Int32 m_nSelectionTimeout; - XLIB_Time m_nSelectionTimestamp; + Time m_nSelectionTimestamp; // members used for Xdnd @@ -268,14 +268,14 @@ namespace x11 { // set to true on first XdndPosition or XdndLeave bool m_bDropEnterSent; ::Window m_aCurrentDropWindow; - // XLIB_Time code of XdndDrop - XLIB_Time m_nDropTime; + // Time code of XdndDrop + Time m_nDropTime; sal_Int8 m_nLastDropAction; // XTransferable for Xdnd with foreign drag source css::uno::Reference< css::datatransfer::XTransferable > m_xDropTransferable; int m_nLastX, m_nLastY; - XLIB_Time m_nDropTimestamp; + Time m_nDropTimestamp; // set to true when calling drop() // if another XdndEnter is received this shows that // someone forgot to call dropComplete - we should reset @@ -310,7 +310,7 @@ namespace x11 { bool m_bDropSent; time_t m_nDropTimeout; bool m_bWaitingForPrimaryConversion; - XLIB_Time m_nDragTimestamp; + Time m_nDragTimestamp; // drag cursors Cursor m_aMoveCursor; @@ -386,7 +386,7 @@ namespace x11 { // dnd helpers void sendDragStatus( Atom nDropAction ); - void sendDropPosition( bool bForce, XLIB_Time eventXLIB_Time ); + void sendDropPosition( bool bForce, Time eventTime ); bool updateDragAction( int modifierState ); int getXdndVersion( ::Window aXLIB_Window, ::Window& rProxy ); Cursor createCursor( const unsigned char* pPointerData, const unsigned char* pMaskData, int width, int height, int hotX, int hotY ); @@ -454,14 +454,14 @@ namespace x11 { void deregisterDropTarget( ::Window aXLIB_Window ); // for XDropTarget{Drag|Drop}Context - void accept( sal_Int8 dragOperation, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void reject( ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void dropComplete( bool success, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void accept( sal_Int8 dragOperation, ::Window aDropXLIB_Window, Time aTimestamp ); + void reject( ::Window aDropXLIB_Window, Time aTimestamp ); + void dropComplete( bool success, ::Window aDropXLIB_Window, Time aTimestamp ); // for XDragSourceContext sal_Int32 getCurrentCursor() { return m_aCurrentCursor;} - void setCursor( sal_Int32 cursor, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void setImage( sal_Int32 image, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void setCursor( sal_Int32 cursor, ::Window aDropXLIB_Window, Time aTimestamp ); + void setImage( sal_Int32 image, ::Window aDropXLIB_Window, Time aTimestamp ); void transferablesFlavorsChanged(); void shutdown() throw(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 0c072ce36913..0e11e9a227c6 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -622,7 +622,7 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP XSync( GetXDisplay(), False ); setXEmbedInfo(); - XLIB_Time nUserTime = (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_TOOLWINDOW) ) == 0 ? + Time nUserTime = (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_TOOLWINDOW) ) == 0 ? pDisplay_->GetLastUserEventTime() : 0; pDisplay_->getWMAdaptor()->setUserTime( this, nUserTime ); @@ -1225,7 +1225,7 @@ void X11SalFrame::Show( bool bVisible, bool bNoActivate ) ); } - XLIB_Time nUserTime = 0; + Time nUserTime = 0; if( ! bNoActivate && (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) == 0 ) nUserTime = pDisplay_->GetLastUserEventTime( true ); GetDisplay()->getWMAdaptor()->setUserTime( this, nUserTime ); diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index b1d33e498792..52e33db6fe16 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -340,8 +340,8 @@ SalData::SalData() mpDitherDiff = 0; // Dither mapping table mpDitherLow = 0; // Dither mapping table mpDitherHigh = 0; // Dither mapping table - mnTimerMS = 0; // Current Time (in MS) of the Timer - mnTimerOrgMS = 0; // Current Original Time (in MS) + mnTimerMS = 0; // Current tools::Time (in MS) of the Timer + mnTimerOrgMS = 0; // Current Original tools::Time (in MS) mnNextTimerTime = 0; mnLastEventTime = 0; mnTimerId = 0; // windows timer id diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 5f3eb01c780c..ce2076e30cd2 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -305,21 +305,21 @@ bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com:: return false; } -/** convert double to ISO Date Time String */ +/** convert double to ISO Date tools::Time String */ void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer, const double& fDateTime, bool const bAddTimeIf0AM) { convertDateTime(rBuffer, fDateTime, m_pImpl->m_aNullDate, bAddTimeIf0AM); } -/** convert ISO Date Time String to double */ +/** convert ISO Date tools::Time String to double */ bool SvXMLUnitConverter::convertDateTime(double& fDateTime, const OUString& rString) { return convertDateTime(fDateTime, rString, m_pImpl->m_aNullDate); } -/** convert double to ISO Date Time String */ +/** convert double to ISO Date tools::Time String */ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, const com::sun::star::util::Date& aTempNullDate, @@ -427,7 +427,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, } } -/** convert ISO Date Time String to double */ +/** convert ISO Date tools::Time String to double */ bool SvXMLUnitConverter::convertDateTime( double& fDateTime, const OUString& rString, const com::sun::star::util::Date& aTempNullDate) { @@ -444,10 +444,10 @@ bool SvXMLUnitConverter::convertDateTime( double& fDateTime, double Min = aDateTime.Minutes; double Sec = aDateTime.Seconds; double NanoSec = aDateTime.NanoSeconds; - fTempDateTime += Hour / ::Time::hourPerDay; - fTempDateTime += Min / ::Time::minutePerDay; - fTempDateTime += Sec / ::Time::secondPerDay; - fTempDateTime += NanoSec / ::Time::nanoSecPerDay; + fTempDateTime += Hour / ::tools::Time::hourPerDay; + fTempDateTime += Min / ::tools::Time::minutePerDay; + fTempDateTime += Sec / ::tools::Time::secondPerDay; + fTempDateTime += NanoSec / ::tools::Time::nanoSecPerDay; fDateTime = fTempDateTime; } return bSuccess; diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 9c55aa18521e..8b7453f2602a 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -51,7 +51,9 @@ bool XMLDurationPropertyHdl::importXML( ::sax::Converter::convertDuration(aDuration, rStrImpValue); const double fSeconds = ((aDuration.Days * 24 + aDuration.Hours) * 60 - + aDuration.Minutes) * 60 + aDuration.Seconds + aDuration.NanoSeconds / static_cast<double>(::Time::nanoSecPerSec); + + aDuration.Minutes) * 60 + + aDuration.Seconds + + aDuration.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerSec); rValue <<= fSeconds; return true; @@ -68,7 +70,7 @@ bool XMLDurationPropertyHdl::exportXML( { util::Duration aDuration; aDuration.Seconds = static_cast<sal_uInt16>(nVal); - aDuration.NanoSeconds = static_cast<sal_uInt32>((nVal - aDuration.Seconds) * ::Time::nanoSecPerSec); + aDuration.NanoSeconds = static_cast<sal_uInt32>((nVal - aDuration.Seconds) * ::tools::Time::nanoSecPerSec); OUStringBuffer aOut; ::sax::Converter::convertDuration(aOut, aDuration); diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 4ce6534b2883..2734a3fd48b4 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1109,7 +1109,7 @@ namespace xmloff sal_Int32 nRepeatDelay = 0; m_xProps->getPropertyValue( PROPERTY_REPEAT_DELAY ) >>= nRepeatDelay; - Time aTime( Time::SYSTEM ); + tools::Time aTime( tools::Time::SYSTEM ); aTime.MakeTimeFromMS( nRepeatDelay ); util::Duration aDuration; aDuration.Hours = aTime.GetHour(); diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index c02c2e6e2c1e..2bedb56cc775 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -50,7 +50,7 @@ namespace xmloff OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const { - Time aTime; + css::util::Time aTime; OSL_VERIFY( i_propertyValue >>= aTime ); Duration aDuration; // default-inited to 0 @@ -67,7 +67,7 @@ namespace xmloff bool VCLTimeHandler::getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const { Duration aDuration; - Time aTime; + css::util::Time aTime; if (::sax::Converter::convertDuration( aDuration, i_attributeValue )) { aTime = Time(aDuration.NanoSeconds, aDuration.Seconds, @@ -84,8 +84,8 @@ namespace xmloff return false; } // legacy integer was in centiseconds - nVCLTime *= ::Time::nanoPerCenti; - aTime = ::Time(nVCLTime).GetUNOTime(); + nVCLTime *= ::tools::Time::nanoPerCenti; + aTime = ::tools::Time(nVCLTime).GetUNOTime(); } const Any aPropertyValue( makeAny( aTime ) ); diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 9693e7db6087..bc41ab43d8c7 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -570,20 +570,20 @@ namespace xmloff } else if (_rValue >>= aTime) { - fValue = aTime.Hours / static_cast<double>(::Time::hourPerDay) + - aTime.Minutes / static_cast<double>(::Time::minutePerDay) + - aTime.Seconds / static_cast<double>(::Time::secondPerDay) + - aTime.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay); + fValue = aTime.Hours / static_cast<double>(::tools::Time::hourPerDay) + + aTime.Minutes / static_cast<double>(::tools::Time::minutePerDay) + + aTime.Seconds / static_cast<double>(::tools::Time::secondPerDay) + + aTime.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerDay); } else if (_rValue >>= aDateTime) { DateTime aToolsDateTime( DateTime::EMPTY ); ::utl::typeConvert(aDateTime, aToolsDateTime); // the time part (the digits behind the comma) - fValue = aTime.Hours / static_cast<double>(::Time::hourPerDay) + - aTime.Minutes / static_cast<double>(::Time::minutePerDay) + - aTime.Seconds / static_cast<double>(::Time::secondPerDay) + - aTime.NanoSeconds / static_cast<double>(::Time::nanoSecPerDay); + fValue = aTime.Hours / static_cast<double>(::tools::Time::hourPerDay) + + aTime.Minutes / static_cast<double>(::tools::Time::minutePerDay) + + aTime.Seconds / static_cast<double>(::tools::Time::secondPerDay) + + aTime.NanoSeconds / static_cast<double>(::tools::Time::nanoSecPerDay); // plus the data part (the digits in front of the comma) fValue += aToolsDateTime.GetDate(); } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 42bbe4f3873f..939574608756 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -61,13 +61,13 @@ namespace ::com::sun::star::util::Time lcl_getTime(double _nValue) { ::com::sun::star::util::Time aTime; - sal_uInt64 nIntValue = static_cast<sal_uInt64>(_nValue * ::Time::nanoSecPerDay); - aTime.NanoSeconds = nIntValue % ::Time::nanoSecPerSec; - nIntValue /= ::Time::nanoSecPerSec; - aTime.Seconds = nIntValue % ::Time::secondPerMinute; - nIntValue /= ::Time::secondPerMinute; - aTime.Minutes = nIntValue % ::Time::minutePerHour; - nIntValue /= ::Time::minutePerHour; + sal_uInt64 nIntValue = static_cast<sal_uInt64>(_nValue * ::tools::Time::nanoSecPerDay); + aTime.NanoSeconds = nIntValue % ::tools::Time::nanoSecPerSec; + nIntValue /= ::tools::Time::nanoSecPerSec; + aTime.Seconds = nIntValue % ::tools::Time::secondPerMinute; + nIntValue /= ::tools::Time::secondPerMinute; + aTime.Minutes = nIntValue % ::tools::Time::minutePerHour; + nIntValue /= ::tools::Time::minutePerHour; OSL_ENSURE(nIntValue < 24, "lcl_getTime: more than a day?"); aTime.Hours = nIntValue; @@ -199,7 +199,7 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TYPE_TIME: { OSL_ENSURE(((sal_uInt32)nValue) == 0, - "PropertyConversion::convertString: a Time value with more than a fractional part?"); + "PropertyConversion::convertString: a tools::Time value with more than a fractional part?"); aReturn <<= lcl_getTime(nValue); } break; diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 71663660c83c..79a132589020 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -231,7 +231,7 @@ OUString XMLTextListsHelper::GenerateNewListId() const else { // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#) - sal_Int64 n = Time( Time::SYSTEM ).GetTime(); + sal_Int64 n = ::tools::Time( ::tools::Time::SYSTEM ).GetTime(); n += Date( Date::SYSTEM ).GetDate(); n += rand(); // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#) diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 3def76d9bd17..a2765da0d5db 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -607,8 +607,8 @@ void ElementDescriptor::readTimeAttr( OUString const & rPropName, OUString const util::Time aUTime; if (a >>= aUTime) { - ::Time aTTime(aUTime); - addAttribute( rAttrName, OUString::number( aTTime.GetTime() / ::Time::nanoPerCenti ) ); + ::tools::Time aTTime(aUTime); + addAttribute( rAttrName, OUString::number( aTTime.GetTime() / ::tools::Time::nanoPerCenti ) ); } else OSL_FAIL( "### internal error" ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index d74786348a54..415047610a90 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1192,7 +1192,7 @@ bool ImportContext::importTimeProperty( _pImport->XMLNS_DIALOGS_UID, rAttrName ) ); if (!aValue.isEmpty()) { - ::Time aTTime(toInt32( aValue ) * ::Time::nanoPerCenti); + ::tools::Time aTTime(toInt32( aValue ) * ::tools::Time::nanoPerCenti); util::Time aUTime(aTTime.GetUNOTime()); _xControlModel->setPropertyValue( rPropName, makeAny( aUTime ) ); return true; diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx index 9ac22e37b5b9..827550f8df57 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx @@ -36,7 +36,7 @@ class XSecController; class Date; -class Time; +namespace tools { class Time; } namespace com { namespace sun { @@ -165,7 +165,7 @@ public: void SetX509Certificate(sal_Int32 nSecurityId, const OUString& ouX509IssuerName, const OUString& ouX509SerialNumber, const OUString& ouX509Cert); - void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime ); + void SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const tools::Time& rTime ); void AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, bool bBinary ); bool CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler ); diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 2780bb241fae..38109b36c8eb 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -303,9 +303,9 @@ DocumentDigitalSignatures::ImplVerifySignatures( if (!rSigInfo.Signer.is()) rSigInfo.Signer = xSecEnv->getCertificate( rInfo.ouX509IssuerName, xSerialNumberAdapter->toSequence( rInfo.ouX509SerialNumber ) ); - // Time support again (#i38744#) + // tools::Time support again (#i38744#) Date aDate( rInfo.stDateTime.Day, rInfo.stDateTime.Month, rInfo.stDateTime.Year ); - Time aTime( rInfo.stDateTime.Hours, rInfo.stDateTime.Minutes, + tools::Time aTime( rInfo.stDateTime.Hours, rInfo.stDateTime.Minutes, rInfo.stDateTime.Seconds, rInfo.stDateTime.NanoSeconds ); rSigInfo.SignatureDate = aDate.GetDate(); rSigInfo.SignatureTime = aTime.GetTime(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 1016a5f99c94..7cfde0f8020e 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -446,7 +446,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) maSignatureHelper.AddForSigning( nSecurityId, aElements[n], aElements[n], bBinaryMode ); } - maSignatureHelper.SetDateTime( nSecurityId, Date( Date::SYSTEM ), Time( Time::SYSTEM ) ); + maSignatureHelper.SetDateTime( nSecurityId, Date( Date::SYSTEM ), tools::Time( tools::Time::SYSTEM ) ); // We open a signature stream in which the existing and the new //signature is written. ImplGetSignatureInformation (later in this function) will diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 6dc5703255ca..2d84e0fe1257 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -54,7 +54,7 @@ namespace XmlSec { return DateTime( Date( _rDT.Day, _rDT.Month, _rDT.Year ), - Time( _rDT.Hours, _rDT.Minutes, _rDT.Seconds, _rDT.NanoSeconds ) ); + tools::Time( _rDT.Hours, _rDT.Minutes, _rDT.Seconds, _rDT.NanoSeconds ) ); } OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT ) diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index 2722ca4fa68e..931ded8c0265 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -121,7 +121,7 @@ void XMLSignatureHelper::SetX509Certificate( ouX509Cert); } -void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime ) +void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const tools::Time& rTime ) { ::com::sun::star::util::DateTime stDateTime; stDateTime.NanoSeconds = rTime.GetNanoSec(); diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index 34e7e452b7ff..546d831c8b10 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -302,7 +302,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com: { if( FileTimeToSystemTime( &localFileTime, &explTime ) ) { //Convert the time to readable local time - dateTime.NanoSeconds = explTime.wMilliseconds * ::Time::nanoPerMilli ; + dateTime.NanoSeconds = explTime.wMilliseconds * ::tools::Time::nanoPerMilli ; dateTime.Seconds = explTime.wSecond ; dateTime.Minutes = explTime.wMinute ; dateTime.Hours = explTime.wHour ; @@ -328,7 +328,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com: { if( FileTimeToSystemTime( &localFileTime, &explTime ) ) { //Convert the time to readable local time - dateTime.NanoSeconds = explTime.wMilliseconds * ::Time::nanoPerMilli ; + dateTime.NanoSeconds = explTime.wMilliseconds * ::tools::Time::nanoPerMilli ; dateTime.Seconds = explTime.wSecond ; dateTime.Minutes = explTime.wMinute ; dateTime.Hours = explTime.wHour ; diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index f8dc8f14a45f..decda16a2b6a 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -107,7 +107,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun //Convert the time to readable local time PR_ExplodeTime( notBefore, PR_LocalTimeParameters, &explTime ) ; - dateTime.NanoSeconds = static_cast< sal_Int32 >( explTime.tm_usec * ::Time::nanoPerMicro ); + dateTime.NanoSeconds = static_cast< sal_Int32 >( explTime.tm_usec * ::tools::Time::nanoPerMicro ); dateTime.Seconds = static_cast< sal_Int16 >( explTime.tm_sec ); dateTime.Minutes = static_cast< sal_Int16 >( explTime.tm_min ); dateTime.Hours = static_cast< sal_Int16 >( explTime.tm_hour ); @@ -136,7 +136,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun //Convert the time to readable local time PR_ExplodeTime( notAfter, PR_LocalTimeParameters, &explTime ) ; - dateTime.NanoSeconds = static_cast< sal_Int16 >( explTime.tm_usec * ::Time::nanoPerMicro ); + dateTime.NanoSeconds = static_cast< sal_Int16 >( explTime.tm_usec * ::tools::Time::nanoPerMicro ); dateTime.Seconds = static_cast< sal_Int16 >( explTime.tm_sec ); dateTime.Minutes = static_cast< sal_Int16 >( explTime.tm_min ); dateTime.Hours = static_cast< sal_Int16 >( explTime.tm_hour ); |