summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-05-22 10:22:43 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-05-22 10:38:29 +0200
commitb5e0ea4ae944482f43de447668758348ce0251c4 (patch)
tree885f62c525fff04725c882d5b2be3e732a15c774 /oox
parent9ec248e390f3384cbd1ff86f0f69af27ec1e8823 (diff)
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)
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/xmlfilterbase.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 14d50fc0f3c6..746ba2ed913b 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" );
class='logsubject'>Remove excess newlinesChris Sherlock A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> 2015-11-115th step to remove tools/rtti.hxxOliver Specht tools/rtti.hxx removed completed the interface of some Sdr.* Items and removed pseudo items Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a Reviewed-on: https://gerrit.libreoffice.org/19837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> 2015-03-26const_cast: convert some C-style casts and remove some redundant onesStephan Bergmann Change-Id: Ic90647cc4da716b54b00520b683cee027a664c22 2014-11-23fdo#85486 - Clean up unnecessary enumerations from xenum.hxxRadu Ioan Removed XLineStyle Reviewed on: https://gerrit.libreoffice.org/13029 Change-Id: I583575a04988ccf932374e411672ba14a3f3cb2f 2014-10-28Move these headers from include to svx; they are not used outside svx.Kohei Yoshida Change-Id: I8685b451a39e890250a3309ddb70346bac4084b2 2014-10-20loplugin: cstylecastNoel Grandin Change-Id: Ia3055b00c20a885dfa0584f864f0e91ccad1e9c9 2014-09-06SfxHint: convert home-grown RTTI to normal C++ RTTINoel Grandin Also note that I fixed a bug in SvxFontMenuControl::Notify where the if statement had the check the wrong way around. Change-Id: I611e8929c65818191e36bd80f2b985820ada4411 Reviewed-on: https://gerrit.libreoffice.org/11147 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> 2014-08-05Let GetObjectItemPool return a referenceStephan Bergmann Change-Id: Ibbcfa3452afcf88dbb6050765e081a1be2381334 2014-07-19XFillStyle -> css::drawing::FillStyleMiklos Vajna Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4 2014-03-11svx: sal_Bool->boolNoel Grandin Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7 2014-02-26Remove visual noise from svxAlexander Wilms Change-Id: I56497d953b0500ba0967fddb36ca8bbbe86c62ad Reviewed-on: https://gerrit.libreoffice.org/8321 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> 2013-07-02fdo#62699 drop pass-through header svx/svdattrx.hxxThomas Arnhold includes some sorting of the includes Change-Id: Iba41991552674f76b902dbc7b4b3ada992aee69e Reviewed-on: https://gerrit.libreoffice.org/4626 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> 2013-04-19fdo#62699: Drop wrapper headerMarcos Paulo de Souza Change-Id: I21e91ab136c944c6dc77a90500b1bcebbf7cf851 Reviewed-on: https://gerrit.libreoffice.org/3473 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> 2013-04-07sal_Bool to boolTakeshi Abe Change-Id: Iac3b6fbe42ae0ffd9229935b46d1352987f99596 2013-02-12Renamed hard-to-remember 8-char headers in editeng.Kohei Yoshida Change-Id: If255802082890e1b1b4c5197a791fa79a011773e 2012-11-27re-base on ALv2 code. Includes:Michael Meeks Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes. 2012-08-07drop bogus eof linesThomas Arnhold Change-Id: Idda2852c3e96ce15fde75d5a95369ec50a012410 lves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate