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

Miklos Vajna vmiklos at collabora.co.uk
Thu May 22 01:38:53 PDT 2014


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

New commits:
commit b5e0ea4ae944482f43de447668758348ce0251c4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu May 22 10:22:43 2014 +0200

    oox: fix export of OOXML generator info
    
    This time we did preserve this info, and we should not.
    
    Change-Id: If2ddd7a266cd7da5642dc234411ce34e94bd3384
    (cherry picked from commit 3bebb3c2d25601767e950de02f2d549acbdaa2d2)

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 14d50fc..746ba2e 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <unotools/mediadescriptor.hxx>
+#include <unotools/docinfohelper.hxx>
 #include <sax/fshelper.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -658,7 +659,7 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
     writeElement( pAppProps, XML_HyperlinksChanged,     "hyperlinks changed" );
     writeElement( pAppProps, XML_DigSig,                "digital signature" );
 #endif  /* def OOXTODO */
-    writeElement( pAppProps, XML_Application,           xProperties->getGenerator() );
+    writeElement( pAppProps, XML_Application,           utl::DocInfoHelper::GetGeneratorString() );
 #ifdef OOXTODO
     writeElement( pAppProps, XML_AppVersion,            "app version" );
     writeElement( pAppProps, XML_DocSecurity,           "doc security" );


More information about the Libreoffice-commits mailing list