[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

Miklos Vajna vmiklos at collabora.co.uk
Thu Mar 26 01:26:21 PDT 2015


 oox/source/core/xmlfilterbase.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 31433d007cce7d36897277a875c25c5b102e15aa
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Mar 2 08:40:20 2015 +0100

    tdf#89774 oox: TotalTime is in minutes
    
    (cherry picked from commit 302f413eec4da8c8572911d08e939186c5ac57cf)
    
    Conflicts:
    	sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
    
    Change-Id: Ie65a8adbd077997f4a13914dd8e0ba4d55afd7b7
    Reviewed-on: https://gerrit.libreoffice.org/15017
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 3b807df..3a089ad 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -648,7 +648,8 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
     writeElement( pAppProps, XML_Slides,                "slides" );
     writeElement( pAppProps, XML_Notes,                 "notes" );
 #endif  /* def OOXTODO */
-    writeElement( pAppProps, XML_TotalTime,             xProperties->getEditingDuration() );
+    // EditingDuration is in seconds, TotalTime is in minutes.
+    writeElement( pAppProps, XML_TotalTime,             xProperties->getEditingDuration() / 60 );
 #ifdef OOXTODO
     writeElement( pAppProps, XML_HiddenSlides,          "hidden slides" );
     writeElement( pAppProps, XML_MMClips,               "mm clips" );


More information about the Libreoffice-commits mailing list