back out more wrong and confusing tools::Time comment changes
Apparently fc04f76336
used some sed script
to change all ...
Change-Id: Ie609bd02a2c5d70109fc6185cf4440480f29d8f5
This commit is contained in:
@@ -606,7 +606,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
|
|||||||
{
|
{
|
||||||
double dDiffTime = dCurTime - GdLastTime;
|
double dDiffTime = dCurTime - GdLastTime;
|
||||||
GdLastTime = dCurTime;
|
GdLastTime = dCurTime;
|
||||||
sprintf( TimeBuffer, "\t\t// tools::Time = %f ms / += %f ms", dCurTime*1000.0, dDiffTime*1000.0 );
|
sprintf( TimeBuffer, "\t\t// Time = %f ms / += %f ms", dCurTime*1000.0, dDiffTime*1000.0 );
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -802,7 +802,7 @@ void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, sal_Int32 nCallL
|
|||||||
char TimeBuffer[200];
|
char TimeBuffer[200];
|
||||||
if( GbTimerOn && bLeave )
|
if( GbTimerOn && bLeave )
|
||||||
{
|
{
|
||||||
sprintf( TimeBuffer, " // Execution tools::Time = %f ms", dExecutionTime*1000.0 );
|
sprintf( TimeBuffer, " // Execution Time = %f ms", dExecutionTime*1000.0 );
|
||||||
pPostStr = TimeBuffer;
|
pPostStr = TimeBuffer;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -280,7 +280,7 @@ start:
|
|||||||
// if the whole-number part is 0, we want no year!
|
// if the whole-number part is 0, we want no year!
|
||||||
if( n <= -1.0 || n >= 1.0 )
|
if( n <= -1.0 || n >= 1.0 )
|
||||||
{
|
{
|
||||||
// tools::Time only if != 00:00:00
|
// Time only if != 00:00:00
|
||||||
if( floor( n ) == n )
|
if( floor( n ) == n )
|
||||||
{
|
{
|
||||||
switch( eDate )
|
switch( eDate )
|
||||||
|
@@ -790,7 +790,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
|
|||||||
} break;
|
} break;
|
||||||
case FormComponentType::TIMEFIELD:
|
case FormComponentType::TIMEFIELD:
|
||||||
{
|
{
|
||||||
// <name>=<value> // Value is a tools::Time with the format HH:MM:SS
|
// <name>=<value> // Value is a Time with the format HH:MM:SS
|
||||||
// no value (NULL) means empty value
|
// no value (NULL) means empty value
|
||||||
if( hasProperty(PROPERTY_TIME, xComponentSet) )
|
if( hasProperty(PROPERTY_TIME, xComponentSet) )
|
||||||
{
|
{
|
||||||
|
@@ -233,7 +233,7 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs)
|
|||||||
xmlXPathReturnEmptyString(ctxt);
|
xmlXPathReturnEmptyString(ctxt);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Date and tools::Time Functions
|
// Date and Time Functions
|
||||||
|
|
||||||
static OString makeDateTimeString (const DateTime& aDateTime, bool bUTC = true)
|
static OString makeDateTimeString (const DateTime& aDateTime, bool bUTC = true)
|
||||||
{
|
{
|
||||||
|
@@ -113,7 +113,7 @@ using namespace InternalFilePickerElementIds;
|
|||||||
#define GET_DECODED_NAME(aObj) \
|
#define GET_DECODED_NAME(aObj) \
|
||||||
aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET )
|
aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET )
|
||||||
|
|
||||||
// tools::Time to wait while traveling in the filterbox until
|
// Time to wait while traveling in the filterbox until
|
||||||
// the browsebox gets filtered ( in ms).
|
// the browsebox gets filtered ( in ms).
|
||||||
#define TRAVELFILTER_TIMEOUT 750
|
#define TRAVELFILTER_TIMEOUT 750
|
||||||
|
|
||||||
|
@@ -97,17 +97,17 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields,
|
|||||||
case 9: // DateTime dd/mm/yy H:MM:SS PM
|
case 9: // DateTime dd/mm/yy H:MM:SS PM
|
||||||
lclCreateTextFields( aFields, xModel, "datetime13" );
|
lclCreateTextFields( aFields, xModel, "datetime13" );
|
||||||
break;
|
break;
|
||||||
case 10: // tools::Time H:MM
|
case 10: // Time H:MM
|
||||||
bIsDate = false;
|
bIsDate = false;
|
||||||
break;
|
break;
|
||||||
case 11: // tools::Time H:MM:SS
|
case 11: // Time H:MM:SS
|
||||||
bIsDate = false;
|
bIsDate = false;
|
||||||
// this is the default format
|
// this is the default format
|
||||||
break;
|
break;
|
||||||
case 12: // tools::Time H:MM PM
|
case 12: // Time H:MM PM
|
||||||
bIsDate = false;
|
bIsDate = false;
|
||||||
break;
|
break;
|
||||||
case 13: // tools::Time H:MM:SS PM
|
case 13: // Time H:MM:SS PM
|
||||||
bIsDate = false;
|
bIsDate = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -82,7 +82,7 @@ public:
|
|||||||
::std::vector<Point> maStartOffset;
|
::std::vector<Point> maStartOffset;
|
||||||
/// Target offset of each item in the run at the end of the current animation.
|
/// Target offset of each item in the run at the end of the current animation.
|
||||||
::std::vector<Point> maEndOffset;
|
::std::vector<Point> maEndOffset;
|
||||||
/// tools::Time at which the current animation started.
|
/// Time at which the current animation started.
|
||||||
double mnStartTime;
|
double mnStartTime;
|
||||||
|
|
||||||
class Comparator
|
class Comparator
|
||||||
|
@@ -967,7 +967,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
|
|||||||
OUString("date")));
|
OUString("date")));
|
||||||
} else if (type == ::cppu::UnoType<css::util::Time>::get()) {
|
} else if (type == ::cppu::UnoType<css::util::Time>::get()) {
|
||||||
// #i97029#: replaced by Duration
|
// #i97029#: replaced by Duration
|
||||||
// tools::Time is supported for backward compatibility with OOo 3.x, x<=2
|
// Time is supported for backward compatibility with OOo 3.x, x<=2
|
||||||
css::util::Time ut;
|
css::util::Time ut;
|
||||||
any >>= ut;
|
any >>= ut;
|
||||||
css::util::Duration ud;
|
css::util::Duration ud;
|
||||||
@@ -2274,7 +2274,7 @@ void SfxDocumentMetaData::createUserDefined()
|
|||||||
types[ 9] = ::cppu::UnoType<sal_Int16>::get();
|
types[ 9] = ::cppu::UnoType<sal_Int16>::get();
|
||||||
types[10] = ::cppu::UnoType<sal_Int32>::get();
|
types[10] = ::cppu::UnoType<sal_Int32>::get();
|
||||||
types[11] = ::cppu::UnoType<sal_Int64>::get();
|
types[11] = ::cppu::UnoType<sal_Int64>::get();
|
||||||
// tools::Time is supported for backward compatibility with OOo 3.x, x<=2
|
// Time is supported for backward compatibility with OOo 3.x, x<=2
|
||||||
types[12] = ::cppu::UnoType<css::util::Time>::get();
|
types[12] = ::cppu::UnoType<css::util::Time>::get();
|
||||||
// #i94175#: ODF allows empty user-defined property names!
|
// #i94175#: ODF allows empty user-defined property names!
|
||||||
m_xUserDefined.set(
|
m_xUserDefined.set(
|
||||||
|
@@ -65,7 +65,7 @@ std::wstring iso8601_date_to_local_date(const std::wstring& isoDate )
|
|||||||
else
|
else
|
||||||
ws8601DateTime = StringToWString( asDateTime );
|
ws8601DateTime = StringToWString( asDateTime );
|
||||||
|
|
||||||
//get tools::Time info from structure
|
//get Time info from structure
|
||||||
WCHAR TimeBuffer[ MAX_PATH ];
|
WCHAR TimeBuffer[ MAX_PATH ];
|
||||||
|
|
||||||
int TimeSize = GetTimeFormatW(
|
int TimeSize = GetTimeFormatW(
|
||||||
|
@@ -2086,7 +2086,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
|
|||||||
// commit frame to screen
|
// commit frame to screen
|
||||||
maScreenUpdater.commitUpdates();
|
maScreenUpdater.commitUpdates();
|
||||||
}
|
}
|
||||||
// tools::Time held until here
|
// Time held until here
|
||||||
|
|
||||||
const bool bActivitiesLeft = (! maActivitiesQueue.isEmpty());
|
const bool bActivitiesLeft = (! maActivitiesQueue.isEmpty());
|
||||||
const bool bTimerEventsLeft = (! maEventQueue.isEmpty());
|
const bool bTimerEventsLeft = (! maEventQueue.isEmpty());
|
||||||
|
@@ -577,7 +577,7 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
|
|||||||
}
|
}
|
||||||
else if ( pField && pField->ISA(SvxExtTimeField))
|
else if ( pField && pField->ISA(SvxExtTimeField))
|
||||||
{
|
{
|
||||||
// tools::Time field
|
// Time field
|
||||||
pInfo->SetRepresentation(
|
pInfo->SetRepresentation(
|
||||||
((const SvxExtTimeField*) pField)->GetFormatted(
|
((const SvxExtTimeField*) pField)->GetFormatted(
|
||||||
*GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
|
*GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
|
||||||
|
@@ -114,7 +114,7 @@ void SwLayAction::CheckWaitCrsr()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// tools::Time over already?
|
// Time over already?
|
||||||
inline void SwLayAction::CheckIdleEnd()
|
inline void SwLayAction::CheckIdleEnd()
|
||||||
{
|
{
|
||||||
if ( !IsInput() )
|
if ( !IsInput() )
|
||||||
|
@@ -3717,7 +3717,7 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
|
|||||||
OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
|
OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
|
||||||
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), false );
|
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), false );
|
||||||
|
|
||||||
// re-calc the tools::Time property
|
// re-calc the Time property
|
||||||
uno::Reference < awt::XTimeField > xField( getPeer(), uno::UNO_QUERY );
|
uno::Reference < awt::XTimeField > xField( getPeer(), uno::UNO_QUERY );
|
||||||
uno::Any aValue;
|
uno::Any aValue;
|
||||||
if ( !xField->isEmpty() )
|
if ( !xField->isEmpty() )
|
||||||
|
@@ -340,8 +340,8 @@ SalData::SalData()
|
|||||||
mpDitherDiff = 0; // Dither mapping table
|
mpDitherDiff = 0; // Dither mapping table
|
||||||
mpDitherLow = 0; // Dither mapping table
|
mpDitherLow = 0; // Dither mapping table
|
||||||
mpDitherHigh = 0; // Dither mapping table
|
mpDitherHigh = 0; // Dither mapping table
|
||||||
mnTimerMS = 0; // Current tools::Time (in MS) of the Timer
|
mnTimerMS = 0; // Current Time (in MS) of the Timer
|
||||||
mnTimerOrgMS = 0; // Current Original tools::Time (in MS)
|
mnTimerOrgMS = 0; // Current Original Time (in MS)
|
||||||
mnNextTimerTime = 0;
|
mnNextTimerTime = 0;
|
||||||
mnLastEventTime = 0;
|
mnLastEventTime = 0;
|
||||||
mnTimerId = 0; // windows timer id
|
mnTimerId = 0; // windows timer id
|
||||||
|
@@ -303,7 +303,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
|
|||||||
if (!rSigInfo.Signer.is())
|
if (!rSigInfo.Signer.is())
|
||||||
rSigInfo.Signer = xSecEnv->getCertificate( rInfo.ouX509IssuerName, xSerialNumberAdapter->toSequence( rInfo.ouX509SerialNumber ) );
|
rSigInfo.Signer = xSecEnv->getCertificate( rInfo.ouX509IssuerName, xSerialNumberAdapter->toSequence( rInfo.ouX509SerialNumber ) );
|
||||||
|
|
||||||
// tools::Time support again (#i38744#)
|
// Time support again (#i38744#)
|
||||||
Date aDate( rInfo.stDateTime.Day, rInfo.stDateTime.Month, rInfo.stDateTime.Year );
|
Date aDate( rInfo.stDateTime.Day, rInfo.stDateTime.Month, rInfo.stDateTime.Year );
|
||||||
tools::Time aTime( rInfo.stDateTime.Hours, rInfo.stDateTime.Minutes,
|
tools::Time aTime( rInfo.stDateTime.Hours, rInfo.stDateTime.Minutes,
|
||||||
rInfo.stDateTime.Seconds, rInfo.stDateTime.NanoSeconds );
|
rInfo.stDateTime.Seconds, rInfo.stDateTime.NanoSeconds );
|
||||||
|
Reference in New Issue
Block a user