summaryrefslogtreecommitdiff
path: root/sw/source
AgeCommit message (Collapse)AuthorFilesLines
2019-04-05tdf#114306: Revert commits fixing this issue ( 6.1 only )Xisco Fauli3-63/+21
Revert "tdf#114306 fix crash caused by special document 2" This reverts commit d30eefb677b446886f7b5bab6de93d489ba63529. Revert "tdf#114306 fix crash caused by special document" This reverts commit e4400f4c4e267f8528df3a7d5a09623c888bd10c. Revert "tdf#114306 fix unexpected page break in row-spanned table" This reverts commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50 Change-Id: Ifff799616f12ee428a3f923f6510b20059f5bc71 Reviewed-on: https://gerrit.libreoffice.org/69848 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-04-03tdf#124272 use ClipRegion's geometry if not a rectangleArmin Le Grand1-2/+27
By error the ClipRegion's geometry was replaced by it's BoundRect expanded to PixelBounds. If the ClipRegion is not a rectangle, this will create wrong results. To do both - extend to PixelBounds and have the original geometry included - use the PolyPolygon topology as needed (see comment in code for details) Reviewed-on: https://gerrit.libreoffice.org/70146 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 362c1cf2bd580f6dc8bf27bdcd79174111bc1b5c) Conflicts: sw/source/core/doc/notxtfrm.cxx Change-Id: If3f75223144eba8eb23909a7c701ad544346099b Reviewed-on: https://gerrit.libreoffice.org/70158 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-04-02tdf#123705: avoid duplicate themeColorJulien Nabet1-0/+3
See http://bugs.documentfoundation.org/attachment.cgi?id=149585 + https://bugs.documentfoundation.org/show_bug.cgi?id=123705#c4 Change-Id: I3c6fb0a1ac46a62c75bb9daeaded1633889416eb Reviewed-on: https://gerrit.libreoffice.org/68398 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 42398e3860aafd6468688eda6c0da942323b7f82) Reviewed-on: https://gerrit.libreoffice.org/68614 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-03-27Resolves: tdf#124142 don't deref nullptrCaolán McNamara1-1/+2
Change-Id: Ie14600e9f9a1e1c4e99c7a872f5d677453481888 Reviewed-on: https://gerrit.libreoffice.org/69666 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ac7ce7a64ef903bad1476f5635a7b2a1e951a7a3) Reviewed-on: https://gerrit.libreoffice.org/69694 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-03-22tdf#124109: Revert "Only do kashida insertion with fonts that have non-zero ↵Khaled Hosny3-12/+11
width kashidas" This reverts commit c45b23377bb2fe44c26f1287ff38495344e4ca50. This commit breaks Kashida justification when a document is first opened (the kashida justification will be disabled and spaces will be used untill the text is changed). Probably it is checking for width of Kashida glyph too early. Also I'm not sure what the reverted commit was trying to fix since we already do kashida justification in fonts that has non-zero width Kashida and it has been the case for a long time. This does not fix the original issue in the document attched with the bug report, but if fixes kashida not being applied when opening the document. Change-Id: Ic95859bca94fa792793e3223d2adb465bc6d880f Reviewed-on: https://gerrit.libreoffice.org/69509 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 0a8e9cc5c1782f1cd50ef338ec2aa4f6776a4c0e) Reviewed-on: https://gerrit.libreoffice.org/69519 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
2019-03-13tdf#123547: do the same as in lcl_DrawBullet from cui/numpages.cxxJulien Nabet1-5/+22
See bt https://bugs.documentfoundation.org/attachment.cgi?id=149389 It seems the method from cui/numpages.cxx takes more things into account At least, it doesn't crash for the attachment of this tracker Change-Id: I05ca0b019ac483890bea4acdbb695d73b660e638 Reviewed-on: https://gerrit.libreoffice.org/68033 Tested-by: Jenkins (cherry picked from commit 684fcf2fce915f3e3e553c67fb57bdbfc8f159d5) Reviewed-on: https://gerrit.libreoffice.org/68843 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 7f2322afea3b25bc45f438b8ae9d4977ac378c1c) Reviewed-on: https://gerrit.libreoffice.org/69172 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-12tdf#116195 sw: remove DisableOffPagePositioning handling from ODF importMichael Stahl1-7/+0
SwXMLImport::SetConfigurationSettings() needs to handle only those settings for which the default is different vs. old OOo/LO versions; DisableOffPagePositioning however defaults to false, so we can just rely on that default. The inverted bDisableOffPagePositioning check is wrong. (regression from fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48) Change-Id: I300fa597f58b586b49089bb555a00a6923862abe Reviewed-on: https://gerrit.libreoffice.org/68801 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8f3df3a5a1570eea4d931f737c474df8601377ec) Reviewed-on: https://gerrit.libreoffice.org/69037 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-06tdf#123829 Respect CollapseEmptyCellPara setting when reading odf docsSamuel Mehrbrodt1-0/+6
Commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c introduced a "feature" which would hide an empty line after a table and only make it visible when the cursor is in it. So when loading an ODF doc, only enable this feature for which have the CollapseEmptyCellPara setting set. Change-Id: Ib4dfbbe8d45eb57547c51c7eee2f81331fc5300e Reviewed-on: https://gerrit.libreoffice.org/68742 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 0d2da0acfaa610c690bce552c0ed5df62d4c35cb) Reviewed-on: https://gerrit.libreoffice.org/68790 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-01tdf#116382 Replace old dialog in header and footer drop-down menuAditya1-39/+13
Remove the Background tabpage in "Border/Background" dialog accessed from Border and Background menu item in Header/Footer drop-down list and replace it with the tabpages "Area" and "Transparency" of the dialog accessed from Page Style > Header > "More.." button. The old dialog does not have the tabpages "Area" and "Transparency". In simpler words, the patch is to match both the dialogs when accessed in two different ways. Change-Id: Ib84435854389360eba41aecb8578a9a67a92ca1e Reviewed-on: https://gerrit.libreoffice.org/67483 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 55042cb54fea5f7ad777c03af9bf8197127b6736) Reviewed-on: https://gerrit.libreoffice.org/68546 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-02-13Revert "tdf#121962 Update fields after layout has been calculated"Samuel Mehrbrodt1-3/+2
See tdf#123378 for the problem caused by this. I have a fix at https://gerrit.libreoffice.org/#/c/67754/ but I prefer to revert the fix on 6-1 branch since this is the last release in this series and I'm not sure if the fix has other side effects. This reverts commit d9f02548f29678b8b7fc3a6c714ab144bd728005. Change-Id: If9298b9cafaf6984ce25ba78b2c7a79171567840 Reviewed-on: https://gerrit.libreoffice.org/67755 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-11Resolves: tdf#123320 non-existing drop caps char styleCaolán McNamara1-2/+7
Change-Id: I416e3fcffe7da549ffd3b82cb912d78d1ca02339 Reviewed-on: https://gerrit.libreoffice.org/67684 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-07Resolves: tdf#123163 avoid null derefCaolán McNamara1-3/+4
one RemoveDrawObjFromPage is already null-deref protected, do the same for the other Change-Id: Ica5bb2df4a8dbffd8397df76b673adab75bb7aef Reviewed-on: https://gerrit.libreoffice.org/67457 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-02-05tdf#119661 remove the original URL when removing a graphic linkTomaž Vajngerl1-1/+2
Change-Id: I8c875202ba8af9cbcd7eb9ce0db78f97d56a07a8 Reviewed-on: https://gerrit.libreoffice.org/67337 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 6a36bedd0a418ce12543f797ab46f24ee57feb6c) Reviewed-on: https://gerrit.libreoffice.org/67349 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-01sw: fix use-after-free in SwCursorShell::MoveFieldType()Michael Stahl1-1/+2
Change-Id: Ie272373bcef3459b05dc29bf874ecc3fdfa31d4a Reviewed-on: https://gerrit.libreoffice.org/67151 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 1ec8caedace2de2b7e6bf91468301548b54a28a8) Reviewed-on: https://gerrit.libreoffice.org/67173 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-24tdf#121561 sw DOCX: output toc-end inside last toc paragraphSerge Krot1-0/+15
During export of the TOC into DOCX all TOC field parts should be placed inside one STD frame: field start-begin, field-separate and field-end mark. Updated unit test. Change-Id: I10e37a48160e1dc4f0074c4e2e7621a59f79c2ee Reviewed-on: https://gerrit.libreoffice.org/66587 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit fd5599b9d23a2d9b13af6dd88bd2d38f438f7e00) Reviewed-on: https://gerrit.libreoffice.org/66810
2019-01-23tdf#122156: closing a section link should not clear its Hidden flagMike Kaganski1-1/+0
If a section is hidden or not does not depend on whether it's linked or not. Clearing the Hidden flag made all linked sections not hidden in DocumentLinksAdministrationManager::EmbedAllLinks() during mail merge. Existed since commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62 initial import Reviewed-on: https://gerrit.libreoffice.org/65286 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit fdf4afb25ba38c7be3278bb4bde462c3f9e722fc) Change-Id: If347008e4cf48ab1327eb04db9fdf69750ce8fa5 Reviewed-on: https://gerrit.libreoffice.org/65316 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-01-21Revert "tdf#122201 sw: DOCX: allow editing of unprotected areas in protected ↵Thorsten Behrens1-11/+1
doc" Dependent patches were abandoned, this one does not work in isolation. This reverts commit 46c6c414a6df79575517f5df67510d6f4e3d0128. Change-Id: I28edb844242a1e31df0be2e57ad8591055db330c Reviewed-on: https://gerrit.libreoffice.org/66677 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-18tdf#122201 sw: DOCX: allow editing of unprotected areas in protected docSerge Krot1-1/+11
Change-Id: I5fb590745b733e2bfb934d946276857b65caf680 Reviewed-on: https://gerrit.libreoffice.org/65278 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/65501 (cherry picked from commit 63ec2e8d07dff652a68c9dc96859c4c61f26b9df) Reviewed-on: https://gerrit.libreoffice.org/65502 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-16tdf#121168: Ensure page descriptions are correct in work documentMike Kaganski1-0/+9
When first node on a page is a section, then creation of a copy with lcl_CreateWorkingDocument initially produces a document with layout frames having wrong page descriptions applied (set to "Default Style"). The reason is that when SfxViewFrame::LoadHiddenDocument indirectly calls SwRootFrame::Init, the sections in the document have hidden flag set, which causes SwNodes::GoNextSection return the first node after the first section. The returned node naturally doesn't have a page description set, thus the initialized page frame doesn't get it. This makes following copy to destination document use that wrong style; if the correct page style had header/footer, then it would not be properly copied per record in single-document output; headers/footers would be wrong/absent. This change forces check of page descriptions after the work document had been created and initialized. Change-Id: Ic196eb7fac0241f002eddd2c1d1b66dfb489bc60 Reviewed-on: https://gerrit.libreoffice.org/65383 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit ec928ac5d84273b4bc1f923c545834dc59d3e394) Reviewed-on: https://gerrit.libreoffice.org/65407 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-15sw: DOCX: recognize TOC title during importSerge Krot4-9/+110
Change-Id: Ifa4fb59858d61580f76e3d104aa4caa6b5902d1b Reviewed-on: https://gerrit.libreoffice.org/64735 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> tdf#121561: sw: DOCX: add std/stdPr/stdContent around TOC During export into DOCX from ODT we need to do it because in this case the TOC title will be recognized inside MS Word as part of the TOC. Later we could add support of these keywords in LO import in order to detect TOC title from DOCX input. Added unit test for export. Change-Id: I7135e91dc04d4c0501e6074a046fc473e041f014 Reviewed-on: https://gerrit.libreoffice.org/63786 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/66307 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-15tdf#119126 forcepoint#76 avoid deleting footnote that would delete ...Caolán McNamara5-4/+34
... undeletable page (cherry picked from commit 0005b330eaed0b5559042d2597fb45e0c9125d7e) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I4622569eb9c757c6dcbdda32081ddc94e53db919 Reviewed-on: https://gerrit.libreoffice.org/66393 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-09Resolves: tdf#121940 mnemonic ends up in tooltip textCaolán McNamara1-1/+2
Change-Id: Ic698f23e71dbc613db2acf884fdefdeab06fde0f Reviewed-on: https://gerrit.libreoffice.org/65970 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-07tdf#122442: use Timer to detect single-clicks vs double-clicksMike Kaganski2-6/+6
Regression from commit 821ae0fb9fa63e0171f987d5ec210ec121978b8f which appeared after commits changing scheduler/main loop in the range e6e8a060ecc6e4fd51cfe88e00d841d546ed5915..9b4abcd1c45a646a1ac9120fe1c489ba6bb44e95 Change-Id: I6cf58c1e83aa9621bdd4b5c14f8565d5c69e20c1 Reviewed-on: https://gerrit.libreoffice.org/65837 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 6207c51880c9165eedb1d1af7fdc5e179bc8844d) Reviewed-on: https://gerrit.libreoffice.org/65842 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-21tdf#115319 fix Hungarian article before letter iLászló Németh1-1/+1
in words, for example “az Ipsum”, not “a Ipsum”. This bug was reported by Gellért Gyuris. Complete commit 1037e3759bf178b52d16c12a811717f94ab9950a (tdf#115319 references with Hungarian articles) Change-Id: If930feb11a0308246d2512f0093bcacdc8675d0b Reviewed-on: https://gerrit.libreoffice.org/63637 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 542d17d9384cced62db6bcfa45a5f44316409edc) Reviewed-on: https://gerrit.libreoffice.org/63669
2018-12-21tdf#116496: don't add header when setting empty watermarkMike Kaganski1-0/+6
Regression from commit 22e94ab1860b1bdea8d107d4e8824f63c6b1c8c5 Change-Id: I66a6e0b5069fe459b887a52f1ea26904dfc2d37b Reviewed-on: https://gerrit.libreoffice.org/65303 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c4f3bd7c94cacb52f7a791a0d364818cee6080b6) Reviewed-on: https://gerrit.libreoffice.org/65416 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-16tdf#121962 Update fields after layout has been calculatedSamuel Mehrbrodt1-2/+3
Change-Id: Ic4a49494652dab416ddb1545da02eb8a7f533828 Reviewed-on: https://gerrit.libreoffice.org/65126 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 2bc1d00af6863d5c92389f1f4a99d2ab9bb73f81) Reviewed-on: https://gerrit.libreoffice.org/65201 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-12-12tdf#121606: displaying Mail Merge toolbar shouldn't activate connectionMike Kaganski1-1/+16
At least I think so. Thus now the code that queries the state of the toolbar controls only queries dataset if connection is active. Operating the navigation buttons (next/prev) will, naturally, activate connection if not yet active. This should also enable the other controls that may be initially disabled: create/save/print/email documents. Thus, the navigation controls also check if they have activated the connection, and invalidate said document creation controls state. Possibly there's a better place for the invalidation of the controls, but I was unable to find one. Regression after commit 5c2c5ff01c23e4f7a8947746afc13a46cbef5bec Change-Id: I76f895c871718c9c761339ba03963baf6837b592 Reviewed-on: https://gerrit.libreoffice.org/64738 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 60714a814847f6d10f00aa6809a3896a48741e0b) Reviewed-on: https://gerrit.libreoffice.org/64746 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit b27a9058c706d70adddc71544b74b1f9607185bb) Reviewed-on: https://gerrit.libreoffice.org/64959 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-12-05sw: fix wrong title of AutoFormat with redlining dialogMichael Stahl1-0/+1
(regression from 9fcef57a34dbd88a98621dfaf8668fa076dd98f1) (cherry picked from commit 564260804ee3a8846b921188e36bc269fc8ba98e) Change-Id: Id6ea5841dd25a30519deb825c3ae0aaa7469c250 Reviewed-on: https://gerrit.libreoffice.org/64475 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-12-04sw: convert assert(bSelected out of sync) to SAL_WARN for nowMichael Stahl2-2/+2
This evidently happens sometimes, but when it does it it's impossible to reproduce... Let's use SAL_WARN for now. Change-Id: Id724fd52060bfae45f9eeb16163ddfc94e53af03 Reviewed-on: https://gerrit.libreoffice.org/64447 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit d1138d72ed4f5c2ada2dd53f4b091964d8a284e6) Reviewed-on: https://gerrit.libreoffice.org/64451 (cherry picked from commit 8f85d3db0b8b1dcfc399be4afbbc68a04c558a64) Reviewed-on: https://gerrit.libreoffice.org/64514 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-27tdf#120115: Dont crash on Footnote/Table undo/redoBjoern Michaelsen1-20/+51
brown paperbag commit: - for one, we only want to use the anchor format when we dont have another one, not the other way around - also we want to update the anchor format (not the char format) when it tells us so. - finally, keep the selected Char and AnchorFormat in Sync between SwEndnoteInfo and the underlying DocumentStylePoolManager Change-Id: Ic599dc1290c4e30d1746e5eefe6fed27b0ccdfe9 Reviewed-on: https://gerrit.libreoffice.org/63306 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-11-27Resolves: tdf#121607 set parent for password dialogsCaolán McNamara4-11/+17
Change-Id: I02210a61d103aed4a181b0e907ea2fd141e5f587 Reviewed-on: https://gerrit.libreoffice.org/63792 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-11-27tdf#121607 defer other requests until password dialog is dismissedCaolán McNamara1-0/+21
Change-Id: I82b308f482cc5eb40a00afd01a6848afc3fb8ab1 Reviewed-on: https://gerrit.libreoffice.org/63796 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-11-26tdf#120426 save the style names when set or changedCaolán McNamara2-3/+5
instead of waiting until gaining focus of the listbox, because of the differences in what that focus means in the different backends. It was an odd way to do things anyway. Change-Id: I072e3da04db184b49a86a9888080b60223813729 Reviewed-on: https://gerrit.libreoffice.org/63822 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-19tdf#120677: restore treatment of blanks in SwTextGuess::GuessMike Kaganski1-8/+12
Before commit 0be3db28a4db4d2c81a5cb2edd48711eec55b51b, all non-breakable spaces were converted to plain spaces in SwTextSlot::SwTextSlot (see pInf->SetText call there). The mentioned commit has changed that to allow differentiating non-breakable spaces from other types of spaces (related to the fix of tdf#115067). This broke following processing of the NBSPs when they don't fit to line, causing infinite layout loop leading to OOM. This allows to restore old behavior to not call the break iterator for NBSP by explicitly checking for it. Change-Id: I36ab06abb66bbe65a5fc542c41e816a9f20a2dcf Reviewed-on: https://gerrit.libreoffice.org/63290 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 4bb28ad217ea9d6511b6921dcd3d28328edcb4d6) Reviewed-on: https://gerrit.libreoffice.org/63304 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-19tdf#108022, don't overwrite chart export informationMarkus Mohrhard2-66/+68
Change-Id: I47d8a817022829c8cada614469303e440f377299 Reviewed-on: https://gerrit.libreoffice.org/63536 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 9ccdf4d8abf6ec6612c88ab65be25eb6be89b455) Reviewed-on: https://gerrit.libreoffice.org/63540 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-17sw: fix crash in SwContentTree::HasContentChanged()Michael Stahl1-4/+1
Remove() will remove the node including its children, but SvTreeList::Next() will actually return the first child, so the pChild points to an entry that has been deleted. Change-Id: Ia4bd75d64c8436ea03c0727a8d49ee0c34fda16f (cherry picked from commit cdbe48633f198250e883837dac5d93f93a42888d) Reviewed-on: https://gerrit.libreoffice.org/63427 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-12tdf#120515 ODT filter: relax layout requirement before exportMiklos Vajna1-5/+0
This reverts commit 343af46fc301a984929e071d477b8fb9f211e289 (ODT filter: make sure we have a layout before export, 2017-11-29) as it causes a performance problem with large documents (see bugreport). I added it initially for the EPUB export, but there this is no longer needed as commit 3ed8466b55ace15a28761e06b6bb76ebd8758106 (EPUB export, fixed layout: switch to a metafile-based approach, 2017-12-01) switched to the better metafile-based approach. (cherry picked from commit e83c1f0ef999bdedaf9a5d5903aa5423c40f6d95) Change-Id: Ie404e23db77b8ded1d29f42b6279a3cd06a574b5 Reviewed-on: https://gerrit.libreoffice.org/62963 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-08tdf#118820 fix table background fillCaolán McNamara1-0/+4
Change-Id: I50a65d56251f978785fa446515cb374167c604e8 Reviewed-on: https://gerrit.libreoffice.org/60682 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 65d727548740afae7175fb04a12f50e119514497) Reviewed-on: https://gerrit.libreoffice.org/62513 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-11-08tdf#121005 forcepoint#44 merge into isDeleteForbiddenCaolán McNamara1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/55355 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 c6222fb6b8b429fa2e767c73ad616147f95ab1b9) Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32 Reviewed-on: https://gerrit.libreoffice.org/62629 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-11-06Related: tdf#120277 inherit from SfxDialogControllerCaolán McNamara15-25/+25
where the dialog originally inherited from SfxModalDialog. Change-Id: Ibe0006de93b0a9f05fb3b6181baf3ba1b4cf04c8 Reviewed-on: https://gerrit.libreoffice.org/61313 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/61326 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-11-01tdf#118393: FILESAVE: DOCX Export loses header/footerSerge Krot4-1/+37
Reviewed-on: https://gerrit.libreoffice.org/56522 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit fa8b2c533265a6d74e16ffae55673d6aa0fbf6a5) Change-Id: If47a2e4953e4b98f41c9115779522a755eea8192 Reviewed-on: https://gerrit.libreoffice.org/60873 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-29tdf#115296 extend vertical FrameBorders for joined FramesArmin Le Grand1-2/+18
This feature was lost on my changes for FrameBorder primitive creation. It was calculated/applied formally in lcl_PaintLeftRightLine Change-Id: Ie44619a4c4e44ff4584533685cb21882c323742e Reviewed-on: https://gerrit.libreoffice.org/62451 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit e89e8941e114d4d1adf76df995a3f1a8d1bff4b1) Reviewed-on: https://gerrit.libreoffice.org/62475
2018-10-28ofz#11125 pass param len aroundCaolán McNamara2-11/+38
Change-Id: I4b382271df21c58de0e102af6e0b07a88a1d9610 Reviewed-on: https://gerrit.libreoffice.org/62448 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-27tdf#120188 limit the width of the styles combos in the url tabpageCaolán McNamara1-0/+5
Change-Id: Idcc4043b70c30ccc693c9c5ac983bfabe0573862 Reviewed-on: https://gerrit.libreoffice.org/62353 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-26permissionIdAndName is empty in permission-for-user caseCaolán McNamara1-11/+2
merge the two identical branches and make it do what it probably wants to do Change-Id: I38390a18fcd90349c6bd86f14c67850166b6aeaa Reviewed-on: https://gerrit.libreoffice.org/62043 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-25editeng: do not throw from QueryValue implementationMichael Stahl1-0/+6
None of the other QueryValue throw; in case of a problem they return false without initialising the Any. On the one hand, it would be useful to throw an exception for this special property that has now become Write-Only, so that API users get a better hint what is going wrong; on the other hand, it breaks various other things like the various multi-property interfaces that call QueryValue for multiple items (there are 3 such loops in SwAccessibleParagraph alone). (throw was introduced in 7a8ed362eb163ac15a000ba1cfc74b58315800a1) It turns out there is even a test for the exception on ToX. Change-Id: Id60ff43544f7399ce869227bfd6fb933dbaea3be Reviewed-on: https://gerrit.libreoffice.org/61719 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/62331
2018-10-20ofz#10994 move the reset of trailing fly paras to before redline processingCaolán McNamara1-3/+3
Change-Id: I906c29848acc3917f76cb8c21e0bd581e0ded421 Reviewed-on: https://gerrit.libreoffice.org/61821 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-10-19tdf#112520 RTF export: write ZOrder only for toplevel shapesMiklos Vajna2-3/+11
RTF export at the moment exports children of group shapes as a flat shape list. This means that the order inside the group shape is not relevant for the toplevel ZOrder, so just don't write it. (cherry picked from commit 2b920bdc12f3bf3a196ec0d6d59043a68e663e33) Change-Id: I870707cb28c2f177c0e5d9cf5328260e76b661f3 Reviewed-on: https://gerrit.libreoffice.org/61904 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-18Resolves: tdf#120003 missing prefix to link url in .doc importCaolán McNamara1-4/+30
regression from... commit 9b77f8142bf665a47c3a179e3fe3f82623a99f8a Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Apr 6 15:08:45 2017 +0100 ditch ReadRawUniString three argument lclGetString32 variant mistaken for two argument lclGetString32 variant Change-Id: I163aad0de7873487d9f9c8b6c28d162159fe7ad4 Reviewed-on: https://gerrit.libreoffice.org/61887 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-10-17tdf#119885: OOXML import: try to get cell paddings as Word doesMike Kaganski1-9/+0
Change-Id: I7abd715b6bb71d6e2e01939c4cf849d94eb6a103 Reviewed-on: https://gerrit.libreoffice.org/61843 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/61877 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>