mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

back out even more wrong tools::Time changes, geez..

Browse Source 
Change-Id: I52eb3400769999d7f554c3bdb8746f65b7990388
This commit is contained in:
Eike Rathke
2014-10-08 14:34:58 +02:00
parent 04a810cee4
commit f84dac9b1f
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/source/comp/sbcomp.cxx
View File

@@ -382,7 +382,7 @@ void lcl_printTimeOutput( void )
{ {
// Overall time output // Overall time output
lcl_lineOut( "" ); lcl_lineOut( "" );
lcl_lineOut( "***** tools::Time Output *****" ); lcl_lineOut( "***** Time Output *****" );
char TimeBuffer[500]; char TimeBuffer[500];
double dTotalTime = GpTimer->getElapsedTime() - GdStartTime; double dTotalTime = GpTimer->getElapsedTime() - GdStartTime;
sprintf( TimeBuffer, "Total execution time = %f ms", dTotalTime*1000.0 ); sprintf( TimeBuffer, "Total execution time = %f ms", dTotalTime*1000.0 );

2
lotuswordpro/source/filter/xfilter/xftimestyle.cxx
View File

@@ -55,7 +55,7 @@
************************************************************************/ ************************************************************************/
/************************************************************************* /*************************************************************************
* @file * @file
* tools::Time style. The TIme format for time field. * Time style. The Time format for time field.
************************************************************************/ ************************************************************************/
#include "xftimestyle.hxx" #include "xftimestyle.hxx"

4
slideshow/source/engine/slideshowimpl.cxx
View File

@@ -157,11 +157,11 @@ private:
animations. animations.
*/ */
canvas::tools::ElapsedTime maTimer; canvas::tools::ElapsedTime maTimer;
/** tools::Time between the display of frames. Enforced only when mbIsActive /** Time between the display of frames. Enforced only when mbIsActive
is <TRUE/>. is <TRUE/>.
*/ */
const double mnFrameDuration; const double mnFrameDuration;
/** tools::Time (of maTimer) when the next frame shall be displayed. /** Time (of maTimer) when the next frame shall be displayed.
Synchronize() will wait until this time. Synchronize() will wait until this time.
*/ */
double mnNextFrameTargetTime; double mnNextFrameTargetTime;

2
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
View File

@@ -566,7 +566,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo81492, "fdo81492.docx")
DECLARE_OOXMLEXPORT_TEST(testEditTime, "fdo81341.docx") DECLARE_OOXMLEXPORT_TEST(testEditTime, "fdo81341.docx")
{ {
/* Issue was LO was not able to Import and Export EditTime in seconds format. /* Issue was LO was not able to Import and Export EditTime in seconds format.
* It was supporting tools::Time in "HH:MM" format. But if DOCX conatins tools::Time in seconds, * It was supporting Time in "HH:MM" format. But if DOCX conatins Time in seconds,
* then LO was not able to display time in "HH:MM:SS" format. * then LO was not able to display time in "HH:MM:SS" format.
* While exporting LO was writing plian text instead of field entry. * While exporting LO was writing plian text instead of field entry.
*/ */

2
unotools/source/misc/datetime.cxx
View File

@@ -338,7 +338,7 @@ bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate)
return bSuccess; return bSuccess;
} }
/** convert ISO8601 tools::Time String to util::Time */ /** convert ISO8601 Time String to util::Time */
bool ISO8601parseTime(const OUString &aTimeStr, css::util::Time& rTime) bool ISO8601parseTime(const OUString &aTimeStr, css::util::Time& rTime)
{ {
bool bSuccess = true; bool bSuccess = true;

8
xmloff/source/core/xmluconv.cxx
View File

@@ -305,21 +305,21 @@ bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com::
return false; return false;
} }
/** convert double to ISO Date tools::Time String */ /** convert double to ISO Date Time String */
void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer, void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer,
const double& fDateTime, bool const bAddTimeIf0AM) const double& fDateTime, bool const bAddTimeIf0AM)
{ {
convertDateTime(rBuffer, fDateTime, m_pImpl->m_aNullDate, bAddTimeIf0AM); convertDateTime(rBuffer, fDateTime, m_pImpl->m_aNullDate, bAddTimeIf0AM);
} }
/** convert ISO Date tools::Time String to double */ /** convert ISO Date Time String to double */
bool SvXMLUnitConverter::convertDateTime(double& fDateTime, bool SvXMLUnitConverter::convertDateTime(double& fDateTime,
const OUString& rString) const OUString& rString)
{ {
return convertDateTime(fDateTime, rString, m_pImpl->m_aNullDate); return convertDateTime(fDateTime, rString, m_pImpl->m_aNullDate);
} }
/** convert double to ISO Date tools::Time String */ /** convert double to ISO Date Time String */
void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer,
const double& fDateTime, const double& fDateTime,
const com::sun::star::util::Date& aTempNullDate, const com::sun::star::util::Date& aTempNullDate,
@@ -427,7 +427,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer,
} }
} }
/** convert ISO Date tools::Time String to double */ /** convert ISO Date Time String to double */
bool SvXMLUnitConverter::convertDateTime( double& fDateTime, bool SvXMLUnitConverter::convertDateTime( double& fDateTime,
const OUString& rString, const com::sun::star::util::Date& aTempNullDate) const OUString& rString, const com::sun::star::util::Date& aTempNullDate)
{ {