summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)Author
2013-01-09fdo#58933 RTF import: avoid fake pars / cells when having graphic inside cellsMiklos Vajna
Regression from 8063e36115a11ddf3db05928db9287947beee74d. (cherry picked from commit 555bc780c83114220012e198b5471a0d7452fb32) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ied422751783a00983bd137d6151e0d58217ef76d Reviewed-on: https://gerrit.libreoffice.org/1618 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-12-28fdo#57678 fix import of RTF_PARD between RTF_CELL and RTF_ROWMiklos Vajna
(cherry picked from commits 6fc868c6535932bedfa0fc51d8dd5a1814d73ee8 and c58981ca3dbf65c998acf979fb104534991b08c4) Change-Id: I3e3d0de98c9df1a5f9041f6a7dd03b92efb5d0f5 Reviewed-on: https://gerrit.libreoffice.org/1482 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-12Resolves: fdo#49587 apparent loop in style hierarchyCaolán McNamara
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2 (cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-04fdo#54473 fdo#57133 fix RTF import of character stylesMiklos Vajna
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd (cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090) Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 Reviewed-on: https://gerrit.libreoffice.org/1235 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-01fdo#57708 fix RTF import of pictures right before text framesMiklos Vajna
Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4 (cherry picked from commit 8063e36115a11ddf3db05928db9287947beee74d) Reviewed-on: https://gerrit.libreoffice.org/1215 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-12-01fdo#57708 fix fake page break problem during RTF importMiklos Vajna
The core of this change is: so far the continous section break at the end of the document was sent as a normal section break. This was introduced in commit 892d33c8d5033b4f8f7889bf91d257f55adf0e1f, probably as a workaround (sadly it's not documented and I no longer remember). Don't do this, since it causes additional page breaks during import. Instead, fix properly whatever was broken after getting rid of this workaround. (cherry picked from commits b836bf389d1150c9cafbb0aefa641af2316e536c and 3f13a8255be93cd3b697f42d691b35418eb87114) Conflicts: writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: I28c372d539c150fe21ff9db31209f9935a5e9063 Reviewed-on: https://gerrit.libreoffice.org/1214 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-12-01split qnametostr up to try and make .o's small enough for ppc64Caolán McNamara
i.e. relocation truncated to fix: R_PPC64_TOC16_DS while I'm at it merge the standalone header/footer files into the .xslt and simplify the makefile. (cherry picked from commit 4ee0ee4971119b0460fc3e7819a23acd34202dc4) Conflicts: writerfilter/CustomTarget_source.mk writerfilter/source/resourcemodel/qnametostrfooter Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 Reviewed-on: https://gerrit.libreoffice.org/1201 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-11-28bigendian utext mixup triggering regression test failureCaolán McNamara
text takes a pointer to a sal_uInt8 buffer but utext takes a pointer to a sal_Unicode buffer passing a sal_uInt8 sequence of e.g. "\x0D\x00" to utext only happens to work on little endian machines to represent 0x000D, its 0x0D00 on bigendian. for more excitement text and utext do not share the same logic! Various special chars are treated different in text vs utext so we can't simply blindly change utext() calls to text() calls and get the same behaviour without reworking those. So keep the text()/utext() calls as they are, but change what's passed to be the right thing. Change-Id: I66696530c4a9482690c461146bdcf0a507b39b68 (cherry picked from commit 49f2a69fa7d8eaa23d77519ac29748f4dc3e4c5a) Reviewed-on: https://gerrit.libreoffice.org/1188 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-14fdo#55525 import RTF_TRLEFTMiklos Vajna
Additionally: 1) Make sure cell margins are zero when they are not defined. 2) Handle cellx values in case of a negative left margin. (cherry picked from commit c4b91ae3178011c66c76c711c1a6469ba658872e) Change-Id: I9b8fb700b6459e622396c98e4344aba79f62c96e Reviewed-on: https://gerrit.libreoffice.org/1058 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-06fdo#52989 ignore provided size of JPEG files during RTF importMiklos Vajna
See commit 66fa759b for rationale, this fix just does the same for JPEG files as well. (cherry picked from commit ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409 Reviewed-on: https://gerrit.libreoffice.org/991 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-06fdo#48442 fix default hori/vert frame anchor during RTF importMiklos Vajna
We used to send nothing when we got nothing, but this is not correct: \pvmrg and \phmrg is the default in RTF, but not in Writer. (cherry picked from commit 7b7bee4ed5722ce59ffd3394a0330d71d69d66b3) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3 Reviewed-on: https://gerrit.libreoffice.org/993 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-10-19fdo#46669 sw: RTF paste should not change page stylesMiklos Vajna
(cherry picked from commit 4f1ba0486241bd239e46b71405662db8e10d9b96) Conflicts: writerfilter/inc/dmapper/DomainMapper.hxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/filter/RtfFilter.cxx Change-Id: Ic163a639fae9de838258b3cca9567a29ab875a35 Reviewed-on: https://gerrit.libreoffice.org/878 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-19fdo#52208 DOCX import: don't always ignore cont sect break at the doc endMiklos Vajna
Regression from commit 1fdd61db155cf63d5dd55cc2bfb45af33796e131, continuous section break does make sense at the end of the doc, if the previous type was a non-continuous. (cherry picked from commit abd4ffadf30e02284290ea35e8f45d9ffd8eb5ee) Change-Id: I6d82c67e068d8dc3ce1edb1a5fe6ad293afd805d Reviewed-on: https://gerrit.libreoffice.org/877 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-19fdo#55493 fix RTF import of specific PNG imageMiklos Vajna
The image was special in that the resulting Graphic's GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL. (cherry picked from commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4 Reviewed-on: https://gerrit.libreoffice.org/860 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-10add editeng::ConvertBorderWidthFromWord:Michael Stahl
Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813 (cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270) Reviewed-on: https://gerrit.libreoffice.org/846 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-04fdo#44278: fix leaked image when import docxCédric Bosdonnat
Unused temporary XShape need to be disposed to avoid remaining garbage in the document. Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a (cherry picked from commit f1fc7c5655dde547b721b3afffabcd8bdbe0add2) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-01fdo#52475 fix import of RTF_CHCBPAT with value 0Miklos Vajna
0 means auto, and for fdo#50539, this value was ignored. However a next sample shows that we should send something to the dmapper: COL_AUTO. Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d Reviewed-on: https://gerrit.libreoffice.org/740 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-09-24fdo#49655 fix RTF import of text in the middle of table definitionMiklos Vajna
Usually table text comes after the \intbl control word, but it turns out text is allowed earlier. Make sure such text is buffered, otherwise we'll send paragraph / run properties to the dmapper in the middle of table properties, which is obviously not allowed. (cherry picked from commit af6b7d8ba30d395e5f4a17876526434cf0a06005) Change-Id: I34f1df7e171316a7d926179689627301860d492f Reviewed-on: https://gerrit.libreoffice.org/689 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2012-09-21fdo#55187 fix DOCX import of unicode 0xNN0d when it's a separate runMiklos Vajna
E.g. 0x010d was parsed as a newline character... This also makes the RTF workaround from fdo#39856 unnecessary. (cherry picked from commit b3603e0e0e5dbfbeaa2426c499e8f64be2d15765) Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b Reviewed-on: https://gerrit.libreoffice.org/665 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2012-09-21fdo#52389 fix RTF import of paragraph without RTF_PAR at the end of the docMiklos Vajna
(cherry picked from commit ebf0e1953ef422bb83201c89f0558bb9071edf63) Change-Id: Ib7b48986d5b01c75ae0be8dd6618a2e8be2ae51c Reviewed-on: https://gerrit.libreoffice.org/663 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-12Resolves: rhbz#831755 crash with 0 dyaLinePitch in .docxCaolán McNamara
This is similar to fdo#40686 (dyaLinePitch only valid between [1-31680]) for the .doc format Change-Id: I7d2745d695320b4b6b22ec2b519f092932587c2e (cherry picked from commit a9b7ceea2bf3d6d38fb6c8a4c1fffb9be4714348) Reviewed-on: https://gerrit.libreoffice.org/599 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2012-08-29fdo#52052 fix RTF import of page breaks on landscape pagesMiklos Vajna
The problem was that we tried to insert a page break before reaching the first section break, where section properties are sent. Additionally, the continuous section break at the end of the doc caused trouble, so ignore it explicitly. (cherry picked from commit 1efa576ef88141c4deb5da9818537e053dc6517b) Change-Id: I22bc355994991beeadb41d26b44ce3e2beedbdb2 Reviewed-on: https://gerrit.libreoffice.org/497 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-08-24fix math export/import in docx/rtfLuboš Luňák
For some reason older gcc versions don't manage to dynamic_cast to the necessary cast. I'm not quite sure why, forcing sal/osl/unx/module.cxx to always use RTLD_GLOBAL does not seem to help. Most probably compiler bug. Changing the cast to two simpler ones helps. Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-08-14Fix fdo#47495 backportMiklos Vajna
On master, the fix was fine, but on -3-6 this broke the fdo#47036 unit test, fix this. Change-Id: I02449a41801646c7eb2408e60f9051e1269d6693 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-08-14fdo#47495 fix RTF import of multiple shapes inside textframesMiklos Vajna
(cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7) Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-08-13fdo#48446 implement RTF_CPGMiklos Vajna
(cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781) Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-08-02fdo#51034 fix docx import of HYPERLINK field, l paramMiklos Vajna
Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 (cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1)
2012-08-02fdo#49892 import RTF_SHPB{X,Y}PAGEMiklos Vajna
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
2012-08-02fdo#49892 implement RTF import of dhgt shape propertyMiklos Vajna
Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01 (cherry picked from commit ce701e94db740ea8c2bb9f6dcf55a2aeda4d71af)
2012-08-02sd, sfx2, writerfilter, xmloff: fix some warningsMichael Stahl
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-07-30fdo#48033 fix RTF import of pictures inside table cellsMiklos Vajna
Change-Id: I2d9ef3b346d4b10b99b67d0934d63d59f6119f97
2012-07-20Resolves: fdo#51772 failure to import a specific .rtf fileCaolán McNamara
In this example the xCharacterStyles->getByName(aCharStyle) throws, and the whole import is abandoned i.e. xRet.set(xCharacterStyles->getByName(aCharStyle), uno::UNO_QUERY); so to keep things simple wrap the entire block in a try catch and return an empty xRet. Could use the hasByName around the specific failing query. Change-Id: I4f4970534cc2ff15c7d96ff2ee0a9affcfce1737 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-07-19fdo#52066 fix RTF import of rectangle shape without text in itMiklos Vajna
We used to always add a paragraph on shapes, which breaks import of abused rectangle shapes with minimal height, used as lines. Change-Id: Ice240bad68bc030e7889c46f72c45646307f17e5 Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2012-07-13do not let a style override paragraph's numberingLuboš Luňák
If a paragraph has its own <w:numPr>, do not let <w:pStyle> override that. Change-Id: I7cea0d1c8bf59804f8c56382ee68c7fad5ed3ef6 (cherry picked from commit e7ab4bb6b0e83f01148ffff41e8c5eaa0c5ba0a4) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-07-04refactor handling of double border widths:Michael Stahl
Word uses a completely different definition of "width" of a double border than OOo and ODF: for Word the width is apparently the largest of the 3 component widths, while OOo and ODF define the width as the total with of all 3 components. The new border implementation in LO 3.4 was apparently inspired by Word's double border definition, which resulted in various import filter regressions, see the previous fixes: 36e43b52992735c622833e923faa63774b9e2f76 e2ffb71305c5f085eec6d396651c76d6daee3406 70a6a4d425558340bb49507975343a3e0a1bdde8 These fixes set the ScaleMetrics, which actually seems sub-optimal as there is a ScaleItemSet function somewhere that apparently re-scales all items in an itemset, which could undo the fixes. Also, one of the fixes actually managed to break RTF/DOCX import of double borders, as that ended up in the same code via the API. This commit now reverses the change, so that the width of a border is now always the total with of all components, which is (imho) much more intutitive, and also leads to a consistent UI where selecting say 3pt width has predictable results, no matter what the border style. The border widths are now converted in the Word format import/export filters (writerfilter and sw/source/filter/ww8), and various tests were adapted to the new handling. (cherry picked from commit 2d045cdb69176b280812dda0b813371cf1ac72e2) Conflicts: sw/qa/extras/ooxmltok/ooxmltok.cxx Change-Id: I50456c49b1a298569607e6c88f19f18441348ac3
2012-07-04rtftok: border types must be mapped to the values in ooxml/model.xmlMichael Stahl
... not to the tables::BorderLineStyle values, because the domain mapper's MakeBorderLine converts the values to BorderLineStyle. Change-Id: Id89e0bcf80fbd9a1ac9238e09d898bb6b82303b4 (cherry picked from commit 6146c5d1557f4813c9793c1b00567885382c00e7)
2012-07-04replace enum SvxBorderStyle with css::table::BorderLineSyleMichael Stahl
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67 (cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)
2012-06-27n#693238 dmapper: fix margin values vs SBkc = 0 at the end of the docMiklos Vajna
The problem was that a continous section break at the end of the document caused the section margins to be ignored. Just ignoring the continous section break (only in case it's at the end of the document) makes the problem go away. The original fix was commit cd1c434c4bd4756fa1355e906cb2e8de4aae0618, but it got reverted in commit 2dee7d6205832a1212790ac1ab168a6b6fce686d, as it caused fdo#44292. This second attempt fixes the original bug again, without introducing the "4 columns" bug. Change-Id: I75d612430a5cd631dec0d224127cba580070900d
2012-06-26n#766487 dmapper: FirstLineIndent should be always inherited from numberingMiklos Vajna
Change-Id: I1eb5946d23cd3ff635d436adbd59bf007333aa60
2012-06-26n#766487 dmapper: sprmCHpsBi should affect sprmCHps, if the later is not setMiklos Vajna
Change-Id: Ia6e097f9f93bcfe14392f5ef0245994752001f6c
2012-06-25n#766481 dmapper: don't import fake paragraph containing sectpr only, take twoMiklos Vajna
Change-Id: I4623dfd05498b5ba8de73b7e301eaf486f667738
2012-06-25fdo#46966 dmapper: fix headery/footery default valueMiklos Vajna
The docx spec doesn't say what is the default value, the rtf spec says it's 720, not 1440. Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e
2012-06-22n#758883 oox: anchor vml shapes without anchor info as at-characterMiklos Vajna
w10:wrap was originally arrived to writerfilter::dmapper::WrapHandler::lcl_attribute(), but writerfilter::dmapper::DomainMapper_Impl::PushShapeContext() was called already and set the anchor type. Fix this, then we can set a a suitable anchor type in lcl_SetAnchorType() based on the type model. Change-Id: Ib411450b10f29f814bc13d81eaec434971b2e52a
2012-06-22n#758883 dmapper: set wrap mode even if determining the position failedMiklos Vajna
Change-Id: I514828469e68f2ae88309418e64ee93be30455f3
2012-06-22n#758883 DomainMapper::lcl_startParagraphGroup: set style name consistentlyMiklos Vajna
Change-Id: I71c3ebfcb68a53a291bcab2fdd397d62fd8b368a
2012-06-22n#758883 dmapper: take care of border width when setting marginsMiklos Vajna
Word handles the "border to page" distance as a subset of the page margin. Writer handles these values separately, and the real margin is the sum of the border width, the margin and the border width itself. The problem was that the width of the border itself wasn't counted, so the real margin was a bit larger than necessary. Change-Id: Id38153308f1e321b6556762b30f3377f2360edf6
2012-06-22n#758883 dmapper: paragraph-level run props should affect numberings as wellMiklos Vajna
Change-Id: I707105f6da53a6cb790d743738875acde561e20f
2012-06-22n#758883 dmapper: always set list id during stylesheet importMiklos Vajna
This way the sprm handlers can be aware that a numbering is provided by that style. Change-Id: I5b5f1570a9e50fd8b3372f5ac7a6cd48e9751254
2012-06-15fdo#50087 fix RTF import of Title, Subject, Comments document propertiesMiklos Vajna
Change-Id: I3358fad4949c2c21ecf63983a36b7c8428df9f06
2012-06-15n#750935 fix docx import of w:evenAndOddHeadersMiklos Vajna
Change-Id: I172073bac10e8d0449c0f5c0a226dd7ace013376
generated by cgit (git 2.34.1) at 2024-06-21 14:46:02 +0000