summaryrefslogtreecommitdiff
path: root/xmloff/source/text
AgeCommit message (Collapse)AuthorFilesLines
2013-09-03fdo#68839: ODF import: fix name of multi-image frameMichael Stahl1-2/+28
When multiple image child elements are inside a frame, each one is imported and gets unique name via SwDoc::SetFlyName(). But the retained one is not necessarily the first one, which is the only one that may have the original name. Also the solveMultipleImages needs to return a smart pointer, as nothing else keeps the image contexts alive. (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) (cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35) Conflicts: xmloff/source/core/xmlmultiimagehelper.cxx xmloff/source/draw/ximpshap.cxx xmloff/source/text/XMLTextFrameContext.cxx Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6 Reviewed-on: https://gerrit.libreoffice.org/5781 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-08-20fdo#43807: Fix import of drop caps character styleZolnai Tamás1-1/+1
Export works and import has just a little typo. Change-Id: I570d70423b5a626f21117971fb7eff030eae20af (cherry picked from commit 932901224ea8473bbcae6feced953340d489bcc5) Reviewed-on: https://gerrit.libreoffice.org/5487 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-04-30Fix fdo#64062 - can't assume para styles to be there.Thorsten Behrens1-1/+1
Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a Reviewed-on: https://gerrit.libreoffice.org/3694 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-03-20fdo#60769 implement odf export of multi-paragraph comment rangesMiklos Vajna1-8/+12
(cherry picked from commits 287c254d5ebf9b58ca63a8c271e523adf0d34b82 and 1fba17854b2be4fdbe436f44da3ae57a1f75a27c) Conflicts: sw/qa/extras/odfexport/odfexport.cxx Change-Id: Ifb850438586eb6589fde79d10ed9eef727368f42 Reviewed-on: https://gerrit.libreoffice.org/2873 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-02-08Resolves: fdo#60132 Error reading file after inserting commentCaolán McNamara1-0/+5
Change-Id: Ib2b388c78c8f44a626267c2f8d3975b46ead3bd5 (cherry picked from commit 165a53f3a7f08e65055e08ecd4cfc068c5d353b8) Reviewed-on: https://gerrit.libreoffice.org/2041 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-01-18Resolves: fdo#58730 workaround [UL|LR]Space 100% problemCaolán McNamara2-1/+30
If all paragraph margins are 100% on import, ignore that as being the implicit default. That avoids explicit 100% being set onto the awesome [UL|LR]Space which takes a relative propsize of 100% as a flag that its value field is absolute and so rejected by SwTxtFmtColl::Modify as a candidate for getting its true value initialized relative to its parent, so it ends up as an absolute 0 Always elide the property on export because writing individual margin-foos provides better backward compatibility with older versions anyway. Trigged by 3c5facfce42a0dbe362d6b9fa5ac374fd76f51a1 Change-Id: I55f6ceeae287b7d8e99befa4bd3cc06738a21299 (cherry picked from commit 23c099a0236062724430efb986251637095c8d4f) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-03API CHANGE: roll back the XStyle changes to add a new Hidden property on StyleCédric Bosdonnat2-2/+5
Change-Id: If6d23925567fb184cd8fc4e00fc72fe4d216e756
2012-11-30Hidden styles: ODF import/exportCédric Bosdonnat2-1/+3
Change-Id: I1138314eba33dc8cf8d1f60e77ac419b4550bbcc
2012-11-28OUString::trim() does not modify in-placeTor Lillqvist1-2/+2
Change-Id: I68227dcf77b9082708503d2c0d9bf829d78a442e
2012-11-27String and OUString cleaning in xmloffNorbert Thiebaud1-88/+93
Change-Id: I85d7fd7733814c60a048a7f87d43fbcbb83b0eb0
2012-11-15re-base on ALv2 code. Includes:Michael Meeks59-1359/+829
Patches contributed by: Armin Le Grand. #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task. http://svn.apache.org/viewvc?view=revision&revision=1195906 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles http://svn.apache.org/viewvc?view=revision&revision=1293316 #119337# Solves the wrong get/setPropertyValue calls in SvxShapeText (and thus in SvxOle2Shape) http://svn.apache.org/viewvc?view=revision&revision=1344156 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117717#: remove wrong assertion http://svn.apache.org/viewvc?view=revision&revision=1172349 Patch contributed by Herbert Duerr goodbye Registration and License dialogs, don't let the door hit you http://svn.apache.org/viewvc?view=revision&revision=1172613 help gcc 4.6.0 on 32bit ubuntu 11.10" http://svn.apache.org/viewvc?view=revision&revision=1245357 Do not add targets for junit tests when junit is disabled. Patch contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1241508 Revert "sb140: #i117082# avoid unncessary static class data members commit 21d97438e2944861e26e4984195f959a0cce1e41. remove obsolete FreeBSD visibility special case. retain consolidated BSD bridge code, remove OS/2 pieces.
2012-11-09s/aIter++/++aIter/jailletc361-1/+1
Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd Signed-off-by: jailletc36 <christophe.jaillet@wanadoo.fr> Reviewed-on: https://gerrit.libreoffice.org/1016 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2012-11-06re-base on ALv2 code. Includes (at least) relevant parts of:Michael Meeks3-75/+140
linecap: Reintegrating finished LineCap feature Patch contributed by Regina Henschel http://svn.apache.org/viewvc?view=revision&revision=1232507 Patches contributed by Sven Jacobi impress212: #i81610# fixed animation export http://svn.apache.org/viewvc?view=revision&revision=1167620 impress212: drawinglayer gbuild environment changes http://svn.apache.org/viewvc?view=revision&revision=1167627 http://svn.apache.org/viewvc?view=revision&revision=1167628 impress212: DffPropSet -> minor code improvements, removing table http://svn.apache.org/viewvc?view=revision&revision=1167634 impress212: #158494# fixed excel import (text rotation) http://svn.apache.org/viewvc?view=revision&revision=1167638 Patches contributed by Armin Le Grand Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement http://svn.apache.org/viewvc?view=revision&revision=1220836 #118728# changed indentifying definitions for Svg file detection http://svn.apache.org/viewvc?view=revision&revision=1229961 #118838# LineGeometry creation for complicated cases optimized to create single Polygons http://svn.apache.org/viewvc?view=revision&revision=1236232 #119176# corrected file type detection for SVG for svg files without xml header http://svn.apache.org/viewvc?view=revision&revision=1309445 #118728# Extended Svg file detection http://svn.apache.org/viewvc?view=revision&revision=1230531 #118529# solve break converters and convert commands for OLEs and images http://svn.apache.org/viewvc?view=revision&revision=1186168 svg: added WaE changes from branch svgreplacement to trunc http://svn.apache.org/viewvc?view=revision&revision=1222974 svg: corrected missing member initialization http://svn.apache.org/viewvc?view=revision&revision=1226134 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles to bitmapEx ... http://svn.apache.org/viewvc?view=revision&revision=1293316 fix for #118525#: removed no longer used variable maOriginalMapMode, one more exception eliminated http://svn.apache.org/viewvc?view=revision&revision=1227097 #16758# Added buffering to the VDev usages of the VclProcessor2D derivates... http://svn.apache.org/viewvc?view=revision&revision=1229521 #116758# Secured VDev buffer device to Vcl deinit http://svn.apache.org/viewvc?view=revision&revision=1230574 #116758# added remembering allocated VDevs for VDevBuffer to be able to also delete these when vcl goes down; it should never happen, but You never know http://svn.apache.org/viewvc?view=revision&revision=1230927 #118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive representation instead of TransparencePrimitive2D http://svn.apache.org/viewvc?view=revision&revision=1231198 #118822# secured 3D geometry creation (slices) by subdividing the 2D source polyPolygon early http://svn.apache.org/viewvc?view=revision&revision=1234749 #118829# enhanced Svg gradient quality, obstacles avoided http://svn.apache.org/viewvc?view=revision&revision=1235361 #118834# Unified usage of TextBreakupHelper as single tooling class for i18n text primitive breakup http://svn.apache.org/viewvc?view=revision&revision=1236110 #118853# added square pixel size limit to conversion of TransparencePrimitive2D to Metafile action http://svn.apache.org/viewvc?view=revision&revision=1237656 #118824# coreccted mirroring and boundrect when the graphicmanager is used for bitmap output http://svn.apache.org/viewvc?view=revision&revision=1240097 #115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for various optimization scenarios http://svn.apache.org/viewvc?view=revision&revision=1241434 #118783# Corrected errors in ID strings, corrected Svg line/fill export, corrected polygon close state http://svn.apache.org/viewvc?view=revision&revision=1232006 #118796# corrected null-pointer usage in SVG text exporter http://svn.apache.org/viewvc?view=revision&revision=1240262 #118729# Use GraphicStreamUrl and GraphicUrl to allow multi image import with linked graphics, too http://svn.apache.org/viewvc?view=revision&revision=1229962 #118898# corrected error in GDIMetaFile::GetBoundRect in handling MetaFloatTransparentAction http://svn.apache.org/viewvc?view=revision&revision=1293349 #118855# Corrected handling of possibly created empty clipRegions after PolyPolygon clipping http://svn.apache.org/viewvc?view=revision&revision=1237725 #115962# Better (but not yet optimal, see comments in task) handling of MetaFloatTransparentAction in PDF export http://svn.apache.org/viewvc?view=revision&revision=1241078 IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ... http://svn.apache.org/viewvc?view=revision&revision=1200879 118779# Added svg content streaming in/out to ImpGraphic stream operators http://svn.apache.org/viewvc?view=revision&revision=1231908 linecap: correctons for WaE and mac drawing http://svn.apache.org/viewvc?view=revision&revision=1232793 svg: uses current system Dpi for Svg replacement image creation http://svn.apache.org/viewvc?view=revision&revision=1233948 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1396797 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1394326 Remove duplicate header includes. cws mba34issues01: #i117720#: convert assertion into warning http://svn.apache.org/viewvc?view=revision&revision=1172352 118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand. http://svn.apache.org/viewvc?view=revision&revision=1182166 cws mba34issues01: #i117714#: remove assertion http://svn.apache.org/viewvc?view=revision&revision=1172357 Patch contributed by Jurgen Schmidt add some additional checks to ensure proper reading operations http://svn.apache.org/viewvc?view=revision&revision=1209022 mostly prefer our stream / bounds checking work. Patches contributed by Herbert Duerr #i118816# add clarifying comment regarding Font::*Color*() methods http://svn.apache.org/viewvc?view=revision&revision=1233833 extend macro->string handling for empty strings http://svn.apache.org/viewvc?view=revision&revision=1175801 avoid magic constants for SALCOLOR_NONE http://svn.apache.org/viewvc?view=revision&revision=1177543 initialize slant properly in ImplFontMetricData constructor (author=iorsh) http://svn.apache.org/viewvc?view=revision&revision=1177551 #i118675# make check for extension updates more stable http://svn.apache.org/viewvc?view=revision&revision=1214797 #a118617# remove VBasicEventListener.dll binary There are no known users depending on its CLSID http://svn.apache.org/viewvc?view=revision&revision=1203697 Patches contributed by Ariel Constenla-Haile Fix build breaker on Linux/gcc http://svn.apache.org/viewvc?view=revision&revision=1221104 Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG http://svn.apache.org/viewvc?view=revision&revision=1215559 Patches contributed by Oliver-Rainer Wittmann sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider instances of <SwFlyDrawObj> http://svn.apache.org/viewvc?view=revision&revision=1172120 sw34bf06: #i117783# - Writer's implementation of XPagePrintable - apply print settings to new printing routines http://svn.apache.org/viewvc?view=revision&revision=1172115 gnumake4 work variously from Hans-Joachim Lankenau http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 http://svn.apache.org/viewvc?view=revision&revision=1396782 http://svn.apache.org/viewvc?view=revision&revision=1394707 plus some amount of re-splitting of legacy headers. Patch contributed by Pavel Janik WaE: Remove unused variables. http://svn.apache.org/viewvc?view=revision&revision=1230697 Patches contributed by Takashi Ono mingwport35: i#117795: MinGW port fix for vcl2gnumake http://svn.apache.org/viewvc?view=revision&revision=1172091 mingwport35: i#117795: MinGW port fix for vcl2gnumake http://svn.apache.org/viewvc?view=revision&revision=1172091 Patch contributed by Christian Lippka impress212: #i98044# re enable Text menu for outline and title shapes http://svn.apache.org/viewvc?view=revision&revision=1167639 Patch contributed by Andre Fischer 118674: Made category B code optional and disabled by default. http://svn.apache.org/viewvc?view=revision&revision=1215131 118881: Ignore empty paragraphs after bullets. http://svn.apache.org/viewvc?view=revision&revision=1296205 Patches contributed by Philipp Lohmann ooo340fixes: #i117780# use rtl allocator http://svn.apache.org/viewvc?view=revision&revision=1172087 ooo34gsl02: #i117807# fix an off by one error (index actually inside the pfb section header) http://svn.apache.org/viewvc?view=revision&revision=1167576 various cleanups, related compilation fixes, warning cleanups, re-working of obsolete stl template pieces to use boost instead, changed string classes, re-adapt KDE about data, about dialog, fixing warnings, and other fixes & improvements. Disable svg import / render for about/ branding code-paths for now. Restore full icon theme set. Remove OS/2 conditionals and sources. Remove conflicting gtk/full-screen monitors support. Retain existing svg rasterizer files - temporarily disabled. Standardize stringificaiton and fixup dllpostfix issues. Rename SvgGradientHelper::== to equalTo to avoid overloading issues. Use the flat GdiPlus API for LineCaps calls.
2012-11-03xmloff: drop unused OUStringsMiklos Vajna1-9/+0
Change-Id: I040e9a5c9e60a27aa82fd624cc01edfecf5cc8de
2012-10-12mark lcl_ functions static or rename them if they are not local at allLuboš Luňák7-10/+10
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html Change-Id: I37ab7e25d1a9fcce2009b8e35535fc1d0b02013b
2012-10-02don't blow up on .odt export with !hasValue footers/headersCaolán McNamara1-6/+8
Change-Id: I2507c23b7b17b9172f720548d32cdfe299d4fa20
2012-09-14fdo#49571: ODF import: ignore "text:enable-numbering" attributeMichael Stahl1-1/+0
It has been imported as an alien attribute since CWS impressodf12 5b364c2e8baf9b1f6bbe611c0fd6895a88056afc, and could not be written to a document created from scratch anyway. Change-Id: I054fcf71d7ddc3ed19735b8aa898d1b1a12db5b9
2012-09-14fdo#49677: ODF export: always add xlink:type attributeMichael Stahl1-0/+1
The xlink:type was optional on text:a and draw:a elements in ODF 1.1 but is mandatory in ODF 1.2 Change-Id: Ifc7301ed1b0120d31a156751888dea1a55e952fe
2012-09-14fdo#30711: ODF export: "text:name" is mandatory on bookmarks:Michael Stahl1-16/+53
XMLTextParagraphExport: Add a mapping that generates names for those field marks that don't have a name so validators don't complain. (regression from 7a1c5e54afe4e4ef7e17c2e9c969cd41221edc28) There is still the problem that we cannot easily guarantee that the names (generated or from some field param) do not clash with the names of actual bookmarks... Change-Id: I9ed65b94b3e8f725db4354222f2565176b32be52
2012-08-16-Werror,-Wunused-private-field (Clang towards 3.2)Stephan Bergmann6-30/+20
Change-Id: I4b877ab97259f7e031e34daf7ce93e1b59417a08
2012-08-10Prefer prefix ++/-- operators for non-primitive typesJulien Nabet1-2/+2
Change-Id: Ic8d149a78b2bc2bf352b7893202d0d0b6730746c
2012-08-10fdo#39468: Translate German comments in toolkit,unotools, & xmloffOliver Günther1-1/+1
Also checked the following with bin/find-german-comments (all false positives): - sysui - xml2cmp - udm - ucb Change-Id: I2c72f973f5cecf56d70b5419e56338170dd55a2e
2012-08-02STL'ify DECLARE_CONTAINER_SORT(XMLTextListAutoStylePool_Impl)Noel Grandin1-44/+37
Change-Id: Ib9aa0e619434acde5b4dd93b43b231ba23adb63e
2012-08-01convert SvXMLAutoStylePoolNamesP_Impl to a std::setCaolán McNamara1-23/+3
Change-Id: I839edf8d0e941f78f6f6f9e6a9117f76587a5f39
2012-07-30remove unnecessary includes of svl/svarray.hxxCaolán McNamara3-3/+0
Change-Id: Ifec201efc4e97baf2d36d66c4ae6967eadd6134c
2012-07-25delete svl/svstdarr.hxxMichael Stahl2-2/+1
Change-Id: Ia3d1d8dbe100443410b80c3881f10ab51b2d0419
2012-07-20office:annotation-end importMiklos Vajna2-5/+63
Change-Id: I8d1475b5bc9a36dade5ce28e74139834c69f8e14
2012-07-20office:annotation-end exportMiklos Vajna2-4/+34
Change-Id: Idd815f2d10e67ae9cf91f06b6b4c92a0ebe2e856
2012-07-16xmloff: implement import/export of SwPostItField::aInitialsMiklos Vajna2-0/+23
Change-Id: Ie28e8e4c2e80d9234cf1ec2ca43dd200cf1d56cb
2012-07-10xmloff: kill RTL_CONSTASCII_USTRINGPARAM in rebased codeMiklos Vajna6-41/+35
Change-Id: I3d5227c299d78d4492c47e29385c2c5ca25cfe49
2012-07-09merge HeaderIsSharedFirst and FooterIsSharedFirst to FirstIsSharedMiklos Vajna2-13/+4
sw document model, xmloff and offapi supported these separately, but sw layout did not. It turns out it's not needed for Word interop, either, so better to just merge these, instead of implementing them independently without a good use-case. Change-Id: I5c3b334baa09cabec123745c7af3d65d830754fc
2012-07-08removed unused includesTakeshi Abe1-1/+0
Change-Id: I248ef370c55c18d60a8ea32ef92f70734bffbaf2
2012-07-05xmloff: unused includes in txtimpMiklos Vajna1-22/+0
Change-Id: I0a4feed51067f6b222d60f569dd794f2439fc790
2012-07-05xmloff: implement first page header/footer import/exportMiklos Vajna4-16/+111
Change-Id: I920c236125ae044fe66cf0eacafdfc94ef81a4fd
2012-07-02Remove unused definesThomas Arnhold1-4/+0
Some of them were commented out for documentation purpose. Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
2012-06-29Remove include guardsThomas Arnhold3-7/+0
Change-Id: Ib4ba76d0083e5bd75cc589a55318089c004f591f
2012-06-27removed unnecessary forward declarations of classTakeshi Abe4-9/+0
except moving SvXMLStyleContext into xmloff/source/forms/layerimport.hxx Change-Id: I5e16b54f98ccdd54bc0bb373d3fe92ed1bef3c5e
2012-06-22re-base on ALv2 code.Michael Meeks3-69/+42
Change-Id: I8018d9b5fa01d1720c0392dc5fdc4a0656f25a35
2012-06-21re-base on ALv2 code.Michael Meeks71-1669/+1030
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-12fix invalid vector.push_back(vector.back())Michael Stahl1-3/+6
The vector::back() does not return a value but a reference, hence this is invalid. Change-Id: I8624b649deb8fb4de0d1d8af1288068acc80cef2
2012-06-09Remove superfluous empty lines on topThomas Arnhold14-28/+0
More than two lines are removed for readability. Change-Id: Ibff6cf68d7c512e240a54065b54a225bb23a782b
2012-06-05fdo#30711: fix some problems in 7a1c5e54:Michael Stahl1-29/+20
The elements are exported without checking for bAutoStyles, and the Any conversion is overly verbose. Change-Id: Iebb52c8cd2638424dd48d28ec5a12c10a41f6cbf
2012-06-05Fix fdo#50704 Default to absolute svg:d paths for ODF1.2 compat-modeThorsten Behrens1-1/+1
This writes out absolute paths, to side-step buggy odf consumers' wrong handling of the 'z' statement (i.e. they ignore it for current positions).
2012-06-05Add ODF1.2 extended-but-more-compatible modeThorsten Behrens1-5/+5
With several legacy pre-ODF1.2 and ODF1.2-only consumers out there, folks wanted a more backward-compatible ODF1.2 extended mode, that uses stuff deprecated in 1.2, and/or is 'bug-compatible' to older OOo-versions. Therefore, adding ODFVER_012_EXT_COMPAT, and sticking it to several attributes that were ODFVER_LATEST before.
2012-06-05Unify ODF extended vs. ODF1.2 handlingThorsten Behrens1-3/+3
Make "export extended ODF" consistently mean "version > ODF1.2". Future ODF versions need manual review anyway, of the various changes/additions we ship. Change-Id: I0f6c1646b306e18f0abcdd1a1802fece821b2e93
2012-06-04nuke unused definesTakeshi Abe1-3/+0
Change-Id: I7924da4bff73ca8f82c76eb8cb211401530acdeb
2012-06-02targeted string re-workNorbert Thiebaud8-378/+345
Change-Id: I342f1b8ac6c8205b6c587578a6b10a6ca51758fa
2012-05-19Fix Prefer prefix ++/-- operators for non-primitive typesJulien Nabet1-1/+1
Change-Id: I4ebb1027151c3bc34f81fb1e13de6c4c5cfed54d
2012-04-18loop with erase(begin()) looks sort of inefficientMichael Stahl1-4/+3
2012-04-18Convert SV_DECL_PTRARR to std::vectorNoel Grandin1-9/+6