summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
2016-05-02tdf#99074 DOCX import: handle <w:view w:val="web"/>Miklos Vajna1-0/+4
Instead of always using the Normal view, use the Web view when the DOCX file contains Web Layout. For this to work, expose sw's DocumentSettingId::BROWSE_MODE via css.document.Settings. Reviewed-on: https://gerrit.libreoffice.org/23806 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit e0f9bb795251d950b5dd960fcd030170c8eb67aa) Change-Id: I7787ca058d8cb8a346b2001a2bd70c3df86d8673
2016-05-02Related: tdf#65642 RTF filter: import \pgnucrmMiklos Vajna2-1/+10
This as a side effect also implements support for DOCX <w:pgNumType w:fmt="upperRoman" .../>. Reviewed-on: https://gerrit.libreoffice.org/24073 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 235dcc11e7e5291188e134f37a03849d741c4f6e) Change-Id: Ibf3bedca03c6c2a2b96eecb36ff6c4cf6e2281b4
2016-05-02Related: tdf#65642 RTF filter: import \pgnlcrmMiklos Vajna2-1/+10
This as a side effect also implements support for DOCX <w:pgNumType w:fmt="lowerRoman" .../>. Reviewed-on: https://gerrit.libreoffice.org/24273 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 91b18cee97b110fe60391faa945a6fd166f1d8aa) Change-Id: Ifb524b25236a8bc774690266a4fa205154204109
2016-05-02tdf#90097 RTF import: handle fRelFlipV property for line shapesMiklos Vajna2-0/+32
Can be extended later in every direction: fFlipV, fRelFlipH, non-line shapes. See oox::drawingml::Shape::createAndInsert() on why the convertMm100ToTwip() conversion is necessary. Change-Id: Ifee401dd8dd392c2c9ff85cc871ca0169fcf930b Reviewed-on: https://gerrit.libreoffice.org/24385 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 6046062719f30849cd97161c6a89d27a0b0d2a20)
2016-05-02Related: tdf#65642 RTF filter: import \pgndecMiklos Vajna2-1/+10
This as a side effect also implements support for DOCX <w:pgNumType w:fmt="decimal" .../>. Reviewed-on: https://gerrit.libreoffice.org/24457 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit b94d753ac9e3894da055d31bbb7bb20e11b97b5a) Change-Id: I747c3f610dc13f614b6f962c2a498c987765ebb6
2016-04-21tdf#99140 DOCX import: fix table at the bottom of the page to span over ...Miklos Vajna3-25/+69
... multiple pages. In short, one more blacklist entry when conversion should not be performed. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Also (because otherwise the first commit would introduce a regression): tdf#99140 DOCX import: fix table horizontal aligment to be 'from left' ... ... when it was 'manual'. Regression from commit c1e563f6efd09cd3463f1b92a3022ae288c92087 (fdo#76741 [DOCX] Table Alignment and width type, 2014-04-04), DOCX import code had to deal with two kinds of horizontal alignment when it came to floating tables: the alignment of the table itself, and the alignment of the float parameters. The problem is, in general it's wanted that the table is aligned according to the floating parameters, but in Writer the "from left" UI setting is described differently for tables and fly frames: tables use LEFT_AND_WIDTH for that, while fly frames use NONE. Fix the problem by touching the default only in case the floating parameters have something that's different from NONE. With this, the width of tables is no longer lost when they are described to be floating ones in the DOCX markup, but FloatingTableConversion() decides to ignore that. (cherry picked from commits d56deaeb2a1e8007e50fc2334f416fddd4e3cde3, c07f04ab422eadba0f2c3c128a0e3ff78e90cdf2, and fd61dee6457a44687f1142dd55bfee6b64fda2ef) Change-Id: I764f02cc58ae1b7af802b81e570e4feaf73ee2c1 Reviewed-on: https://gerrit.libreoffice.org/23987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 52f6fb0f4e91ebcd5115e29d25407eeed82992d5)
2016-04-21tdf#65642 RTF filter: import \pgnrestart and \pgnucltrMiklos Vajna4-1/+28
This implicitly adds support for DOCX import of <w:pgNumType w:fmt="upperLetter"> as well. (cherry picked from commits abaf6bde4ee91c628bd55a7ec2e876a5d0ecff6e and d29b75c402ea635b3865501e43c9f349885913af) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ib19ecb8f7ca0c867ae3be2b41e49ac4cacfd5bb6 Reviewed-on: https://gerrit.libreoffice.org/23916 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 03b3c54039c7459922919af2c227583769677490)
2016-04-04tdf#98987 sw: add AddVerticalFrameOffsets compat modeMiklos Vajna1-0/+1
The situation is the following: we have a text frame, with at least two anchored objects: one is wrapped not-wrap-through, the other is. In case the non-wrap-though one shifts the text content of the text frame right or down, then layout may or may not want to re-consider what is the top left corner of the text frame for anchoring purposes. Regarding the x position, sw layout repositioned the anchor point depending on the AddFrameOffsets compat mode: it's enabled for documents imported from Word, disabled otherwise. Regarding the y position, no repositioning was done, however the bugdoc shows that Word does the same repositioning on the vertical axis as well. Add a new AddVerticalFrameOffsets compat mode that enables vertical repositioning as well, and enable that mode for documents imported from DOCX. Also (squashed in, as the second commit partly undoes what the first one did): tdf#99004 SwAnchoredObjectPosition: handle textboxes when determining surround Writer TextBoxes are always wrapped "through", so that they can appear inside their shapes. However, the surround of the shape may influence its position. So when surround is asked for anchor position purposes, take the surround of the TextBox's "parent" shape instead of the one of the TextBox directly. With this, the textbox in the bugdoc is properly positioned inside its parent shape as expected. (The problem only happens when at least two shapes are anchored to the same paragraph.) (cherry picked from commits 911261a3a581b9f2f4262f1d5403d9be3bbecf63, f5e0236566b913aebb1376d97c7d37a23c69bd84, 50223ea6e212b60b7d33839c2753c5601fb50f95 and cd1b2f923e0b0be89a5d1c8cbc647133aac09ed5) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx sw/source/core/inc/anchoredobjectposition.hxx sw/source/core/objectpositioning/anchoredobjectposition.cxx sw/source/core/text/txtfrm.cxx sw/source/uibase/uno/SwXDocumentSettings.cxx Change-Id: Idc5cad7d86662008a92ff3bf5fbb3806aa2c7b07 Reviewed-on: https://gerrit.libreoffice.org/23739 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 3e242e732e0aba170870098e4ce51d49f979eab9)
2016-04-04tdf#96326 RTF import: handle checkbox form field undefined resultMiklos Vajna1-1/+2
The RTF spec is quite terse on how the form filed result should be interpreted, but the binary equivalent documents properly that checkboxes have 3 valid states: 0, 1 and 25, the later meaning undefined. Use the default value in that case. (cherry picked from commit 829596eb36de32bd87b426d9ad11901eabeae7be) Change-Id: I672bf8d1f63d7880227b7fa7b5c81f91e1877b2a Reviewed-on: https://gerrit.libreoffice.org/23511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 8de829c25511add434373e58e69df997d25e1e5c)
2016-04-04tdf#98882 DOCX import: set default para properties on the Standard para styleMiklos Vajna1-27/+45
That's what the DOC import does, and that's the reason e.g. the strange unwanted crop of the as-char anchored picture doesn't happen there. This also needs the "reset all existing style properties back to default" logic to be adapted: the Standard style has to be reset before the default are set, and later it should be left alone, otherwise the defaults are lost. (cherry picked from commit eae2331f83bd58bacccd898d60f6c5f54856c036) Change-Id: Ie422a0b64b80a826fa4f469145a26283fb32d734 Reviewed-on: https://gerrit.libreoffice.org/23598 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 490ce780fa876ec14055d95339933ea0081ce0e7)
2016-04-04tdf#59699 RTF import: handle INCLUDEPICTURE fieldMiklos Vajna8-10/+77
On one hand, don't handle a fieldmark for it in dmapper. On the other hand, handle the field in the RTF tokenizer as it would be {\pict ...hexdump... }, that will result in an inline picture, as wanted. (cherry picked from commit 6f94cab9c43f88624b58a47ad03ad5f87032595d) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: I554fdf017920350144300fd86617bf74eed8995b Reviewed-on: https://gerrit.libreoffice.org/23298 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b5464c15078b57e852100a76f03fadef3186c93d)
2016-03-10tdf#87034 RTF import: fix multiple superscripts after footnote ...Miklos Vajna2-6/+1
... in the same paragraph. The intention was to avoid replaying the supertext buffer and using its contents as a custom footnote mark at the same time. However, it's enough to check if the buffer is empty to do so, and that avoids the mis-import of the bugdoc as well. (cherry picked from commit 93faf178195ca974747849879266783884ae27c5) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I1e3b0c7f0c6d8eb8250d8b1d0d7d196039c40e79 Reviewed-on: https://gerrit.libreoffice.org/23084 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 05ab13e44ab45953c4d4d18d8c9070698c041969)
2016-02-22tdf#95376 DOCX import: fix incorrectly indented tab stopsMiklos Vajna1-0/+8
Regression from commit f4badd9a485f32f787d78431ed673e2932973887 (tdf#92454 DOCX import: allow overriding para prop from num style in para style, 2015-09-22), the problem was yet another priority mishandling in the maze of various styles and indentation handling. In the tdf#92454 bugdoc, both a numbering-from-paragraph-style and a paragraph-style defined indentation, and Word preferred the numbering, while Writer preferred the paragraph style, that's why the import-time conversion was added. However, it turns out there is a 3rd source that's still not direct indentation formatting: a direct numbering. So the correct priority is: direct-ind > ind-from-num > ind-from-parastyle > ind-from-num-from-parastyle Which means in this case the indentation should not be set directly: the two conflicting value (ind-from-num and ind-from-parastyle) will be resolved correctly by Writer core. Given that we always first get the para style info, and only then the numbering, we just need to undo the conversion added for the other bug if we see a direct numbering, then both the old bugdoc and this new one will be handled properly. Change-Id: I09cc84605d5df6159da985ad069d46b580a53358 (cherry picked from commit 3915bf2dc877d5f1140798e24933db0f21386a4a) Reviewed-on: https://gerrit.libreoffice.org/22482 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6ecfd6bffb23a1a326a5433e6b9170b938fac77c)
2016-02-15tdf#85523 DOCX import: fix unexpected extra char at comment endMiklos Vajna1-1/+2
Change-Id: Ic3eb073d11a395a81b90fd1a9292d6ecf2940c09 (cherry picked from commit 39969defa29948d77565a7cd8a3471baaec8f35d) Reviewed-on: https://gerrit.libreoffice.org/22306 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 10a142356a4cdb487da10d83857e4b50a0452a5b)
2016-02-02tdf#96308 RTF import: fix tab stop inheritance inside table cellsMiklos Vajna1-0/+2
The tab stop list is a paragraph property, and RTF requires to repeat it after \s as direct formatting, otherwise the parser should be assumed that the tab stop list is cleared as a direct formatting. Non-buffered text handles that in getDefaultSPRM(), handle it directly in the RTF_PARD code for buffered text. (cherry picked from commit 1ec88cdb82a28851c4b97d7f043d8bcec3c675e8) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I16b09bc4c177df5a74d16653b829b198aa1a800f Reviewed-on: https://gerrit.libreoffice.org/21996 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cb64c29389939048666141eb4dddcfae4dd70ee5)
2016-02-02tdf#95213 DOCX import: don't reuse list label stylesMiklos Vajna5-7/+8
We used to optimize the creation of these styles, so in case two list label had the same character properties, then we could avoid creating two styles for those. This isn't correct though: it means if the style is changed later by the user, then unexpected other places in the document will change as well. Do what the binary DOC filter does: create one character style for each level of a numbering separately. (cherry picked from commit f9c8d97d82a85b897520a2fe897352ee5ad879d9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/NumberingManager.cxx Change-Id: I967b30fc078b1be30f7ef81b2706df2962fc3fb0 Reviewed-on: https://gerrit.libreoffice.org/21437 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit af55185eb9ffcf903bba22cad736797162a7eb4d)
2016-01-18tdf#92045 DOCX import: <w:effect w:val="none"/> doesn't mean blinkingMiklos Vajna1-1/+1
Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use constants for ST_TextEffect values, 2014-09-22), the problem was that while the tokenizer stopped using hardcoded token values, the matching dmapper code wasn't adapted. (cherry picked from commit ac6bfd85df271b650dbd24b45391dac346ecd72c) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0 Reviewed-on: https://gerrit.libreoffice.org/21363 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a31708d9df01e7eae5c9ca39f4ee82fd6644dfe6)
2015-11-28tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by defaultMiklos Vajna1-1/+0
On one hand, neither our binary DOC import, nor Word maps the "TOC Heading" style to something special, and that's how the DOCX import added that property to some paragraphs in the document, moving the as-char picture from the first to the second page. OTOH, the DOCX export filter has a lcl_guessQFormat() function that explicitly assumes that such a style name exists in Writer document models, so again it doesn't make sense to handle this style name with special care. Change-Id: I3af548930f9683695fc3ad56b486e013f107d61a (cherry picked from commit 70f3c595cae858e97616bf1f23adea8a75e42d4b) Reviewed-on: https://gerrit.libreoffice.org/20037 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0750162d3dbdd1bbd01ad01c383a26199e58419a)
2015-11-28tdf#95188: enable import of shapes in footnotes in .docxOliver Specht1-0/+2
substreams require a Model and a DrawPage Change-Id: I701cf6e2283f84f18b9a0c06a4ce0aa8be934bf3 Reviewed-on: https://gerrit.libreoffice.org/19951 Reviewed-by: Oliver Specht <oliver.specht@cib.de> Tested-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit f47bd0561cdf4c2b4fbe2c7e396533cf85408cb7) Reviewed-on: https://gerrit.libreoffice.org/19954 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit aac3a50a392c95532a85e4c558d2eb1d1a89cdff)
2015-11-10tdf#59454 RTF import: handle section break right before a tableMiklos Vajna1-0/+18
DOCX import could handle this situation, as commit 2e8aad6d45c53d554ccaf26de998ede708cfc289 (fdo#39056 fdo#75431 Section Properties if section starts with table, 2014-04-18) added support for this situation, in case NS_ooxml::LN_tblStart/End is emitted by the tokenizer. Fix the problem by sending these tokens in the RTF tokenizer as well, at least for non-nested tables. Change-Id: Ifedb121754634529c27820dd5175e7f9e24019e1 (cherry picked from commit e57752170e604c85a6fe8aeaa38784796e00bab1) Reviewed-on: https://gerrit.libreoffice.org/19878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 610e6fddbc19dd2ac23b6a6cf4d8cbfb0dcf589a)
2015-11-10tdf#95071: fix spacing calculations for border with page offsetMike Kaganski1-5/+5
With commit ebf767eeb2a169ba533e1b2ffccf16f41d95df35, some previously hidden bugs manifested themselves, this is one of them. The margin size calculated incorrectly when border offset was from page. The border is drawn from the margin inwards, so the margin should be equal to OOXML w:space attribute, and border distance should be OOXML page margin - border distance - border width. Incorrect calculation gave negative margin, with IllegalArgumentException thrown in SfxItemPropertySet::setPropertyValue. Change-Id: Ifcf4a348e975df53410933aab3684d17f68b688c Reviewed-on: https://gerrit.libreoffice.org/19586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 061d98ccc7fc95234514d5dee3d9e80e49b10dc7)
2015-11-05tdf#94374 DOCX import: allow insert -> object -> documentMiklos Vajna1-1/+2
(cherry picked from commit 50d48709af3406eb270e5357f5d2cc6a218337a9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I977930d59ef1ae9ae8bd2dfa9a7f3816c46d982c Reviewed-on: https://gerrit.libreoffice.org/19758 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 36fa2b8cf538baee272bf91da3d6cda2da6a392c)
2015-10-17tdf#94049 RTF import: add missing check for empty shape when popping stateMiklos Vajna1-3/+6
Change-Id: I3c9a5f89df721618bb60b8932b69a371bb6f3ff1 (cherry picked from commit 0d79e4c07a7a7328cc0bed1d7998317b634543d8) Reviewed-on: https://gerrit.libreoffice.org/19366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4bfde7402dee4f3639bd23c1dc987ceafea87cfc)
2015-10-17tdf#94435 RTF import: \ltrpar should not override \qcMiklos Vajna1-2/+2
Change-Id: I342191cd8cf8b3998089236aea5743ea7cdd26f1 (cherry picked from commit 92fd894ea18672cba4cf961bdc4c0bc98f168102) Reviewed-on: https://gerrit.libreoffice.org/19274 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d5db91d310de658631f4cb85d1335fbe55c82453)
2015-10-17tdf#94456 RTF import: fix list vs paragraph style interaction wrt para indentsMiklos Vajna1-3/+3
In case we set the paragraph left/right/first margin just to mimic the list vs paragraph style interaction as Word wants it, never overwrite properties, as they are always meant to be just callbacks in case there is no real hard formatting. Change-Id: Ibdb2834c693d43cf4114453e42628e8f64c0a856 (cherry picked from commit b669d85de9c933553ae57a9f51902bce7f9da9b5) Reviewed-on: https://gerrit.libreoffice.org/19250 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8add771c71900d38ec0faee4fd89d946f95f0cd0)
2015-10-17tdf#90153 DOCX import: fix default sw TextFrame roundtripMiklos Vajna1-2/+6
The AnchorType of the shape was at-paragraph, which does not allow line-level VertOrientRelation (which is correct, it would be undefined, what line of the paragraph should be the used). Fix this by changing the AnchorType to at-character in the line-level case, which brings the filter in sync with the DOC one. With this, import of a DOCX file that was created by inserting a TextFrame into an empty document is roundtripped without shifting the shape up considerably. (cherry-picked from commit 358666e4204364ce915ee95372dc6f2fca545253) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I6d85c38be859d6e730584f2349c857b87496a1d4 Reviewed-on: https://gerrit.libreoffice.org/19099 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f98d09c8325c642f0463f2e65ff57be0498e9c23)
2015-10-17tdf#92124 DOCX import: don't add a dummy Suffix for an empty LabelFollowedByMiklos Vajna1-1/+12
(cherry picked from commit 3e27df1035677c7cca5200858d5d8e8283bf7aa9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/NumberingManager.cxx Change-Id: I0c4366ad0a2f81a198860869f670767343a392be Reviewed-on: https://gerrit.libreoffice.org/19032 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c33af041298fc4897ee1215efda488654955ebf7)
2015-10-17tdf#92454 DOCX import: allow overriding para prop from num style in para styleMiklos Vajna1-0/+7
Word has a feature like this: a paragraph style can refer to a numbering style, and both can specify paragraph margins. If that's the case, then the ones from the paragraph style has priority. In Writer, the numbering style has priority, so the only chance for correct import result is to set the margin directly on the paragraph in this case. (cherry picked from commit f4badd9a485f32f787d78431ed673e2932973887) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Iff3b03bcc56e0db3a48452c293acf41c91b8f159 Reviewed-on: https://gerrit.libreoffice.org/18794 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit d14c7b034d75730a85b5f6f843e39ff79840c272)
2015-10-17bnc#939996 tdf#93919 DOCX import: fix left-from-style and first-from-directMiklos Vajna1-0/+5
With this, <w:ind w:hanging="..."/> as direct paragraph formatting and <w:ind w:left="..." w:hanging="..."/> as a numbering level formatting is properly merged, i.e. w:left is not lost, defaulting to 0. (cherry picked from commit 56341e5d496f576dc45fe8e6c44831d780fecb73) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: If5534fbd9ee6d41139b0ed3a3df9d0cc5aad3239 Reviewed-on: https://gerrit.libreoffice.org/18906 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 8e911fe7e14d20ea5abe2991ed93ced62385462d)
2015-08-06tdf#91594 misinterprets letters from Symbol font in docx filesMark Hung4-39/+38
Fix the issue caused by wrong assumption about symbol chracter and symbol font attributes order in writerfilter. Also allow symbols to be displayed if user's language is not Western. Reviewed-on: https://gerrit.libreoffice.org/16543 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I602d9fbfa79c33c90f655dbf5ee22738b6391ae6 Reviewed-on: https://gerrit.libreoffice.org/17457 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#86374 DOCX import: fix btLr text table direction without <w:cantSplit/>Miklos Vajna2-2/+10
Commit 0208ead70a9412ccd554fcef3e9308f8ca17037b (DOCX import: improve btLr table cell support, 2013-02-22) made any table row that has at least one btLr cell fixed height. This causes problems in case a table has a minimal height with lots of content, where the fixed height gives wrong layout, but the minimal height is correct. Fix the problem by only making the row fixed height if <w:cantSplit/> is set (as seen in the old bugdoc), and revert to setting the height type to minimal in any other case. Change-Id: Ibaf91f542e64e5caa7904df97eb6eb52618e0023 (cherry picked from commit 233a634a112e6dae07dca5fb1296764cb0001503) Reviewed-on: https://gerrit.libreoffice.org/17338 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06tdf#90046: RTF import: ensure that a run is started before \footnoteMichael Stahl1-0/+1
Avoids crashing with empty context stacks. Change-Id: I0ee8b457fdbb19b55f5c15876b7253680cde6e23 (cherry picked from commit a61fd02c819433a1206b3b3e61017ba2d0d3d467) Reviewed-on: https://gerrit.libreoffice.org/17334 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06tdf#89702 DOCX import: fix too large bullet characterMiklos Vajna1-6/+10
Commit c1f8437dbed0e8b989e41a345ef7e658a6e8a4cd (fdo#83465 RTF import: handle font of numbering, 2014-09-25), changed the "get the me character style of the current numbering's current level" member function to be successfull even in case we're inside a DOCX run, not when we're inside a DOCX paragraph, but outside runs. While this is necessary for RTF, the side effect of this was that unwanted run properties started to affect the above mentioned character style in case of DOCX. Fix the problem by enabling the "in paragraph and run" looking for RTF only. Change-Id: I610bfce6cec15b918fe547402360f5a894401f7e (cherry picked from commit fc7c1a07d0d5e21a4e1533a0e5b0ac256763f973) Reviewed-on: https://gerrit.libreoffice.org/17323 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06tdf#90611 DOCX import: fix missing paragraph style on footnotesMiklos Vajna3-1/+18
One one hand, a problem since commit 330b860205c7ba69dd6603f65324d0f89ad9cd5f (fdo#68787 DOCX import: handle when w:separator is missing for footnotes, 2013-09-04) was that the type attribute from <w:footnote w:type="separator"> resulted in two ooxml:CT_FtnEdn_type tokens, ignoring too many paragraph ends for footnotes, which resulted in missing paragraph style on footnotes. On the other hand, fixing the first problem showed that it wasn't correct that commit 9389cf78e304a5a99bcf1745b9388e14ac36281a (cp#1000018 RTF import: empty para at the end of footnote text got lost, 2013-11-15) unconditionally removed the RemoveLastParagraph() call in DomainMapper_Impl::PopFootOrEndnote(). It turns out that RTF and DOCX have different semantics here, the footnote is always within a <p></p> pair in DOCX, while in RTF a \par at the end of a footnote means an empty paragraph. Fix that by conditionally restoring the removed RemoveLastParagraph() call. (cherry picked from commit 519b34300f73b1e08f6194d6ba49d4fc010cf186) Change-Id: I33020ac761c94addfec8164a17863565e4453b07 Reviewed-on: https://gerrit.libreoffice.org/16810 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06tdf#87348 implement nonsequential and mso-next-textbox textbox chainingJustin Luth1-59/+112
cherry picked from commits 976add10b35e482251ed4c75957baeb6811e6e2c and 091fe76b6329b4bb974987554369cbfadd8f2401 Change-Id: I017049a8f3578ad4c2a1f549be1c683f98c20318 Reviewed-on: https://gerrit.libreoffice.org/16692 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#92481 RTF import: handle \widowctrlMiklos Vajna3-2/+30
(cherry picked from commit ffc7b671e213d366e59d39ddbbef66544ebf01e5) Change-Id: I1af1d6bc150c16a2c6b0fe788a41c8c18caee6c6 Reviewed-on: https://gerrit.libreoffice.org/16785 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-08-06tdf#89890 DOCX import: fix too large num pic bulletMiklos Vajna1-0/+14
Reading SwWW8ImplReader::CoreLoad()'s "update graphic bullet information" block, it turns out that the numbering picture bullet's height should be independent from the supplied bitmap, and only its aspect ratio should be respected. (cherry picked from commit eab89b7f024a8c86decdcb3362c40c40a7df37df) Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e Reviewed-on: https://gerrit.libreoffice.org/16502 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-08-06tdf#89698 DOCX import: inline picture should have no spacingMiklos Vajna1-4/+4
Commit 3d7e168a2a43c2414b0633379102ddb29437e75b (n#783638 DOCX import of wp:inline's distT/B/L/R attributes, 2012-10-11) was about a picture that had non-zero spacing in LO, but zero in Word. The hope was that the problem is just that the value is not imported. Then commit a88ac708403c03d0f950f09ec29c0d5a1e5a85b4 (fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twips, 2013-04-19) was about a picture that had so large spacing that the picture become invisible. Fixing the unit of the spacing value made the picture visible again. What was missed is that this value is just stored in the doc model, but layout in Word doesn't use it at all till the anchoring is as-char. Given that in LO as-char anchoring supports real spacing, just don't import these values to have the same layout. That's what the WW8 import does, too. Change-Id: I1244269e06c5d190e8340349ddc12ae7b0572a4d (cherry picked from commit 9781a8786da5c32e2250cbe1ae97bd10f84f39bb)
2015-08-06tdf#87460 DOCX import: fix missing endnote in floattableMiklos Vajna4-3/+24
Writer doesn't support foot or endnotes in TextFrames, so they are not supported in OOXML floattables, either. In the past, floattables were imported as normal tables, that's how this worked. Restore the old situation till the core limitation is there, so we at least don't regress. Change-Id: I4eb62617e3131176f7371e9ca69f11bc9e948a0b (cherry picked from commit 2fe248f2b36d541c0d243a620c217058a50a9d5d)
2015-08-06rtf: skip binary data also in skip-group modeThorsten Behrens1-0/+6
Since there might be arbitrary rtf markup inside, we rather shouldn't act upon. Reviewed-on: https://gerrit.libreoffice.org/16206 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 63fbd90099098218994899ca7da3eb5e1656e4e7) Change-Id: Ia782d89cb4ce8f34df64a3e0cba16de2db7b7ccf
2015-08-06tdf#92061 RTF import: fix missing body text after footnoteMiklos Vajna1-0/+2
A missing seek in the \footnote handler could result in a situation that the missed text contained a "{" but not its matching "}", which resulted in the parser terminating earlier than the end of the document. (cherry picked from commit 7b08304b55cf2284a3c583426c60baef618ba206) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6df476b2d6397dfa918111b33854dc2f95fbe81d
2015-08-06tdf#82553 DOCX import: handle table margin when converting floattablesMiklos Vajna1-1/+11
Change-Id: I7a3a233a34453153b3e1c0fe3d60bb0ede65dc86 (cherry picked from commit 292ec5fe8d01af6119325f1a426422bb42e58615)
2015-08-06tdf#79639 DOCX import: don't delay text frame conversion of in-header tablesMiklos Vajna1-2/+9
Floating tables may or may not be converted to table-in-textframes during import, depending on if we guess that it'll be a multi-page table with minimal wrapping or a real wrapped table. If the floating table is in a header or footer, then it won't be a multi-page one, so can do the conversion right away. Change-Id: I8d5ff8c5fe00037d5cef92dea6b54de6806214bc (cherry picked from commit 81ef96a2417c7843dfed0558c920ad3064e58921)
2015-05-27Resolves: tdf#89731 numberingChange feature not available in writerCaolán McNamara1-4/+8
Change-Id: Ie779e78fc3c7ccf717117513d9187697c22cc51a (cherry picked from commit 0123bbbc4d07fd7d6c233f67139984ab3cd4555d)
2015-05-26DOCX import: fix vertical position of inline imagesLászló Németh1-50/+52
(regression of commit ab81e3bff2a1844be67209bc8947d539edbaf8e6) Change-Id: Ie78f8be059b18cdd81c83a8d01f2d865ac3fec2b Reviewed-on: https://gerrit.libreoffice.org/15916 Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Tested-by: Joren De Cuyper <jorendc@libreoffice.org>
2015-05-26need DISABLE_CVE_TESTS for these tests under windows tooCaolán McNamara2-0/+8
Change-Id: I92de8fa6a48dac9a0a09e6ebda4af9b8e4c3a1d7 (cherry picked from commit a30886283f50f4e05f70175d110a1c55e02037f0)
2015-05-26tdf#90315 RTF import: fix \colsx default valueMiklos Vajna1-1/+1
See SectPageInformation::mnColsx on the libreoffice-3-6 branch + the spec agrees, too. Change-Id: I6f70a125f8d962621f319e3e75e2865e5f126859 (cherry picked from commit e18adb7369d140f33b947668a69da2fa78738e7b)
2015-05-19tdf#91261: DOCX import: snapGrid property of paragraphs are ignoredMark Hung5-5/+27
Fix the situation for OOXML import filter: a) While handling DocGrid type, SnapToChars was treated as None. Now it is implemented as described in the article: http://linpeifeng.blogspot.tw/2007/02/text-grid-enhancement.html Both LinesAndChars and SnapToChars will be translated to Writer grid type "lines and characters", and set SnapToGrid property to false or true accordingly. b) All the imported paragraphs snap to grid because SnapToGrid was appended to grabbag, now it allows SnapToGrid property in paragraph and paragraph styles to be imported properly. Change-Id: I446b4c64c0ed86960896bcd61a1006c9173a757a Reviewed-on: https://gerrit.libreoffice.org/15732 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-05-19loplugin:staticmethodsStephan Bergmann2-38/+38
Change-Id: I6dbc972c1d6e05667ac5f354703a77db4266aea0
2015-05-19TagLogger can be staticNoel Grandin39-448/+311
since we only ever instantiate one of them Change-Id: I48b3b976b4f33044c4bf6542ac5cce58f26e6244 Reviewed-on: https://gerrit.libreoffice.org/15759 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 11:32:27 +0000