summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
2013-07-10fdo#66682 RTF export: fix level text of SVX_NUM_ARABICMiklos Vajna1-2/+5
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. (cherry picked from commit 8422d1f5042de08e8b090a907889b41e133bda40) Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I2f93892006c07eec243ec7dfcb23372d243a2db4 Reviewed-on: https://gerrit.libreoffice.org/4809 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-10rhbz#960019 : RTF import: handle extra groups in listoverride entryMichael Stahl2-2/+24
This crashed because for a single listoverride entry 2 SPRMs were sent to the domain-mapper, and the second one was empty. (cherry picked from commit b3944f124ab3dc87332796a46387f837ad29e8d5) Change-Id: Ic41ffd8bd4edcff065f49ecef3464efedd909d63 Reviewed-on: https://gerrit.libreoffice.org/4805 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-07-10writerfilter: not every field has a Content propertyMichael Stahl1-3/+6
... so don't try to get it unconditionally (but SetExpression does have it). (regression from c7e4264bed4e77daccf2f72063e5e00f1008c3cf) Change-Id: I14d24bd70f569ba0bc4f1e48d56ebf43c1441783 (cherry picked from commit 1c90902cbccd4e4f5946dfc454da351c33c24f71) Reviewed-on: https://gerrit.libreoffice.org/4807 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-07-09fdo#66565 RTF import: don't produce cell widths smaller than MINLAYMiklos Vajna1-2/+3
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. (cherry picked from commit f6a00c88482ec30b61855cb6a95a5ad240b7a517) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ibc0f02d4184b58bd423c3405e786e1ec25b9dd13 Reviewed-on: https://gerrit.libreoffice.org/4785 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-08n#825976: Fixed the import of Table of FiguresCédric Bosdonnat3-2/+19
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 Change-Id: I6fbd7cc38cf8ea7f08a0d15d1f39ffe4805dd62b Reviewed-on: https://gerrit.libreoffice.org/4724 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-08n#825976: Added common flags support for SEQ field importCédric Bosdonnat1-3/+26
(cherry picked from commit 031ced0d1ade5350ef0b17a245a2cb5c76e6173d) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I9a4505cf060880811abfe355b2ebf810cde9a4d6 Reviewed-on: https://gerrit.libreoffice.org/4723 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-08fdo#39001 RTF import: fix fake empty page at the end of the docMiklos Vajna1-5/+7
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. (cherry picked from commit 4108f285207ed4a60c8876a8206bc5f2d7f05620) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ibcbecabcb590ed34ef96a97698e4ab8f638d3483 Reviewed-on: https://gerrit.libreoffice.org/4737 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-04bnc#820504 VML import: don't anchor shapes TO_PAGEMiklos Vajna1-1/+1
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 (cherry picked from commit f5b7acac624f07fa95835b6054b8d295901bb1dd) Reviewed-on: https://gerrit.libreoffice.org/4716 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-04n#820503: initial MCE support in writerfilter ooxml tokenizerCédric Bosdonnat4-8/+67
writerfilter OOXML tokenizer was just ignoring the mce elements and thus getting the Choice content and the Fallback one. This initial support drops all mc:Choice contents to read mc:Fallback. At least for drawingML vs VML support, we have a much better support of the fallback. Change-Id: Ic0bf69d0436994e9cfcf38accdd57d17e9f391fe (cherry picked from commit f4112ce9e7840efbcd567c4d18ed4519a1e91294) Reviewed-on: https://gerrit.libreoffice.org/4703 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28bnc#823655 fix RTF import of freeform shape coordinatesMiklos Vajna1-7/+7
E.g. 0,1 was imported as 1,0, as we did not differentiate between not having the coordinate yet and having it as zero. Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4 (cherry picked from commit ddddfe8d6ffa05c467bddb3480e43d7043a3d3c9) Reviewed-on: https://gerrit.libreoffice.org/4483 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28bnc#823655 RTF import: ignore styles without a typeMiklos Vajna1-0/+3
Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9. Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28 (cherry picked from commit c6a941b51b68eb097d4d43323b39ff1aba4c753e) Reviewed-on: https://gerrit.libreoffice.org/4482 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23fdo#43641 writerfilter: tokenize lc:lockedCanvasMiklos Vajna2-0/+24
These are just the minimal changes, so that writerfilter calls into oox::shape::ShapeContextHandler, which does the real work. Change-Id: Ia53731ac8592964b70e8a438ed09262463c05360 (cherry picked from commit 363dafefad14411a16f6ea9d2ee0d55b67bc9c8d) Reviewed-on: https://gerrit.libreoffice.org/4421 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-19fix rtf import on big endianDavid Tardon1-27/+15
(cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6) Change-Id: Ia9f589752176849f7f6700483e933767e509edf3 Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4354 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-06-18bnc#825305 RTF import of fFilled shape propertyMiklos Vajna1-0/+5
(cherry picked from commit b08743d3c4381a77eee6e123230fb423acfbc116) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfsdrimport.cxx Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0 Reviewed-on: https://gerrit.libreoffice.org/4345 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-18n#820504: default color hidden by Default style in writerfilterCédric Bosdonnat1-2/+1
Setting the font color of the default paragraph style to Auto makes the color set in the Writer defaults (from rPrDefault) ignored. Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c (cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445) (cherry picked from commit 122db845e057cfd83bb2b5fde442200bc742eb8d) Reviewed-on: https://gerrit.libreoffice.org/4329 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-11Related fdo#33895 add some checks against NULL derefsJulien Nabet1-1/+6
Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48 Reviewed-on: https://gerrit.libreoffice.org/4199 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-on: https://gerrit.libreoffice.org/4223
2013-06-10fdo#64656 RTF import: handle levelnumbers without leveltextMiklos Vajna2-0/+11
Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c (cherry picked from commit 2c64af529567324f4433984ed7673304d26062c8)
2013-06-06add some checks against NULL derefsCaolán McNamara2-0/+6
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1 (cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-06valgrind: uninit variableCaolán McNamara1-2/+3
Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e (cherry picked from commit b5d93a58a7f4e23432f18da0946bac04027c23a8)
2013-06-06Related: #i119607#, text font spacing in comments doesn't expand/condense...Jian Fang Zhang3-4/+19
by the expected value Found by: xiao ting xiao, tingxiaox@gmail.com Patch by: bjcheny, companycy@gmail.com Review by: zhangjf (cherry picked from commit 11fda1bd134b07c5bcaca6186d63107ec9f47b98) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx Change-Id: Iecdaee97e49395df59719d724e1544e1802d947d (cherry picked from commit 5f0c969f43538e8a92ed37c27fab228d97b1bebe)
2013-06-06Related #i120832#, the style and color set on table text by user...Jian Fang Zhang1-6/+0
should have higher priority than that from table style Found by: Jinlong Wu,wujinlong@gmail.com Patch by: bjcheny,companycy@gmail.com Review by: zhangjf (cherry picked from commit fe7e723a727f6def90ee80ef2964a40546b37a90) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8 (cherry picked from commit 8943478b8d34216d3f2d64dfccd48d181d1a0f91)
2013-06-05bnc#820509 DOCX import: handle M.d.yyyy date format in w:sdtMiklos Vajna1-2/+3
Change-Id: Iae233c24a9580ffc8ea4680276161a543171f63c (cherry picked from commit 58197c3692df0d0fccb5bc7abddaf6d9667565f6)
2013-06-05bnc#820509 DOCX import: try harder to disable form design modeMiklos Vajna5-5/+24
Previously this only worked if we had indexes in the document as well, but actually these are independent. Change-Id: I28afa60d2606230c901948d4c1da8f5a7c50a9f7 (cherry picked from commit 3d6a7cf3eb7aa966601cbc019d1ad5fafdddd21f)
2013-06-04fdo#62044 RTF import: don't overwrite existing styles when pastingMiklos Vajna3-8/+11
(cherry picked from commit 2ade07126971b79c92f729fae5709f2e2e2b495c) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I80a83caebc8fa3f038cf2ff080c6c6ec8e93fb70
2013-06-03re-base on ALv2 code. Includes:Michael Meeks1-22/+13
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 http://svn.apache.org/viewvc?view=revision&revision=1397337 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 Patches contributed by Andre Fischer Fixed getcsym.awk to handle #-comments that contain special regexp chars. http://svn.apache.org/viewvc?view=revision&revision=1230971 118778: Added ADDITIONAL_REPOSITORIES environment variable and its automatic setup in configure. http://svn.apache.org/viewvc?view=revision&revision=1232004 118160: Added external CoinMP library. http://svn.apache.org/viewvc?view=revision&revision=1233909 Patches contributed by Herbert Duerr #i119168# use generic LICENSE file for langpacks and sdks http://svn.apache.org/viewvc?view=revision&revision=1310178 macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars http://svn.apache.org/viewvc?view=revision&revision=1183367 allow gbuild with empty sysroot on linux http://svn.apache.org/viewvc?view=revision&revision=1179186 Patches contributed by Ingo Schmidt native373: #164472# improvements for msi database http://svn.apache.org/viewvc?view=revision&revision=1167540 http://svn.apache.org/viewvc?view=revision&revision=1167539 Patches contributed by Jurgen Schmidt adapt setup package scripts to handle special DS_Store file for developer snapshot builds http://svn.apache.org/viewvc?view=revision&revision=1232430 imported patch extensions_i117681.patch http://svn.apache.org/viewvc?view=revision&revision=1172102 Patches contributed by Michael Stahl gbuild: RepositoryFixes.mk should be optional http://svn.apache.org/viewvc?view=revision&revision=1166123 xslt filter: remove the FLA horror wordml import filter: replace FLA usage with plain XSLT http://svn.apache.org/viewvc?view=revision&revision=1363727 Patch contributed by Oliver-Rainer Wittmann i#88652: applied patch, remove unicows deps http://svn.apache.org/viewvc?view=revision&revision=1177585 Remove lots of OS2 conditionals, re-extract Rhino Java, unwind cppunit pieces, cleanup Mac image bits, remove coin-mp and re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand MPLv2 subset checking. Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-05-30bnc#817956 DOCX import of page border shadowMiklos Vajna7-6/+40
See the comment in SectionPropertyMap::ApplyBorderToPageStyles() on what and how is mapped. The control flow is like this: BorderHandler::lcl_attribute() notices w:shadow, then PageBordersHandler::lcl_sprm() gets it, passes it to SectionPropertyMap::SetBorder(), finally SectionPropertyMap::ApplyBorderToPageStyles() uses the UNO API. Change-Id: Ib0aef3245f58c62655769357f1f4dd07eef77f62 (cherry picked from commit f0aa209390aea68f4c23cf16df9d1577aaea91b5)
2013-05-30bnc#817956 DOCX import: missing last character of shape textMiklos Vajna1-1/+4
Make sure writerfilter only removes the last character of the text if it's a newline. Change-Id: I96980e2d148ced93363b3147545afdd0dd070e5d (cherry picked from commit 4eaabc45f76aefe82558b283975ab9df3aea7fce)
2013-05-27bnc#817956 DOCX import of document background colorMiklos Vajna4-1/+10
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237 (cherry picked from commit 992da0d5cf04497bad55637f6a6ebfcdaec03e16)
2013-05-27fdo#64671 Some special RTF characters were not skipped correctlyUrmas1-1/+1
Some special characters, like { and }, were not skipped when they occured as a replacement character for \uN keyword. Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c (cherry picked from commit bfb93ffc6d72d22a833acf9d8c9d166153dad7c0) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna5-0/+35
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a (cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9)
2013-05-21fdo#46808, Use service constructorsNoel Grandin1-14/+4
Change-Id: Ib428bb78751e9707c89dcf311b8ab86ad8184775
2013-05-20#i121134#, more fix for i119657, fallback to old logic to use current ↵Jian Fang Zhang1-0/+2
AbstractNum when the desired one can not find Found by: Li Lin Yi Patch by: Jinlong Wu,wujinlong@gmail.com Review by: zhangjf (cherry picked from commit aa53b457faaf0fc50a8b38d17bf219de427a1044)
2013-05-20Related: #i119657#, importing docx, add code to handle the problem...Jian Fang Zhang4-3/+56
that an AbstracNum references to a style, which references to another Num Found by: xiao ting xiao Patch by: Jinlong Wu,wujinlong@gmail.com Review by: zhangjf (cherry picked from commit d6870e145cc7373a422b414c31380cc1399e64cc) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/NumberingManager.cxx Change-Id: I9be0b82d601bf43da31842edb02c4b0d4e50e84f
2013-05-16bnc#779630 DOCX import: improve w:sdt size guessingMiklos Vajna1-1/+6
The problem was that when border was enabled (and the importer leaves it unchanged, and it's on by default), there was not enough space for the text. Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d
2013-05-15fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing RTF_UMiklos Vajna1-1/+4
Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-1/+1
2013-05-14fdo#64249: make sure we have matching start/end level for table in shapesCédric Bosdonnat1-7/+6
Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
2013-05-12cppcheck: fix redundantAssignInSwitchJulien Nabet1-4/+4
Change-Id: I0cda1957488ed1f0b279d8c783fe28c90579b466
2013-05-11Resolves: #i119161# copy sStyleIdentifierI and sStyleIdentifierD...Jürgen Schmidt1-0/+2
from StyleSheetEntry when constructing a new TableStyleSheetEntry object Patch by: Jinlong Wu (cherry picked from commit 11eb354532cfb354f9f7c3a72b170c9c8289b75c) Change-Id: I80054bc6c36bc7c5ed1034e0aadd88cd1a2f3091
2013-05-07oox: remove Package_generated and Package_tokensMichael Stahl2-3/+5
Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8
2013-05-07writerfilter: remove Package_sprmidsMichael Stahl2-34/+0
Change-Id: I3791f7f513246faaeb76f9209c08008c78a38619
2013-05-07fdo#64256 writerfilter: handle void GraphicURL in ListsManager::lcl_sprmMiklos Vajna1-1/+3
Change-Id: I4d8b1b527d5099781a36cc1265318c167205340e
2013-05-02handle graphic bullets in .docx also when saved as <w:pict>Luboš Luňák4-2/+23
Change-Id: I7225b4b024c6b7c549d0c9fbf5204df653577bec
2013-05-02Fix out-of-bonds Sequence access in NumberingManager with page numberingFridrich Štrba1-1/+2
Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58
2013-05-02bnc#779630 initial DOCX import of w:sdt's w:dateMiklos Vajna7-67/+246
Also factor out the w:sdt-related methods to a helper class to avoid DomainMapper_Impl become a God object. Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
2013-05-02Update pchAurimas Fišeras1-0/+2
Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d Reviewed-on: https://gerrit.libreoffice.org/3736 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-05-02writerfilter: few more doxygen commentsMiklos Vajna2-0/+9
Change-Id: I4893e2b3297adadf4e19ab22b298aaef4044b52e
2013-04-30bnc#779630 tokenize w:listItem and w:dropDownListMiklos Vajna1-0/+7
Change-Id: I714c2fd747eae2e706355b4fae892af9f569b3ae
2013-04-30WaE: private field 'mbShapeSent' is not usedTor Lillqvist1-1/+0
Change-Id: I47ef674ec056d9a66c905420bf74b3e8a67840a9
2013-04-30bnc#779630 initial DOCX import of w:sdt's w:dropDownListMiklos Vajna5-0/+103
Change-Id: I57d4768a26476d1a0535087c60535393b7004b24
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 02:24:43 +0000