summaryrefslogtreecommitdiff
path: root/writerperfect/source/writer/exp
AgeCommit message (Collapse)AuthorFilesLines
2019-05-31EPUB export: fix not properly paired openPageSpanMark Hung6-11/+23
Fix the test case converting abi11105.abw to EPUB file. ( the attachment at <https://bugzilla.abisource.com/show_bug.cgi?id=11105#c1> ) soffice.bin: .../sax/source/expatwrap/saxwriter.cxx:1184: virtual void (anonymous namespace)::SAXWriter::endElement(const rtl::OUString &): Assertion `aName == m_pSaxWriterHelper->m_DebugStartedElements.top()' failed. We used to invoke handlePageSpan when starting a paragraph or a table element that has master-page-name defined in the referred style, and invoke closePageSpan when XMLBodyContentContext. Limit the handling of page span to top-level paragraph or tables so that it doesn't messed up in the nested ( paragraph that changed it's page style in a table cell ) case. Change-Id: Ic8637663aaa7506ced9758bd7ccd7233309e8557 Reviewed-on: https://gerrit.libreoffice.org/73214 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-17EPUB export: make member variable privateMiklos Vajna14-174/+193
In most cases these were public without a good reason, in other cases setter / getters are added. Change-Id: Id6c1032189db1bba211344162e737dabf7ff3f07 Reviewed-on: https://gerrit.libreoffice.org/70842 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-10-04drop SvMemoryStream::GetBufferNoel Grandin2-4/+4
since it does the same thing as GetData() Change-Id: I18d35aa4e67ad7775987160c021863d0de90179b Reviewed-on: https://gerrit.libreoffice.org/61350 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-07-12Add missing sal/log.hxx headersGabor Kelemen5-0/+10
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes. This commit adds missing headers to every file found by: grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG') to directories w* x* Change-Id: I27bff44da3d34d24262031c7489e755311599bc5 Reviewed-on: https://gerrit.libreoffice.org/57307 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-05-28loplugin:unusedmethodsNoel Grandin2-6/+0
Change-Id: I64df1f467986b3d70c058adff289a6dd8f00fb20 Reviewed-on: https://gerrit.libreoffice.org/54821 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-05-18Fix some IWYU warningsMiklos Vajna1-3/+22
Change-Id: I11d874caad9174fb1a70121f1772e117753ee519 Reviewed-on: https://gerrit.libreoffice.org/54503 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-05-10writerfilter, writerperfect: various small cleanupsMiklos Vajna1-1/+0
Change-Id: Iea26b73bd91ed178cc4f2279c23246d79f48a6be Reviewed-on: https://gerrit.libreoffice.org/54063 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-04-26tdf#116822 export ruby text and base text to epub.Mark Hung1-0/+85
Backport aa254c9e6f2d1ecfa2512111746a77c05ba9717f from libepubgen, implement XMLRubyContext, XMLRubyTextContext, XMLRubyBaseContext. Character formats of ruby text, ruby alignment, and ruby position are not implemented yet. Change-Id: I6c3708e6bc8e9e36a68171a037fd393f45d8d34f Reviewed-on: https://gerrit.libreoffice.org/53408 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-20writerperfect: astyle -> clang-formatMiklos Vajna28-679/+816
< vmiklos> dtardon: are you strongly attached to astyle usage in core.git writerperfect/? my problem is that 1) when less regular contributors touch it, they don't run astyle 2) core.git has git hooks in place to enforce consistent style for selected files, but that uses clang-format. i wonder if switching to the standard core.git clang-format would be an option to stop this reformat game <@dtardon> vmiklos, clang-format is okay. we started to use astyle years ago, before there were even any serious talk about automatic formatting for the whole libreoffice Change-Id: I844fc9c2e8560e54a49f26064cc0b3c55a5f034c Reviewed-on: https://gerrit.libreoffice.org/53184 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-04-11writerperfect: fix whitespaceMiklos Vajna2-3/+9
Be consistent with surrounding code. Change-Id: I86eb3a663a54a63c850ada229ea24d9c770365df Reviewed-on: https://gerrit.libreoffice.org/52708 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-04-10tdf#115623: invoke openPageSpan / closePageSpanMark Hung7-0/+50
* For paragraphs or tables whose styles specify style:master-page-name, it indicate starting a new page style and should invoke openPageSpan / closePageSapn properly. * closePageSpan at the end of text body is invoked. Change-Id: Ic85157c9b1a43c94a027b464ad9105e9072afcf7 Reviewed-on: https://gerrit.libreoffice.org/52082 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-09use more DBG_UNHANDLED_EXCEPTIONNoel Grandin1-6/+7
so we get nice logs of the exception dynamic type for UNO exceptions. Change-Id: Ic0b10dc14d354a2c9a0591b3a51d2f1640d54bdb Reviewed-on: https://gerrit.libreoffice.org/52465 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-04-08tdf#115623: EPUB export: support style:master-pageMark Hung6-2/+29
Change-Id: I12d04c2e346c5202274a01b1f8950e3412dc9081 Reviewed-on: https://gerrit.libreoffice.org/52081 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-05tdf#115623: EPUB export: handle style:page-layoutMark Hung6-3/+62
handle style:page-layout XMLPageLayoutPropertiesContext, store style:writing-mode so that it can be processed in libepubgen. Change-Id: Id997ef84a39bd3321d678ea23c5d1b9101297b34 Reviewed-on: https://gerrit.libreoffice.org/52080 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-09loplugin:redundantfcast look for unnecessary temporariesNoel Grandin1-1/+1
when calling methods that take a const& Change-Id: Idf45dfd9fea0de6fae0b1f89550f2f7fc302aa15 Reviewed-on: https://gerrit.libreoffice.org/50970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-02-27astyleDavid Tardon2-30/+30
Change-Id: I3ea599f491a464458865ce42930be4728ede5dc9
2018-02-12EPUB export: pick up XMP metadata from 'metadata.xmp'Miklos Vajna1-2/+1
This used to be <filename>.xmp, but that's inconsistent with how cover image is not <filename>.jpg but cover.jpg (or .png, etc). Also it was redundant, since these files are in the media directory, for which the default is the <filename> directory. Change-Id: Iadfebf2f9c336f443537759b1e58409a93e1c51d Reviewed-on: https://gerrit.libreoffice.org/49604 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-23EPUB export, fixed layout: add chapter names to the navigation documentMiklos Vajna2-14/+35
Extend vcl::PDFExtOutDevData so that it's possible to use it outside the PDF export; this way the EPUB export can know which chapters start on which page. This means fixed and reflowable layout has the same table of contents, instead of just Page <N> in the fixed layout case. Change-Id: I935fb23c66ec747431b91e83b0e677d4e5f704b9 Reviewed-on: https://gerrit.libreoffice.org/48332 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-19EPUB export UI: show title from the doc modelMiklos Vajna1-1/+1
It was a bit confusing that the doc model had a title set, it was written to the EPUB file but the UI did not show it. Change-Id: Ife408e0dabd3fe48e8acc1f09be0c86f78ed4b80 Reviewed-on: https://gerrit.libreoffice.org/48150 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-19EPUB export: accept relative links for image popup from default media dirMiklos Vajna1-4/+18
Previously: - the user had to copy the linked image to the same dir as the doc - set a relative link on the image (in ODF, it resulted in "../foo.png") - copy the image to the media dir ("test" by default for "test.odt") - export to EPUB to have the image popup Now, additionally: - relative link may point to the default media dir (in ODF, it results in "../test/foo.png") - no need to copy the image - export to EPUB creates the popup So one less step is necessary. The downside is that this way the relative URL contain the base name of the document, so renaming the document breaks these relative links. Change-Id: I93894a28393d36a33dcec7bfe7c4a54fd83768da
2018-01-19EPUB export: fix validation error on invalid relative linksMiklos Vajna3-28/+56
It's valid to have a relative link that points nowhere in ODF, but the same is not true for EPUB. Change-Id: I7884032e277a0c53d0c513cea70dd2ee29ccd85c
2018-01-17EPUB export: various small cleanupsMiklos Vajna3-22/+20
Change-Id: Iaa921257720adc6a65c8598b1105a4d7249778e6 Reviewed-on: https://gerrit.libreoffice.org/48021 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-04tdf#42949 Fix some more Include What You Use warningsMiklos Vajna9-7/+14
Change-Id: I2040315707674dc99a37aedb96ac61dca274c13a Reviewed-on: https://gerrit.libreoffice.org/47348 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-12-07loplugin:constparamsNoel Grandin1-2/+2
Change-Id: Ia322ecf8f80b28c58ec33d17ca9607401a92534b Reviewed-on: https://gerrit.libreoffice.org/45959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-04EPUB export, fixed layout: remove old non-metafile-based page size approachMiklos Vajna7-184/+3
This was unused code. Change-Id: I7f728544127dc283cd74e4425e699d598caeae1a Reviewed-on: https://gerrit.libreoffice.org/45649 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-04EPUB export, fixed layout: disable DTD string in SVG headerMiklos Vajna1-1/+5
epubcheck complains: ERROR(HTM-003): test.epub/OEBPS/images/image0001.svg(5675,37): External entities are not allowed in EPUB v3 documents. External entity declaration found: %svg-extensibility.mod. and similar ones. Just not writing the DTD header is enough to address the error. Change-Id: I5307e932a0f07585297cce734aceae77e43cc7a6 Reviewed-on: https://gerrit.libreoffice.org/45648 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-04EPUB export, fixed layout: switch to a metafile-based approachMiklos Vajna2-17/+96
Trying to guess layout from flat ODF output is an approach that doesn't scale, think of complex documents with split tables, etc. Do it similar to the PDF export instead: take a metafile of each page and use the existing SVG writer to embed it into XHTML. Change-Id: I6e860834beb8025519d3e367f858077ae9e9c006 Reviewed-on: https://gerrit.libreoffice.org/45647 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-01EPUB export: handle page size in fixed layoutMiklos Vajna7-12/+198
Requires parsing master pages and page layouts. Change-Id: Ia8b9e59a9355396d3776af06e8e67ec88033754b Reviewed-on: https://gerrit.libreoffice.org/45645 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-01-Werror,-Wunused-private-fieldStephan Bergmann2-3/+1
Change-Id: Ia265d565bbc6b9e4c03aa9be66916b926b54bed8
2017-12-01EPUB export: handle custom media dir in cover image / XMP metadataMiklos Vajna1-53/+35
By changing the default to <media dir>/cover.<extension> and <media dir>/<basename>.xmp. Change-Id: I736aefafba5aa5208917d9ed40119ca7721cdde3 Reviewed-on: https://gerrit.libreoffice.org/45604 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-01EPUB export: allow setting custom media dir explicitlyMiklos Vajna2-10/+35
The default is the same <base directory>/<base name>/ as before. Change-Id: Idb500193a7f6bd901d861e857147832a3ada91d3 Reviewed-on: https://gerrit.libreoffice.org/45602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-01EPUB export: support image popup for images and textMiklos Vajna3-1/+63
Handle relative links on image / text as data for a popup. Pick the images up from <base directory>/<base name>/<relative url> as a start. Change-Id: I9b6183d554e3792aa71dfffc19a671a0e4c302cc Reviewed-on: https://gerrit.libreoffice.org/45601 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-01EPUB export: handle footnotesMiklos Vajna3-0/+169
Stringly speaking just linking from the main text to the footnote content would be enough from an EPUB point of view, but let's do the other direction as well, since Writer provides that. Change-Id: Iba366ef11a8375347d57a650c57baf8e8002e820 Reviewed-on: https://gerrit.libreoffice.org/45600 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-12-01EPUB export: don't loose images with linksMiklos Vajna1-0/+68
And actually handle the link around the image. Change-Id: Ic9b7b9497becf677dbf550c67074c5c588ef8922
2017-11-30EPUB export: allow setting custom metadata explicitlyMiklos Vajna3-26/+70
If not set, fall back to the existing auto-find. The testcase now asserts that the priority is: - api - if that is not set, then xmp - if that is not set, then doc (And at the end libepubgen itself has some defaults as well.) Change-Id: Ie8fc646b81c4a287690fd2eeed43f4786b7938bf Reviewed-on: https://gerrit.libreoffice.org/45552 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-30EPUB export: allow overwriting of document metadataMiklos Vajna4-19/+222
Pick up overrides from <base directory>/<base name>.xmp as a start. Change-Id: Ib64a6bbdadc53633fb1f0d4a7efdde2e3c96b5ef Reviewed-on: https://gerrit.libreoffice.org/45551 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-29EPUB export: allow setting a custom cover image explicitlyMiklos Vajna1-3/+31
If not set, fall back to the existing auto-find. Change-Id: I5df7a535e4132a18a803c10fa0e06352d9b6b533
2017-11-29EPUB export: add support for cover imagesMiklos Vajna3-2/+96
Pick them up from <base directory>/<base name>.cover-image.<ext> as a start. Change-Id: Ie5ee7c02d6b3271e6e850ca9a2a10ed0bb4a598d Reviewed-on: https://gerrit.libreoffice.org/45483 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-29EPUB export: implement font embedding supportMiklos Vajna5-2/+207
Also avoid librevenge::RVNGBinaryData::appendBase64Data() for performance reasons. Times with and without the XMLBase64ImportContext rework for sw/qa/extras/odfexport/data/embedded-font-props.odt: - before: 1m32.254s - after: 0m7.045s (Need to insvestigate macOS font embedding situation in general, later.) Change-Id: I5aa56bfbfa8dc64f19c021202a1b87618b4b2775 Reviewed-on: https://gerrit.libreoffice.org/45385 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-27EPUB export: fix char props of <text:sequence> charactersMiklos Vajna1-4/+11
These are typically inherited from parent, <text:sequence> is similar to e.g. <text:span> in this regard. Change-Id: Ic84f6e2e4fc6866ffca23eef2c932ee63e6978ca Reviewed-on: https://gerrit.libreoffice.org/45314 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-27EPUB export: handle sequence fieldsMiklos Vajna1-0/+26
Just emit their expanded content for now. Change-Id: Ibca40d201dde9c8d6ef920b5213f786f64d7c027 Reviewed-on: https://gerrit.libreoffice.org/45313 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-27EPUB export: handle non-image framesMiklos Vajna1-0/+36
TextFrame on the Writer UI. Change-Id: I755fde113ef86a656b7f1f39c02642c22a5a6102 Reviewed-on: https://gerrit.libreoffice.org/45310 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-27EPUB export: handle horizontal left/right positioning of non-as-char imagesMiklos Vajna1-0/+1
The change in XMLStyleContext::startElement() just makes sure that properties from the parent graphic styles are read, but currently it's just a nice-to-have addition, we don't depend on this yet, so no test. Change-Id: Ieac599dd47049edea57cb0860aa483f1045b47fd Reviewed-on: https://gerrit.libreoffice.org/45308 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-27EPUB export: handle images outside spansMiklos Vajna1-2/+2
CreateParagraphOrSpanChildContext() is already a factory for paragraph-or-span parents, just move image handling there. Change-Id: Ieeb57dc0913a17e92fdc57d79c26326f9cecb6a4 Reviewed-on: https://gerrit.libreoffice.org/45307 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-27EPUB export: handle image bordersMiklos Vajna7-36/+93
This requires handling of graphic styles. Change-Id: I74d4ee882b91192da44d8d7bbd88c1a66e97695f Reviewed-on: https://gerrit.libreoffice.org/45305 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-24EPUB export: handle total table widthMiklos Vajna8-8/+96
This is important when e.g. the col width are 50-50%, then without explicit total table width the table width won't be correct. Change-Id: I5ccd6dfb5b78c564485d54cda62e12f3d1ca36c1 Reviewed-on: https://gerrit.libreoffice.org/45204 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-24EPUB export: handle row heightMiklos Vajna8-13/+81
By handling row styles. Change-Id: Ie845cf9abfb4f6260d9401e81acc6864964b67bb Reviewed-on: https://gerrit.libreoffice.org/45203 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-24EPUB export: handle cell widthMiklos Vajna8-16/+157
By handling relative column widths in libepubgen (since LO may only know that one, when layout is not available) and parsing column properties in writerperfect. Change-Id: I8fae5f1a3c970b97c2b452f3c20eff0911a56ba8 Reviewed-on: https://gerrit.libreoffice.org/45202 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-24EPUB export: handle cell border size/style/colorMiklos Vajna9-25/+101
By adding support for automatic cell styles. Change-Id: I31ff2bb6fed3391f571705505ccbbd89087e5972 Reviewed-on: https://gerrit.libreoffice.org/45201 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-11-24EPUB export: implement row span for tablesMiklos Vajna1-3/+17
By turning <table:table-cell> attributes into librevenge properties. Also make sure that row/cell styles are inline at a libepubgen level. Change-Id: Ic23058748d241209845f76d8edc548bab8212c5f