summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2018-05-11tdf#117403 RTF import: fix lost cell border of merged cellMiklos Vajna2-0/+29
If two source cells have different border types, then Writer takes the second, Word takes the first. So mimic the MSO behavior explicitly in dmapper. (cherry picked from commit 42b32321381126ad70700424b8970dbc45a843f5) Change-Id: I25adc62e024a929216c7b05fec44e1f602f28285 Reviewed-on: https://gerrit.libreoffice.org/54089 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-05-08OFFICE-3776 xmloff: adapt ODF import to renamed text:sender-initialsMichael Stahl2-0/+91
ODF TC decided to rename the element to meta:creator-initials, so adapt the import so it can read this in addition to the 2 element names produced by current and past LO versions. Also add a test. Unfortunately it turned out that the ODF validator had a bug in checking character data in foreign elements, which is triggered by the test document, see https://issues.apache.org/jira/browse/ODFTOOLKIT-475 ... so update the validator jar as well. Change-Id: I1de1e8772b41f8937f043d9a0d150e169f25ffd4 Reviewed-on: https://gerrit.libreoffice.org/53979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit b09889a158cbc839ebc8a6061b0b261fa74930e6) Reviewed-on: https://gerrit.libreoffice.org/54001 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-04tdf#116801 DOCX import: char styles have no IsAutoUpdate propertyMiklos Vajna2-0/+12
See sw/source/core/unocore/unomapproperties.hxx:447, UNO_NAME_IS_AUTO_UPDATE is part of the COMMON_PARA_STYLE_PROPERTIES define. So it's not "list styles don't have this", but "only paragraph styles have this". (cherry picked from commit ebcf27d419e41a497242c98fcfec08a2088c0720) Change-Id: I1c256b087cdc2e7e341f55d717ef8e678fc69fb4 Reviewed-on: https://gerrit.libreoffice.org/53773 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-05-04tdf#117268: treat erroneous \itap0 the same way as Word doesMike Kaganski2-0/+73
... so that if we are inside a table, it would not convert table paragraphs into top-level paragraphs. (The in-the-wild documents with this invalid input are, e.g., generated by Consultant+ legal reference database). Reviewed-on: https://gerrit.libreoffice.org/53790 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 247dabcb0b92a62b233ec0237deac84e6675325c) Change-Id: I45eb9073a0651bc963badb84229ce5ae437f1a8c Reviewed-on: https://gerrit.libreoffice.org/53813 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-05-02set Referer on link mediadescriptorCaolán McNamara1-3/+8
to allow determining if the source document is from a trusted/untrusted location Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c Reviewed-on: https://gerrit.libreoffice.org/53693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-04-29tdf#117311 Ctrl/Shift+Insert do not work in Writer commentsMaxim Monastirsky1-5/+2
Change-Id: Ide4f3c57f67107995a90dff965a53324c052f715 Reviewed-on: https://gerrit.libreoffice.org/53619 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 4f0598ebe9b65c8cdfcb59645d552e3e4d11fe03) Reviewed-on: https://gerrit.libreoffice.org/53621 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-04-26wrong spin suffixCaolán McNamara1-1/+1
so the value allowed range is incorrect, glade adds a 1 if the id is duplicated, so I guess the name was copy and pasted and then the prefix renamed, leaving the incorrect 1 in the suffix Change-Id: If53790e49bc15e2a10d8ce5b9045eb6be0c25754 Reviewed-on: https://gerrit.libreoffice.org/53504 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-26tdf#117246 RTF import: don't loose page breaks inside nested groupsMiklos Vajna2-0/+17
Regression from e3f254ab8211fbab7541cde2100a35c875b0c240 (RTF import: fix spurious page breaks at doc end (related: rhbz#1065629), 2014-02-27), the problem was that now we update the parser state to remember the next section break should set the break type of the current section to "next page", but this state should be remembered once the RTF group ends ("}" character), otherwise \page will be represented with a continuous break, i.e. lost. (cherry picked from commit 4a93b46e4652e73ed3460e4c66999d94e50db4b7) Change-Id: I69a8413f45e17e11d6d676c7bfd13ca7560b4d43 Reviewed-on: https://gerrit.libreoffice.org/53506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-04-26tdf#116841 RTF import: fix default value of left para margin from numberingMiklos Vajna3-1/+26
The left mragin value is usually spelled out in RTF and DOCX, but this bugdoc used the WW6 RTF markup to declare the numbering rules and there the margin value was missing. This also allows me to partially revert the changes to testTdf106953 from commit 56a695fddb915bcba13b088b5b2b4e0841d4acbc (tdf#112211 RTF import: fix unwanted direct formatting for left indents, 2017-09-26). (cherry picked from commit 810364653b8e5ef8578ae7c9fc2e3b9196e7cdc4) Conflicts: sw/qa/extras/rtfexport/rtfexport3.cxx Change-Id: I9902f2f9ada4080cb4d873624ae9824342c6ee77 Reviewed-on: https://gerrit.libreoffice.org/53433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-04-26tdf#117129 ww8import: prevent divide-by-zeroJustin Luth2-1/+2
Before commit ffc3358515799057e72379b76a1165c6ea5a9bd1 for tdf#75539, the divisor was hard-coded at 1000. The preceeding code also notes that an undefined relativeWidth is forced to 1000. So, on an invalid divisor, revert to previous behaviour. Change-Id: I40210194eec39682d9ab3ce68268d343af16e2b1 Reviewed-on: https://gerrit.libreoffice.org/53329 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-04-25tdf#117028 sw: conditionally consider fill of shape for in-textbox auto colorMiklos Vajna8-14/+44
Commit f966767e1ccfa432da33e1a0fd6de69e17a36bc3 (tdf#116925 sw: consider fill styles of shape for in-textbox auto color, 2018-04-10) did this unconditionally, but there are two cases: 1) Shape (with textbox) has a fill, in that case auto text color of textbox should consider the shape fill. 2) Shape has no fill, in that case the shape fill should not be considered when counting the background of a transparent fly frame. Fix 2) without breaking 1) by making the change to SwFrame::GetBackgroundBrush() opt-in, and only use it for auto font color, not in other cases. Change-Id: I761a1b7d6ecf47586edbe5641ec012f22f6a53d7 Reviewed-on: https://gerrit.libreoffice.org/52941 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d9420a64fbb288020d33b681f40a858db49afca7) Reviewed-on: https://gerrit.libreoffice.org/52972 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-04-25tdf#116985 sw: fix geometry of textbox of shape with relative sizeMiklos Vajna3-1/+26
Relative size of shapes are calculated by the layout, so the normal doc model-level synchronization between the shape and its textbox was not enough. Change-Id: Ia6f460132efaf03a7ba3a023cf751f6fff74404d Reviewed-on: https://gerrit.libreoffice.org/52831 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c8b976ac64c9cac360f7c4fd9844fcfac7ba25a8) Reviewed-on: https://gerrit.libreoffice.org/52971 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-04-25tdf#116976 DOCX import: fix rel size of shape after bitmapMiklos Vajna2-0/+7
We have a queue of these odd relative sizes (which are not XML attributes but text inside the XML element), if the bitmap doesn't pop the queue, the following shape won't get its size. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx Change-Id: I1602208c9509d8889bf0be254f3b25fb25fafca2 Reviewed-on: https://gerrit.libreoffice.org/52970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-04-17tdf#116486 Consider upper margin in paragraph positioning with flysPatrick Jaap3-0/+18
The problem was the following: There is a paragraph with an upper margin defined. Also, there is a flyframe intersecting this upper margin. The desired behavior is to reposition the parapgraph, such that it (including it's upper margin) is located below the flyframe. This patch increases the bounding rectangle of the paragraph by the upper margin. For compatibility, there is a compat-flag query. I re-used a related one. Change-Id: I9dbc75e07e2ba0658fdbbfa9989be24a68660713 Reviewed-on: https://gerrit.libreoffice.org/52685 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d07fc485d46f431405a3f6a002f951a08c559677) Reviewed-on: https://gerrit.libreoffice.org/52938
2018-04-17Revert "sw-table-join-fix-i99267.diff:"Michael Stahl1-4/+0
This reverts commit 6b1204329ad365a46214472bcff335e63c51bdf4. The comment has nothing to do with the code around it, and it turns out the commit is utter nonsense: The actual intended change was done in CWS sw32bf02 at a different place in SwTabFrame::MakeAll(), see commit 4439427aadeaa0cb611011b46f0fa14bfa196f33. This was then apparently extracted as a patch and added to ooo-build: https://cgit.freedesktop.org/libreoffice/build/commit/?id=d33db589f6e7814df84f71506539f6f89448d9fd And then there was a rebase on top of a DEV300 that includes the CWS and that moved the patch to apply in this incorrect location: https://cgit.freedesktop.org/libreoffice/build/commit/?id=d91410b81a02ce9b970ebd838fda0b28f6d8a5f8 Change-Id: I89db4ea0d1b06450c8fd8618cc824612e225fffe Reviewed-on: https://gerrit.libreoffice.org/52945 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8885ffd9702f72047d9fc94c82ee57221e4e927c) Reviewed-on: https://gerrit.libreoffice.org/52975 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-13tdf#116925 sw: consider fill styles of shape for in-textbox auto colorMiklos Vajna3-1/+47
Automatic color is determined in SwDrawTextInfo::ApplyAutoColor(), but it uses this function to determine the background color. Be consistent and consider the same background in both the shape-with-editeng-text and shape-with-sw-text cases. (cherry picked from commit f966767e1ccfa432da33e1a0fd6de69e17a36bc3) Change-Id: I52249a908193765bc128789d96187af334c1017c Reviewed-on: https://gerrit.libreoffice.org/52707 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-12tdf#50057 sw: fix duplication of at-paragraph anchored flysMichael Stahl6-9/+644
The problem is that the flys that are anchored to the first paragraph of a SwRedline do get copied by SwRangeRedline::CopyToSection(), but they don't get deleted by DelCopyOfSection(). Copying is enabled because the setting of the SetRedlineMove() was made conditional in commit 65de5382a389cc7edf1cdf506da4fb43a4d33a9f "#100619# fixed problem with hiding deleted graphics", which isn't justified in any way and which i can't imaginge a good reason for, given that the flys anchored in the first paragraph are all skipped in DelFlyInRange(), so why would you want to copy them; hence this reverts that commit. The interesting check for the redline_fly_duplication_at_para_end_inside case is actually the one that was added in commit 23e52c207760c596cc2f841ef59f3100c110d591 Change-Id: I96fb294a5456e7f1172a5f408ebcb21cf211c276 Reviewed-on: https://gerrit.libreoffice.org/52729 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 7db137e87177dbe381186491ca36e3e8fd62ddc2) Reviewed-on: https://gerrit.libreoffice.org/52733 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-11tdf#116830 sw: handle cell background for BACKGROUND_PARA_OVER_DRAWINGSMiklos Vajna5-1/+144
Commit 18b3feb8bef06bf7b126fd0bc743e19479cb8026 (n#778133 sw: add BackgroundParaOverDrawings compat flag, 2012-09-12) added a layout compat flag that is meant to make Writer behave the same as Word when it comes to the order of various backgrounds. The original fix was that in case there are background shapes and also paragraph backgrounds, then this flag can opt in to have the paragraph backgrounds on top of background shapes. Cell backgrounds behave the same way in Word, so extend the behavior of the compat flag to cover not only the background of text frames but also of cell frames. (The test could be hacked into CppunitTest_sw_uiwriter, but 1) this is layout, not UI and 2) that one started to get rather large.) (cherry picked from commit 09954c381895f340c9b73af64b0833d8b4689c06) Change-Id: Ifca1851217000f6daac50e6c9562c042aca6ff7d Reviewed-on: https://gerrit.libreoffice.org/52668 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-10tdf#116410 DOCX import: restrict increased object spacing to multiple shapesMiklos Vajna4-0/+12
This anchored object handling is just there to be bug-compatible with Word, it's not needed for the case when there is a single shape in the paragraph. (cherry picked from commit 2c4d84e93901571ead79c85aa3894ef4e10bf5af) Also: Related: tdf#115719 DOCX import: fix ignore of increased anchored obj spacing If there is only a single anchored object, then ignore only the current paragraph, not all paragraphs of the section. (cherry picked from commit 599ff05300599d4e4ce818092f18e76e738b921e) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx Change-Id: I5e3dc4ba9a4a6f459ec6217e8974ebc2d7303bcc Reviewed-on: https://gerrit.libreoffice.org/52022 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-04-10forcepoint#37 revert tdf#108572 let remove storage elementCaolán McNamara1-0/+0
reverts commit 26957fc325c27cf61e8ef5555b380d627def4931 Date: Wed Sep 6 10:54:50 2017 +0200 tdf#108572 let remove storage element void OStorage_Impl::RemoveElement( SotElement_Impl* pElement ) expects that m_pAntiImpl will be nullptr, if not throws an exception. This caused that in case of deleting embedded database used for mail merge it wasn't fully removed and The problem is that by allowing the removal of the element, existing readonly accessors are left pointing to the deleted element which causes quite some problems as seen in this sample document Change-Id: Ie6ac36e6dea771b02637d77b78eb8026e3bb7ae8 Reviewed-on: https://gerrit.libreoffice.org/52600 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-10fix global-buffer-overflow found through UI testing on UBSAN jenkins jobMarkus Mohrhard1-1/+1
Change-Id: Ie4d81561057bb4d67fe050ca7fb82861d5d207a2 Reviewed-on: https://gerrit.libreoffice.org/52587 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c442ac8c20cfceb8c87e96c494dcd8372dc6e206) Reviewed-on: https://gerrit.libreoffice.org/52609 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-10Related: tdf#77919 GetPosPixel() is relative to parent, not grandparentCaolán McNamara1-1/+1
so the tooltip rectangle is wrong and doesn't shown under mutter we could use pCtrl->OutputToScreenPixel(Point(0, 0)) here too Change-Id: I75a717127ad75a4aac2cb9c22e526419f798ea99 Reviewed-on: https://gerrit.libreoffice.org/52654 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-09Return correct length for Authority tokenMatteo Casalin1-17/+16
Regression from f4fd558ac9d61fe06aa0f56d829916ef9e5ee7b9 Take the chance to calculate token prefix just once. Change-Id: I19ce5cb037198cb918e79c760a92b285f9b725f1 (cherry picked from commit 34b98af8e5a4e568d8316700bea1ce604d825ce8) Reviewed-on: https://gerrit.libreoffice.org/52621 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-08Fix regressions from d727476cff29382a34103b137542e15e1aeeb4b9Julien Nabet1-3/+12
Calls to statusChanged may call addStatusListener or removeStatusListener so copy m_aStatusListenerVector on stack and iterate on the copy Thank you Michael for having pointed these Change-Id: I8399db84874d7f68e24c57891a9ab408e7ebef78 Reviewed-on: https://gerrit.libreoffice.org/52579 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 8fced3ec9ff6f55a6e0b939183cf33b6c3c4a1db) Reviewed-on: https://gerrit.libreoffice.org/52584 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-07Avoid crash-reporter crash.Michael Meeks1-0/+3
http://crashreport.libreoffice.org/stats/crash_details/f5086a7d-3c67-46e4-945e-e0882a604eee Change-Id: Ic9ceed2e736a4ad1c155a31d3b2dc453e6a562aa Reviewed-on: https://gerrit.libreoffice.org/52119 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/52516 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-04-05forcepoint #3: sw: don't do section-in-table splits when this is tableMichael Stahl3-0/+673
The problem with the bugdoc is that SwFrame::GetNextSctLeaf() creates a follow frame for a section in a table, and puts it outside the table, below the page's body frame, while moving text frames that have the mbInfTab flag set into the follow frame. The situation is different from forcepoint #18 though: the frame "this" is a SwTabFrame here, and GetNextCellLeaf() *does* return a plausible looking follow cell frame, however it's ignored later because CanContainSplitSection(this) is false since it's a SwTabFrame. IIRC table-in-section-in-table should not be split anyway, so just add a check here and return early. (regression f8a76d218305a56d15b82b9dac4fafa558872780) Revert "forcepoint #3" This reverts commit 34627ad7d03f93b89689b2e48a3985574d10f965 because it was just a work-around not to crash with the invalid table frames. Change-Id: I54692a67edade23c6b8e0a9be806728b0012a3fd Reviewed-on: https://gerrit.libreoffice.org/51751 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 5e18136a01208f5df7c5f554bbcdab2ef661e136) Reviewed-on: https://gerrit.libreoffice.org/52383
2018-04-05forcepoint #28 missing cell on abw importCaolán McNamara1-2/+5
Change-Id: I7633a17afab5aa2eb9e47a552bd5d92c87d383c7 Reviewed-on: https://gerrit.libreoffice.org/51852 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-05Resolves: tdf#116474 bring hidden text property under undo controlCaolán McNamara1-1/+2
Change-Id: I7bc18e8bc34f2a759371950f9d20dce48f472131 Reviewed-on: https://gerrit.libreoffice.org/51635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-04forcepoint#36 avoid dangling SvTextShapeImportHelper in case of exceptionsCaolán McNamara2-0/+5
Change-Id: Ibdbc047029c31d2b06d2349d68e1cbd9b15fd514 Reviewed-on: https://gerrit.libreoffice.org/52136 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-04tdf#106746: pDelPam is a bit specialAron Budea2-1/+37
Regression from db17d3c17c40d6b0e92392cf3c6e343d1d17b771 Change-Id: I17e2fef2eb16a900cc487b75c3b9dbba2764ac71 Reviewed-on: https://gerrit.libreoffice.org/51814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 7b1d50e97eaa00855152e74f42b789fc643e0bac) Reviewed-on: https://gerrit.libreoffice.org/51905 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-29tdf#116525 writer, no shadow around boxNoel Grandin1-1/+1
regression from commit 2ccde70d60d3a5074faf49260e8fe0ccdb91ff26 teach redundantcast plugin about functional casts because we are now passing the same variable as a both an in-parameter and an out-parameter Change-Id: I6454103fbc46530180cde5f725273e062eb2e25d Reviewed-on: https://gerrit.libreoffice.org/51757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 327fd7ea7209c9131ac86757fa8d5ca925eeccb5) Reviewed-on: https://gerrit.libreoffice.org/52012 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-03-26tdf#115573 Revert: tdf#107555 Apply 'Default Style' table styleJim Raykowski2-18/+9
...to newly inserted tables Revert due to tables with autoformat style not able to persist direct formatting. Reviewed-on: https://gerrit.libreoffice.org/51253 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit eeb4a2ec37bf88b26a9f243cc5682e96c9e35df6) Conflicts: sw/source/ui/table/tautofmt.cxx Change-Id: Ic33033235b9f5bfba15ec74fa88e94da2dc21b69 Reviewed-on: https://gerrit.libreoffice.org/51362 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-26tdf#116269 RTF import: implement reverse deduplication for listsMiklos Vajna2-0/+30
This is the same mechanism that was added in commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305: writerfilter RTF import: override style properties like Word, 2014-06-17), except that here the reference is a list definition, not a paragraph style. Also, this commit only implements the part that inserts explicit defaults for not repeated properties, not the actual deduplication, as that already works at a dmapper level. (Saving the bugdoc as DOCX, it's visible in document.xml that DOCX marks these defaults explicitly: <w:ind w:left="0" w:right="-6" w:firstLine="0"/> but RTF does not, so the right place to fix this is in the tokenizer.) (cherry picked from commit 0f0a80123d970ef6f3f8269619813e5277fff4df) Change-Id: Iec88d9bf1032d1d89194bd272500d6780c3c2224 Reviewed-on: https://gerrit.libreoffice.org/51690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-03-23tdf#112448: Fix: take correct line heightSerge Krot3-3/+18
When line metrics is not calculated we need to call CalcRealHeight() before usage of the Height() and GetRealHeight(). Change-Id: I104bbb81ea9d7130dfd728f7114d02e3672afbc3 Reviewed-on: https://gerrit.libreoffice.org/51319 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 3c3f10da500967fc6ffecc2f3e076d8ff43e7503) Reviewed-on: https://gerrit.libreoffice.org/51350 Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
2018-03-23tdf#113182: DOCX filter: new values of wrap property in text boxSerge Krot2-0/+8
Added support of "none" and "through" values of the w:wrap poroperty in the text box. Change-Id: I83f0c9e8162e93bf457f228d49d3b426050d4dc6 Reviewed-on: https://gerrit.libreoffice.org/51396 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit be02ce71f2ee694fa2609a7a630853c24acfbfff) Reviewed-on: https://gerrit.libreoffice.org/51431 Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
2018-03-21Resolves: tdf#116429 unwanted extra step in undo insert shapeCaolán McNamara1-3/+8
Change-Id: I23065275baa60a09f2a3c15513e3f2b8160e2bf0 Reviewed-on: https://gerrit.libreoffice.org/51706 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 655d7340536ed2847d1da873b141d8776f791d12) Reviewed-on: https://gerrit.libreoffice.org/51711
2018-03-20tdf#116472: import "auto" border color as blackMike Kaganski2-14/+18
Since commit fe6da2feb57c3d5e355a36f6b8ac09b48412ff39, "auto" color is supported in OOXML import. Since ODF doesn't support "auto" color as border color, just convert "auto" border color to black on import, like is done in GetLineIndex in ww8par6.cxx. Incidentally, this also fixes a problem in RTF import, where we used to import black borders ("\red0\green0\blue0;" entries in color table) as 0x000001 ("\red0\green0\blue1;") - see fixed tests in rtfexport2.cxx. Change-Id: I4f5e720d215b51c8a43dc7c58f338741bd608efc Reviewed-on: https://gerrit.libreoffice.org/51519 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51585 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-20tdf#116179 Support reading "auto" colour from docxLuke Deller4-24/+11
In docx a colour value is represented as a 6-digit hex RGB value, or alternatively the word "auto" to represent automatic colour. - Add support for reading the value "auto" as COL_AUTO. Previously this would be read as if it were a hex value, stopping at the letter 'u' which is not a valid hex digit, resulting in the colour 0x00000A - a very dark blue, which looks close enough to black that it went unnoticed for a long time :-) - Remove code which tried to handle this wrong 0x00000A value, including the constant OOXML_COLOR_AUTO, as it is no longer needed and will cause surprises for anyone who really wanted this exact shade of dark blue - Fix unit tests that were checking for 0x00000A Change-Id: I6000070341931147ff9341ad6281cd3b53c02b46 Reviewed-on: https://gerrit.libreoffice.org/50995 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/51461 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-03-20tdf#108482: ignore repeated headlines' previous instances heightMike Kaganski3-0/+18
Change-Id: Idae0b99c4171556612fb41bb02f1c48bbfeec4b2 Reviewed-on: https://gerrit.libreoffice.org/51073 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 82d9af7f14c808d48fa5db9420c85a8d26c79905) Reviewed-on: https://gerrit.libreoffice.org/51075 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-03-19ofz#6999 check available data lenCaolán McNamara1-2/+2
Change-Id: I89a7913d35706ee5797beee654ef99be088431b8 Reviewed-on: https://gerrit.libreoffice.org/51498 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-17tdf#107035 Fix field character style DOCX importLuke Deller3-0/+28
Reinstate a call to DontExpandFormat which was removed from appendTextContent in commit 232ad2f2588beff50cb5c1f3b689c581ba317583 This ensures that direct character formatting which ended immediately before the insertion point will not be expanded to cover the inserted content. Change-Id: Ie5fa6b5c5acee4f885f9e67535e98801af23661a Reviewed-on: https://gerrit.libreoffice.org/50729 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 18cbb8fe699131a234355e1d00fa917fede6ac46) Reviewed-on: https://gerrit.libreoffice.org/50815 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-03-15ofz#6827 Bad-castCaolán McNamara3-18/+35
Change-Id: I856d781f122c21c02a0a8cd01369d49f50b8a555 Reviewed-on: https://gerrit.libreoffice.org/51364 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2018-03-15tdf#116397 get bounds of full field, not start of char inside fieldCaolán McNamara1-0/+7
The pSpecialPos is set for the StartTag case (#i75130#) and I surmise we only care about it if we are a smarttag Change-Id: Ic764bbf31a7784ab021f306f74a08473c8dd0a77 Reviewed-on: https://gerrit.libreoffice.org/51298 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15tdf#115861 DOCX import: avoid last-paragraph removal when discarding footerMiklos Vajna2-0/+7
Discarding header/footer is necessary when the document or section settings request to ignore first or even headers/footers. In the bugdoc case settings.xml didn't opt-in for different even/odd footers, but there was an even footer to be ignored. Handle this state at two more places, so we don't end up in a situation where we ignore the footer but not its "remove last (empty) paragraph at the end of the footer" action. Also make the debug dumper for text ranges more robust to have a working token dump when we try to get the string for a table. (cherry picked from commit 49cf733effc56c09c5e2eb023120c2d3532b5b3d) Change-Id: I6395f37aa40c42304e2c918d87dadecb21e9d378 Reviewed-on: https://gerrit.libreoffice.org/50884 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15ofz#6891 empty vector accessCaolán McNamara2-1/+8
Change-Id: Ic36d03d2646ebd90bea5fa91bc4dac3596a55d4a Reviewed-on: https://gerrit.libreoffice.org/51229 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-13tdf#107094 backward heading search doesn't always workCaolán McNamara1-2/+3
regression from... commit 84e44386d70e886f9bae633ebe915ea3a52f8dbd Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Nov 12 10:35:18 2014 +0000 coverity#982189 Unchecked return value so put it back the way it was and explicitly ignore the return instead Change-Id: I6f5ef42b38236ea5f70ddbccfa25a81f2f3e976c Change-Id: I0c0084247e8570ace2198fa893db273dab00d2b0 Reviewed-on: https://gerrit.libreoffice.org/51147 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13forcepoint #24 back() on empty vectorCaolán McNamara1-0/+517
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: Idb6723b53a1ae8aaca80847bfe643bc4abaedd21 Reviewed-on: https://gerrit.libreoffice.org/51122 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-12forcepoint #21 pop on empty stackCaolán McNamara1-0/+1779
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: I25b1c6361fb0a3ae6b01f2be870c9e1b49bf5b84 Reviewed-on: https://gerrit.libreoffice.org/51115 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-12ofz#6827 drop last anchor pos if it will be joinedCaolán McNamara1-0/+15
Change-Id: Ib36b74b455f741d9dcccbdf244d21453837bda3c Reviewed-on: https://gerrit.libreoffice.org/51099 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-07tdf#91680 Reserve space in margin for comments only if there are commentsGabor Kelemen1-3/+8
Change-Id: Ida08737cf537d85a94a72572e8cbc7e2bfad9333 Reviewed-on: https://gerrit.libreoffice.org/50505 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit c77e01d63b4bd4805c4a499e4e0cab917d0eb403) Reviewed-on: https://gerrit.libreoffice.org/50803
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 16:32:12 +0000