summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)Author
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
2012-06-15n#766477 dmapper: import NS_ooxml::LN_CT_FFCheckBox_defaultMiklos Vajna
Change-Id: If7edb301fa90a49d79fc5322a7c19ee2591f5494
2012-06-13Resolves: fdo#49178 CRASH when FILEOPEN particular RTFJulien Nabet
Change-Id: Idd938980b91ec8b822a92dfd7013a20fe5b6f498 (cherry picked from commit 104badf31c8a39994cadc460561bfa01e428b67b) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-06-11fdo#49659 three RTF fixesMiklos Vajna
1) fix RTF import of pictures with inner groups One would think that with {\pict{\foo1}}, the inner group has no effect in the outer group, but this turns out to be valid, so we should handle it as well. (cherry picked from commit c5c3ce5e625a31d78a21fbbc339ee30ba99f3044) 2) handle RTF import of tables at the very end of the document If the documents ends with a table, both Word/Writer produces a non-table empty paragraph after that table. However, it's valid not to emit that empty paragraph, so handle the situation in the importer. (cherry picked from commit e08ab74b918be1473d91ed234ee7870cab137c7e) 3) dmapper: handle tables in substreams (cherry picked from commit 61ba6e49f5bbadaf1334ce71459647c3d0a3a37d)
2012-06-08n#757905 fix VML import of mso-wrap-style:noneMiklos Vajna
There were two problems here: 1) SimpleShape::implConvertAndInsert() did not set the anchor type 2) DomainMapper_Impl::PushShapeContext() tried to overwrite it Change-Id: I2c32016c4bb15c891cf287d8208e10817c6291e6 (cherry picked from commit 9e8957de203bb9abb208516ad32aee9527feb67b)
2012-06-06fdo#50665 rtftok: don't ignore character properties of text fieldsMiklos Vajna
The dmapper part was already fixed in commit 9486851baea59d16c449d79bd61a38f6e686cfe0 for DOCX, this fixes the RTF tokenizer. Change-Id: Iaca706e50367bb744f5a03e15134bda1646df8fc (cherry picked from commit b9508dd55f82d35f09a58021dc001cf79b390e08)
2012-06-04fdo#46808, Adapt UNO services to new style, Part 7, updating ::createNoel Grandin
Update calls to factories to use new ::create methods Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
2012-06-02targeted string re-workNorbert Thiebaud
Change-Id: I67db5b5685872ef148bf4833330c02ea2b18c32e
2012-06-02targeted string re-workNorbert Thiebaud
Change-Id: I17bec612eb6d50acc4bf8ac8ea4299fd2380afb5
2012-06-02targeted string re-workNorbert Thiebaud
Change-Id: I910a508722a309d7916377a7e2df2093070809ad
2012-06-02targeted string re-workNorbert Thiebaud
Change-Id: Ibd7142f49d1a42ebab3bed02ea269a3c850197e6
2012-06-02targeted string re-workNorbert Thiebaud
Change-Id: Ie5a8469620650ba67bab8c875e0bc136bd103866
2012-06-02Fix some Prefer prefix ++/--Julien Nabet
Change-Id: Ief7279a06ffbdd0e23fac28f8948daea4023823c
2012-06-01fdo#50539 fix RTF import of automatic character background colorMiklos Vajna
Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93
2012-05-31n#764005 VML import of absolutely positioned pictures should not be opaqueMiklos Vajna
Change-Id: I17a1a94ee92ce04ff6928a20c552b3a3408a0626
generated by cgit (git 2.34.1) at 2024-06-03 06:08:58 +0000