[Libreoffice-commits] core.git: basic/source lotuswordpro/source slideshow/source sw/qa unotools/source xmloff/source

[Eike Rathke]

 basic/source/comp/sbcomp.cxx                       |    2 +-
 lotuswordpro/source/filter/xfilter/xftimestyle.cxx |    2 +-
 slideshow/source/engine/slideshowimpl.cxx          |    4 ++--
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx      |    2 +-
 unotools/source/misc/datetime.cxx                  |    2 +-
 xmloff/source/core/xmluconv.cxx                    |    8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f84dac9b1f394b05ceabb54fc77663cd747a3148
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 8 14:34:58 2014 +0200

    back out even more wrong tools::Time changes, geez..
    
    Change-Id: I52eb3400769999d7f554c3bdb8746f65b7990388

diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 8af2d4e..293e8cf 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 188e94a..73072df 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 3cec24f..21c3213 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 ebe5914..923a82f 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 559cb3f..fa49c78 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 ce2076e..7bea9ca 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)
 {