diff options
author | Eike Rathke <erack@redhat.com> | 2014-10-08 14:34:58 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2014-10-08 14:35:36 +0200 |
commit | f84dac9b1f394b05ceabb54fc77663cd747a3148 (patch) | |
tree | 61a2a7fd35f74b889541f85833ffa7c5c6086e25 | |
parent | 04a810cee48d213806f13deb7953caa39ad08628 (diff) |
back out even more wrong tools::Time changes, geez..
Change-Id: I52eb3400769999d7f554c3bdb8746f65b7990388
-rw-r--r-- | basic/source/comp/sbcomp.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xftimestyle.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 4 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 2 | ||||
-rw-r--r-- | unotools/source/misc/datetime.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/xmluconv.cxx | 8 |
6 files changed, 10 insertions, 10 deletions
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 8af2d4ecc434..293e8cf740e3 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( "***** tools::Time Output *****" ); + lcl_lineOut( "***** Time Output *****" ); char TimeBuffer[500]; double dTotalTime = GpTimer->getElapsedTime() - GdStartTime; sprintf( TimeBuffer, "Total execution time = %f ms", dTotalTime*1000.0 ); diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx index 188e94a3dda6..73072df04513 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx @@ -55,7 +55,7 @@ ************************************************************************/ /************************************************************************* * @file - * tools::Time style. The TIme format for time field. + * Time style. The Time format for time field. ************************************************************************/ #include "xftimestyle.hxx" diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 3cec24f556dc..21c3213c3110 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -157,11 +157,11 @@ private: animations. */ 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/>. */ 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. */ double mnNextFrameTargetTime; diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index ebe59144f1a0..923a82ffc969 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 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. * While exporting LO was writing plian text instead of field entry. */ diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 559cb3f9fa0d..fa49c787e36c 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -338,7 +338,7 @@ bool ISO8601parseDate(const OUString &aDateStr, css::util::Date& rDate) 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 bSuccess = true; diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index ce2076e30cd2..7bea9cabc429 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 tools::Time String */ +/** convert double to ISO Date Time String */ void SvXMLUnitConverter::convertDateTime(OUStringBuffer& rBuffer, const double& fDateTime, bool const 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, const OUString& rString) { 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, const double& fDateTime, 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, const OUString& rString, const com::sun::star::util::Date& aTempNullDate) { |