summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)Author
2013-08-12OSL_FAIL -> SAL_WARNMiklos Vajna
Change-Id: Ifbf7db8044ee28f5f24c03480391a315358a2db4
2013-08-09fdo#53556 RTF import: fix handling of default shapeTypeMiklos Vajna
It was a customshape, but Word seems to handle the shape as a rectangle when shapeType is missing. This makes the text in the textboxes of the bugdoc wrap properly. Change-Id: I56e044f42ead348bbb79addc36fa13c82a7ffc29
2013-08-09fdo#53556 RTF import of fFilled shape property for drwainglayer shapesMiklos Vajna
The real change is in RTFSdrImport::applyProperty(), the rest is just refactoring to be able to read the "is textframe" property from that method. With this, the transparent big rectangle in the bugdoc no longer hides the text on the first page. Change-Id: I04cca3ade93a63edf608df047bef3bdccf8d3605
2013-08-06compatibility setting for MS Word wrapping text in less space (bnc#822908)Luboš Luňák
The document itself is stupid and uses a SURROUND_THROUGH object with a number of empty lines that make it act is if it in fact was SURROUND_NONE, rather than actually disabling wrapping for the object and be done with it. But the difference was that Word still managed to fit those empty lines next to the object into the little space that was there, while LO already considered the space too small. So keep a compatibility setting for Word documents in order to avoid problems with such lame documents and hopefully that's enough. Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
2013-08-06fdo#47440 import RTF_SHPBX/YPAGE for Writer pictures, tooMiklos Vajna
Previously this was only handled for drawinglayer shapes. Change-Id: I7ce440a27ebe44fc867b8a7f4ee62217076677f0
2013-08-05fdo#67498 RTF import: fix missing margins vs continuous section breaksMiklos Vajna
The document had 3 sections, separated by continuous section breaks. Previously only margins from the last section were imported, this way the first page had default margins. Now margins are also applied when we hit continuous section breaks. This way margin values from the last section break affecting the page wins. A later commit could improve this further by setting the minimum of these and setting a section margin for each non-minimal sections. Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71
2013-07-29cppcheck: Prefer prefix ++/-- operators for non-primitive typesJulien Nabet
Change-Id: If1bd91f28a96bd0eb53e4057e51db900f8b2c52b
2013-07-27fdo#67365 fix RTF import of RTF_QC in table cells wrt unusual group stackMiklos Vajna
Change-Id: I487e1a941f499ab3d0a820c790af051a9b972376
2013-07-27fdo#67365 fix RTF import of inherited cell widthsMiklos Vajna
In theory, this is not needed since 01292f171cc851ba092510f10a97cd293670829e, and in practice it even causes a problem here. Change-Id: Id2c2f3f7815efada138f3f84724af77be3372fc1
2013-07-27fdo#67365 fix RTF import of inherited row props wrt unusual group stackMiklos Vajna
Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4
2013-07-26fdo#66474 DOCX import: fix handling of mixed fixed/auto cell widthsMiklos Vajna
Instead of checking if any cells have fixed width, check if all calls have fixed with. Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa. Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7
2013-07-26RTF import: fix groupshape import when shapes don't contain textMiklos Vajna
Without this, the groupshape itself was created, not it had no child shapes. Change-Id: I5d3276498eb3ffe840f3d42dad16661849596da4
2013-07-26Related: bnc#820504 RTF import: don't anchor shapes TO_PAGEMiklos Vajna
This is the RTF equivalent of f5b7acac624f07fa95835b6054b8d295901bb1dd, which avoided TO_PAGE-anchored shapes in the VML importer. Change-Id: I58a5cdb311ac43ddba00bc441005fb37a4899cee
2013-07-24fdo#66781 : fix bullets with level 0Adam Co
Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I14b0ce9ae096eae4759793a49865eefe16ec1afd Reviewed-on: https://gerrit.libreoffice.org/4818
2013-07-24writerfilter: import w:mirrorIndents as a grab bag propertyMiklos Vajna
Change-Id: I500c6af08326ea226b3774fb1e02709d278fa509
2013-07-24Keep passing XComponentContext into officecfg:: wrapper fns, where availableStephan Bergmann
Change-Id: I10448edd04c6c7e7f03c539bf85aba4e00c7e311
2013-07-24fdo#46037: no more comphelper/configurationhelper.hxx in fpickerJulien Nabet
Change-Id: I571e0271d9432118d886561e140d689b2d1b8713 Reviewed-on: https://gerrit.libreoffice.org/5042 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-24Revert "fdo#46037: no more comphelper/configurationhelper.hxx in fpicker"Fridrich Štrba
This reverts commit 7cbf9c9e0a34937783dfa7f78d460dcf70504841. Revert "Trying to fix the windows build" This reverts commit d1f58e5ea695e823e931aad1bfb1d7b4bf17634c. Change-Id: I67d00ec010a834e27b0e79b0afd92c5a2e7d47d6
2013-07-24Trying to fix the windows buildFridrich Štrba
Change-Id: I19d17a490c9af3d14a315a92ae2af86cc2e92d51
2013-07-23fdo#46037: no more comphelper/configurationhelper.hxx in writerfilterJulien Nabet
Change-Id: If2500bf09f8bb23f70d46d8dbef5d8bbf9fc3fb3 Reviewed-on: https://gerrit.libreoffice.org/5041 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-23fdo#64637 RTF import: handle multiple RTF_COMPANYMiklos Vajna
Instead of unconditionally calling addProperty(), first check the existence with hasPropertyByName() and call setPropertyValue() instead, if necessary. Change-Id: Ie0a075bbfe6eaa1f66726c456105dcdef9001d30
2013-07-22fdo#66145: fix for FirstIsShared flagAdam Co
Change-Id: Id8cc3829ccd5806295b0f240a570dc1d66ed0c87 Reviewed-on: https://gerrit.libreoffice.org/5002 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-22n#825976: handle TOC \h field for illustrations tables in writerfilterCédric Bosdonnat
Change-Id: I9ebc91d5f0e706dc1e316e0aa8494af7aec4da4e (cherry picked from commit 43f7bc96c0117a77610bfa5e1edfa870123f56f1)
2013-07-22writerfilter: make sure the redline stack always has at least one elementMiklos Vajna
One element is pushed to that stack in the constructor, so calling top() on it always OK, as long as we check during pop() that the stack won't be empty. Change-Id: I010bd77897ab2a3684e7d9c5c0450e7bda626fc0
2013-07-18fdo#65632 RTF import: send NS_ooxml::LN_trackchange only once for one rangeMiklos Vajna
The problem was that in case we had {\deleted foo\b bar} then both "foo" and "bar" triggered a trackchange, but "}" only ended one, resulting in overlapping redline ranges. This was cought by core, but caused a performance problem. For the first bugdoc, before: real 3m57.803s after: real 0m3.072s Change-Id: Ibf6f2db30109f0b9a2571d2e4fb3cc76294f68d1
2013-07-17Related: fdo#65632 DOCX import: make start/end of trackchange both be an sprmMiklos Vajna
The end is an attribute since 0211e8bc457a12570988f4aee7dea42c2fc6d56f, but this just confuses dmapper. With this, the DOCX version of the bugdoc can now be imported without getting an exception in DomainMapper_Impl::CreateRedline(). Change-Id: If820b43a267a62ecdc323eef49bf13d576165269
2013-07-17Related: fdo#65632 DOCX filter: fix import of non-redlined footnoteMiklos Vajna
Change-Id: Ie1a86e6b59c43c3ee54076d5d68aa3fca0d6a515
2013-07-17Mark as constTakeshi Abe
Change-Id: I59ac01eacf31061093b83ab3057963de7ea4a2e7
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl
Add IsUTC member to: com.sun.star.util.DateTime com.sun.star.util.DateTimeRange com.sun.star.util.Time Add new stucts with explicit time zones: com.sun.star.util.DateTimeWithTimezone com.sun.star.util.DateWithTimezone com.sun.star.util.TimeWithTimezone Adapt the sax::Converter to read/write timezones, and fix the unit test. Everything else just uses default (no time zone), this commit is just to fix the API. STRUCT: /UCR/com/sun/star/util/DateTime nFields1 = 7 != nFields2 = 8 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/DateTimeRange nFields1 = 14 != nFields2 = 15 Registry2 contains 1 more fields STRUCT: /UCR/com/sun/star/util/Time nFields1 = 4 != nFields2 = 5 Registry2 contains 1 more fields Conflicts: sc/source/filter/oox/unitconverter.cxx Change-Id: I01f7a6d082a6b090c8efe71d2de137474c495c18 Reviewed-on: https://gerrit.libreoffice.org/4833 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-07-15fdo#54900 RTF import: support setting para align after textMiklos Vajna
Both Word and Writer typically write all paragraph properties before the first text in each paragraph, but at least for paragraph alignment, it's valid to write them at the end. Change-Id: I0337e63678ad45c662a204ab2fc59378607abe74
2013-07-13use static LanguageTag::convertTo...() for standalone conversionsEike Rathke
If no LanguageTag instance is at hand use the static methods to convert between BCP 47 string, Locale and MS-LangID instead of creating temporary instances. Change-Id: I9597f768078eb81c840e84a5db5617f26bb7dc09
2013-07-10fdo#66682 RTF export: fix level text of SVX_NUM_ARABICMiklos Vajna
Even if level text is not ASCII, we should just write the placeholder values (0x00, 0x01, etc.) in a hex encoded form, without Unicode. Regression from 07d01742c69f1c0335bc7e1b57abd8341ce255e7. Also, fix the import side, so the previous bad output now looks bad in Writer as well. Change-Id: I2f93892006c07eec243ec7dfcb23372d243a2db4
2013-07-10writerfilter: move the crash test file to "pass" directoryMichael Stahl
Change-Id: I8a97eac789e3e8234673de87653b78c39dafe14c
2013-07-10rhbz#960019 : RTF import: handle extra groups in listoverride entryMichael Stahl
This crashed because for a single listoverride entry 2 SPRMs were sent to the domain-mapper, and the second one was empty. Change-Id: Ic41ffd8bd4edcff065f49ecef3464efedd909d63
2013-07-10writerfilter: not every field has a Content propertyMichael Stahl
... so don't try to get it unconditionally (but SetExpression does have it). (regression from c7e4264bed4e77daccf2f72063e5e00f1008c3cf) Change-Id: I14d24bd70f569ba0bc4f1e48d56ebf43c1441783
2013-07-09fdo#66565 RTF import: don't produce cell widths smaller than MINLAYMiklos Vajna
In case we have a table of a given width and the second (or later) row has fewer cells, we have to add a fake cell to such a row. However, it doesn't make sense to do this when the difference is only a few twips: we can't create such a small frame inside the cell later anyway. Regression from c3b0f13546b30e5db3aecd311c7178e4e0933208. Change-Id: Ibc0f02d4184b58bd423c3405e786e1ec25b9dd13
2013-07-08-Werror,-Wdeprecated-register (Clang trunk towards 3.4)Stephan Bergmann
...in files generated by gperf; an alternative could be to use -isystem instead of -I in gb_Library_use_custom_headers. Change-Id: I316684ab5342977655a5642903b13e127adaf95c
2013-07-08Related: fdo#66040 RTF import: by default, do create a group shape for \shpgrpMiklos Vajna
The bugfix was just for the special case when we must create textframes due to the contained tables, this one add support for the default case when we want a real group shape. Change-Id: I74b77b233235959266a24660c970a79e41d8b272
2013-07-08RTFSdrImport: support stacking of parentsMiklos Vajna
Change-Id: Ie8f039ce403832e54251a751609d91b8d608ed79
2013-07-05writerfilter: add RTFLookahead to be able to look ahead during importMiklos Vajna
Change-Id: I1da765373c352c8a2aa486fe6210b16bf492728c
2013-07-05RTFTokenizer: remember start pos of current groupMiklos Vajna
Change-Id: I953ca1d3fb5532ac8261ef0def033a4c0fcd79c6
2013-07-05RTF import: extract RTFListener out of RTFDocumentImplMiklos Vajna
Change-Id: I735f6a3148ece6f28644c5433180482f8cc1323f
2013-07-05fdo#39001 RTF import: fix fake empty page at the end of the docMiklos Vajna
In case we have a \sect, there was no \sbknone (so it counts as a page break as well) and there is nothing after it, we should not make extra efforts to make that have some effect, but adding at least one empty paragraph to that new page. Change-Id: Ibcbecabcb590ed34ef96a97698e4ab8f638d3483
2013-07-05writerfilter: PropertyMap::Insert's bIsTextProperty parameter is unusedMiklos Vajna
Change-Id: I2d55043490f895ef439e88bcd1fed51b857255be
2013-07-04Fixed bad cherry-pick conflict handling in writerfilterCédric Bosdonnat
Change-Id: I4771e198872bbc797df6388af395d7bc14cb2d76
2013-07-04n#825976: Fixed the import of Table of FiguresCédric Bosdonnat
Support the TOC \c switch and fixed the SetExpression current presentation property to have updated fields and TOC. (cherry picked from commit 22a22a0983ec9c95e5b471395fc1c5bb813bd0d2) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/PropertyIds.cxx Conflicts: writerfilter/source/dmapper/PropertyIds.cxx Change-Id: I6fbd7cc38cf8ea7f08a0d15d1f39ffe4805dd62b
2013-07-04n#825976: Added common flags support for SEQ field importCédric Bosdonnat
(cherry picked from commit 031ced0d1ade5350ef0b17a245a2cb5c76e6173d) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I9a4505cf060880811abfe355b2ebf810cde9a4d6
2013-07-04bnc#820504 VML import: don't anchor shapes TO_PAGEMiklos Vajna
In theory, this is a problem because Word formats only support AT_CHAR and AS_CHAR, so importing something as AT_PAGE is buggy. In practice, this also leads to unvisible shapes, since f0d001a378c64ea457e722266e60c96522c72e9b. Change-Id: Ie730d67a789ef12734cede1f9b6c27764a66f237
2013-07-04writerfilter::dmapper::PropertyDefinition::bIsTextProperty is never readMiklos Vajna
Change-Id: I9d0ce39c1c47d8b89bd675ce91f6cfe2e9c3a061
2013-07-04fdo#66543: fixed line number attribute START VALUE wasnt imported and exportedAdam Co
Change-Id: I09e0356f994f5eb328f741723ac7dbfea51419ed Reviewed-on: https://gerrit.libreoffice.org/4693