summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2018-08-23tdf#116370 cleanup Writer idle job handingJan-Marek Glogowski5-35/+37
This prevents the start of the idle job, while processing itself, so the fixed WinSalInstance::AnyInput of commit 3bf6c97029d2 ("tdf#112975 WIN correctly handle VclInputFlags::OTHER") won't report the timer events of the re-started idle job to process. Fixes the early abort of the background job, which resulted in the busy loop of the reported bug and this strange printing behaviour. P.S. I'm not sure, why this was just broken on Windows. Change-Id: I6503dcd925c9a0ed843e794a31eea32a4a4b2889 Reviewed-on: https://gerrit.libreoffice.org/59279 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 401cba4c20fbc930f034168872642428d7459218) Reviewed-on: https://gerrit.libreoffice.org/59315 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-22tdf#119294: reimplement fix for tdf#118859Mike Kaganski1-17/+32
When removing paragraphs with mail mere fields, both field type reference and node reference could get invalid, because field type will be destroyed when its last field is gone; and node will be destroyed if it is in a fly with anchor in another node which gets destroyed. To avoid use-after-delete, we will use an SwClient on field types, thus detecting if a collected field type got destroyed; iterating over fields using SwIterator is safe, because removing a node with fields would update the iterator. Change-Id: Id8b555ef7015b13ab70ebb41845d34c477ac6b31 Reviewed-on: https://gerrit.libreoffice.org/59164 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c883d5e073d2ac5b2d55126c929d7bf3e6d295e8) Reviewed-on: https://gerrit.libreoffice.org/59175 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-20tdf#118385 Avoid crash on loading documentSzymon Kłos1-1/+1
Change-Id: Ifb18fee79667a5d0284407e84877b0d4d89536d9 Reviewed-on: https://gerrit.libreoffice.org/59173 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 308fbd8cdf9ce0fc3921b6c4c58707609b486fb9) Reviewed-on: https://gerrit.libreoffice.org/59247 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-20tdf#117086 crash on deleted SwFootnoteBossFrameCaolán McNamara1-0/+4
use SwFrameDeleteGuard to lock pOldBoss to exist over the range its directly accessed Change-Id: I68af80114a380f68b86cbc78278fb9e5e87cccce Reviewed-on: https://gerrit.libreoffice.org/59113 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-20ofz#9934 null derefCaolán McNamara1-0/+0
Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5 Reviewed-on: https://gerrit.libreoffice.org/59249 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-20ofz#9917 use a WW8SprmIter to find the sprmCaolán McNamara2-27/+14
extend WW8SprmIter to support the needed paramater match feature and drop the custom WW8PLCFx_SEPX::HasSprm logic Change-Id: I5893e04402ed03493add398f0939a578807561ef Reviewed-on: https://gerrit.libreoffice.org/59119 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-20tdf#119224 start and end are expected to exist for the scope of this functionCaolán McNamara1-3/+5
Change-Id: I771bce68a2ac923af6a7d54646a2c59ce6f10f7e Reviewed-on: https://gerrit.libreoffice.org/59179 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-20tdf#118457 Place Help button on the leftOlivier Hallot1-10/+6
Change-Id: Id1c386fab92a2e21e7b2f07f08daf08d5886d027 Reviewed-on: https://gerrit.libreoffice.org/56774 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 15eadb56d0a24fb4b1e70c8afb41f6e02eb47761) Reviewed-on: https://gerrit.libreoffice.org/56775 Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2018-08-17Resolves: tdf#119013 do not over-aggressively reorder date particlesEike Rathke2-4/+4
In particular not when reading documents as we don't know what the original (default/system) locale was when the date format was created and stored and whether the format's date order actually matched the locale's ordering. Regression from commit 51478cefaa4e265b42e3f67eda0a64767ff3efba CommitDate: Tue Apr 18 17:01:27 2017 +0200 Resolves: tdf#107012 follow date order of the target locale Change-Id: I9d3bdbd512d95ed81ff6459e368a2d7497ec8a2d Reviewed-on: https://gerrit.libreoffice.org/59182 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 5b8007afdb97d416ee7c22bf9226e927d61e9bd3) Reviewed-on: https://gerrit.libreoffice.org/59215 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-17insert->envelope->printer->setup crashesCaolán McNamara1-1/+1
Change-Id: I06d91941eaab0f622b384e9b3379d033890fd92f Reviewed-on: https://gerrit.libreoffice.org/59185 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-16tdf#119252: Revert "Remove < USHRT_MAX check that is presumably no longerStephan Bergmann1-3/+3
...needed" This reverts commit 4a61006255c67bb6f9ac99107093a424a9de441e, as it turns out to actually break things. I'm not quite sure how I came across that code and the attempted fix back then, but at least ASan+UBSan `make check` still works after the revert (and UBSan seems the most likely reason I came across this). I know too little about that Writer table layout code to know whether the original code is actually good, or would need some other fixing, so lets just revert for now. Change-Id: I1e88372a3b688a5fdd4c1bf88033b51287195799 Reviewed-on: https://gerrit.libreoffice.org/59002 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d9c312d1917bc039bb0354c8c3f5c9dbbb758cf1) Reviewed-on: https://gerrit.libreoffice.org/59039 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-08-16tdf#118058 sw, sections in tables: no split for multiple columnsMiklos Vajna3-1/+61
The original use-case was "group a few paragraphs together" for the split sections inside tables, i.e. it's safe to not split when the section has multiple columns. And the multiple columns case would mean that we don't find where to put the follow section inside a table, resulting in a layout loop. (cherry picked from commit d2d996db4806e84ae0bf6aef1c285b498f2d2867) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: Ifab220e582439d2e757b5645f3167b55a051a379 Reviewed-on: https://gerrit.libreoffice.org/58983 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-08-16ofz#9908 validate no negative editengine selection positionsCaolán McNamara1-1/+3
Change-Id: I37dace2051518224c55756362facd3edba4a9571 Reviewed-on: https://gerrit.libreoffice.org/59059 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-08-15outer loop unrelated to inner loopCaolán McNamara1-30/+17
since original checkin of... commit 9cddf9da7fb256418e1bc3b4719abb55e3b0604c Date: Tue May 22 15:33:44 2007 +0000 INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED ... 2006/12/13 12:31:03 tl 1.1.2.38: #i71244# update charts in writer where I think this LockUnlockAllCharts chart2 loop was modelled on the previous chart[1] styles loop of e.g. DoUpdateAllCharts which loop over tables. chart2 objects are unrelated to these tables, so remove the outer loop, which then means the ofz#9689 ofz#9856 ofz9874 crashes that made me look at it will get fixed Change-Id: I7d7ba0a2aa257b5aa399f20d902f01306fbaecff Reviewed-on: https://gerrit.libreoffice.org/59111 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2018-08-15tdf#117127 crash on inspecting value describing a tableCaolán McNamara1-10/+12
since... commit f86d0413f7cedf096b285c2eb6698653dd99c21e Date: Mon Mar 30 01:26:21 2015 +0200 SwXCellRange:: and SwXTextTable::getDataArray() do the same which used to have more checks than its replacement Change-Id: Id931882ef7c749ffa18ef3474e3e661ba8614ab0 Reviewed-on: https://gerrit.libreoffice.org/58977 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-08-14tdf#119130 only have the active postit as a dialog control...Caolán McNamara4-4/+12
in which pressing ctrl+tab cycles between text and button so we don't waste time searching thousands of SwAnnotationWins Change-Id: Iba34882c6588fc9414004f0ed3b2b779f77b30d1 Reviewed-on: https://gerrit.libreoffice.org/58683 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-13Reslves: tdf#119212 sort character setsCaolán McNamara1-0/+2
and save useritem Change-Id: I92f00bd982ab00571148c0e74cd9c8772451a246 Reviewed-on: https://gerrit.libreoffice.org/58922 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-08-10forcepoint73 deleted SwAnchoredObject still referenced in TmpConsiderWrapInflCaolán McNamara7-19/+43
Reviewed-on: https://gerrit.libreoffice.org/58760 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6d0ea082889c89eb8b408779f2de08da7441ff54) Change-Id: If255723834d049865fcf6fd0eac7768dfcbad2a1 Reviewed-on: https://gerrit.libreoffice.org/58768 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-10tdf#119136 GetPropertyFromStyleSheet infinite loopJustin Luth1-0/+0
So, apparently we accept a style that has no styleId and define it as such. Due to some reworkings, this function was called instead. Since we can "find" a style without a name, now every parentless style thought it inherited from this nameless style. Change-Id: I47b4119abd37ece94a39e636ddb7798b809ccb04 Reviewed-on: https://gerrit.libreoffice.org/58717 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-08tdf#117553 Change navigate behavior when in footnote frameJim Raykowski1-0/+16
This patch changes navigate behavior to move to prev/next footnote text when in footnote frame. Change-Id: If206098d8817b74ab484a1039371c058d321fda2 Reviewed-on: https://gerrit.libreoffice.org/54195 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 215e5adf4977a175bb8cc89dcbd48ef443ac8f10) Reviewed-on: https://gerrit.libreoffice.org/58304 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-07tdf#118859: Avoid trying to remove already removed nodesMike Kaganski1-16/+18
Regression from commit db04be037b611e296ef9f2542322c52ed82d7a2b Change-Id: I530c00f6357b4822654add6e5f2eecb3252b88ae Reviewed-on: https://gerrit.libreoffice.org/58612 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 576fac6f6199a87fb07e4a067abaa18c89b6d7ea) Reviewed-on: https://gerrit.libreoffice.org/58619 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-07tdf#109137 sw textbox: fix initial wrap type of a shape's textboxMiklos Vajna3-0/+22
This was already working for the DOCX import by luck. Make the wrap type explicit, so the ODF import has it correctly. The wrap type for the hidden sw text frame ("textbox of a shape") should be always "through", wrapping is only performed for the surrounding draw shape. (cherry picked from commit 59f5f666a5085ae58a8dd164636a6bea47e6bddc) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: Ice28cd5b517d544cfab4900dee32f01b534fee26 Reviewed-on: https://gerrit.libreoffice.org/58671 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-07forcepoint#70 give all escher client data objects a common parent classCaolán McNamara3-4/+4
and make NotifyFreeObj a virtual method of SvxMSDffClientData, finding the sc case where the client data was neither SvxMSDffImportData nor ProcessData. make the sc case a XclImpDrawObjClientData whose NotifyFreeObj is a noop Change-Id: I07422e7a3415114674bb1e3c1ef120299adf2dc8 Reviewed-on: https://gerrit.libreoffice.org/58552 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-07forcepoint#69 ditch any unclosed m_pPosAfterTOC before dropping cursorCaolán McNamara3-5/+4
Change-Id: I6b56a48f5449b25fe3bdc2e02d3885388b0da74f Reviewed-on: https://gerrit.libreoffice.org/58497 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-07Ensure consistent pointer-to-member representation on MSVCStephan Bergmann1-0/+7
...even with --disable-pch, where CppunitTest_sw_macros_test failed because creating the three iterWrong, iterGrammar, iterSmartTags in SwTextFrame::PaintSwFrame (sw/source/core/text/frmpaint.cxx) happend to have a differnt idea about the size of pointer-to-SwTextNode-member than the WrongListIterator ctor in sw/source/core/text/wrong.cxx. Change-Id: I6acef19c798991cc0fd65f6e8d5cf44485b6d2c6 Reviewed-on: https://gerrit.libreoffice.org/58670 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit f96ba2d948deb4a14dd686d74c758e1429c239a4) Reviewed-on: https://gerrit.libreoffice.org/58678 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-07sw: fix ignored frames in AppendAllObjs()Michael Stahl1-3/+9
The problem is that AppendAllObjs() doesn't check if MakeFrames() actually created frames, it just assumes success. If there are frames anchored in frames, then it could go through the circular_buffer, find a dependent frame before its anchor frame, unsuccessfully call MakeFrames(), then call MakeFrames() on the anchor frame, and then the vector is empty. A surprising aspect is that push_back on a boost::circular_buffer will silently pop the first element if it's already "full". Possibly this is what caused tdf#112447. 1. insert section 2. in paragraph in section, insert frame 3. repeat 2 4. drag anchor of frame 1 into body of frame 2 5. edit section, click hide 6. edit section, un-click hide 7. only one frame is displayed (regression from 575e222a1742918be052f2b716ddf57ce0008404 and/or ce2fce9a41729774689080c8b5552b60c2e6ee2d) Change-Id: Ie782252ac388524dfb083f655320a50e95239b24 Reviewed-on: https://gerrit.libreoffice.org/58676 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 31e66bd07c1082bb375be8aaf7835f019351d9bb) Reviewed-on: https://gerrit.libreoffice.org/58679 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-03forcepoint#67 null derefCaolán McNamara1-2/+4
Change-Id: I666c6b1795e037d3bb74d4ccc33be0e161bfb157 Reviewed-on: https://gerrit.libreoffice.org/58445 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-03forcepoint#61 null derefCaolán McNamara1-2/+4
Change-Id: Ia22f1df0ce3a49a8cb9b11e35895f9d1e13a2e05 Reviewed-on: https://gerrit.libreoffice.org/58407 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-02tdf#119042: Also check if SfxViewFrame::Current() is nullptrMike Kaganski1-2/+3
Change-Id: I5ac43ff626bfb4e2e754cacead5bf87115f3ce4b Reviewed-on: https://gerrit.libreoffice.org/58447 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit d0a481d09e696f6d5a2a0d40a9d5c48cfca559bf) Reviewed-on: https://gerrit.libreoffice.org/58457 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-07-31tdf#118971: allow arrow keys to move images or drawing objectsXisco Fauli1-4/+26
Partially revert 2d5ce0e1b233c83f91481cd6b9306ac8de7f5ff8 Change-Id: Ie4c91529c1ce878f4b0474d815a3a88ed48769c2 Reviewed-on: https://gerrit.libreoffice.org/58318 Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e1d73cb5552c2566c6d7463ce001e555523f3d92) Reviewed-on: https://gerrit.libreoffice.org/58342 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-07-30Resolves: tdf#118965 fix input list edit buttonCaolán McNamara1-1/+1
regression since... commit 7d5245848c28f5786258476cd7aa2a4523645de3 Date: Fri Sep 15 17:39:48 2017 +0200 tdf#79877 revert to old behavior when clicking on input fields. Change-Id: I5e67a8f0c8d2599c139d3d728298c30f4a31c8d1 Reviewed-on: https://gerrit.libreoffice.org/58315 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-07-28tdf#118764 Add missing tab stops in sidebar panelsJim Raykowski1-1/+1
Change-Id: I09d5df8d7f07eb4b6c4341d9cd281131fc2df23b Reviewed-on: https://gerrit.libreoffice.org/57535 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-on: https://gerrit.libreoffice.org/58216 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-07-27tdf#37223 Writer: insert 1-cell tables as text instead of OLE objectLászló Németh1-2/+21
to get a user-friendly solution to copy Calc cell content to a text document and to its native tables. NOTE: MSO does the same for copying 1-cell tables, while LibreOffice was able to do this only with paste special as RTF. Change-Id: I6156333055aa9bed4cf56ff12f913e89d3f5700c Reviewed-on: https://gerrit.libreoffice.org/57783 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/57814 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-27tdf#109077 sw textbox: fix as-char shapes with custom print area in paraMiklos Vajna3-2/+20
Regression from d379d18666aa42031359ca8eb34b0021960347ae (oox: import WPS shape with text as shape with textbox, 2014-06-18), the position of the textbox should be relative to the print area of the text frame, not to the text frame itself. (cherry picked from commit 11d87b35474b642e99e7aa397aa18992c1bc20c9) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I2b591dc46ad4967edd8a1691d9b100ef0d74bed3 Reviewed-on: https://gerrit.libreoffice.org/58084 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-07-27tdf#101534 sw: fix lost indent attributes when copying into numbered paragraphMiklos Vajna4-1/+92
Commit aa91dc0ccbe53ffcec9dbfec2265de057775d4e3 (CWS-TOOLING: integrate CWS sw32numbf01, 2009-09-08) replaced the SwDoc::ReplaceNumRule() call with SwDoc::SetNumRule(), as the later handles list ids. This required a decision if resetting of the indent attributes is needed or not, but it did not document why resetting was chosen. On the other hand, the current bugdoc shows why resetting is a bad idea: this way if you paste into a numbered paragraph which has a non-zero paragraph indent inherited from the numbering + zero indent as direct formatting, then this later is lost during paste. (cherry picked from commit 340eaa6aa15c18cc2696a4a304350810cb36565c) Change-Id: Ie5dcf6ed86c240fd61c4d5bfed886910aea3648f Reviewed-on: https://gerrit.libreoffice.org/57739 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-07-26related tdf#63561 docx: styles inherit tabstops tooJustin Luth3-2/+12
Add import and export support for style-parent tabstop inheritance. This patch is dependent on GetPropertyFromStyleSheet commit 39171b82b245a7589b9258337a18d6dd281f8ed2 Change-Id: I0245d0e08f140b6cb473c96cffa6f5a4ceff8944 Reviewed-on: https://gerrit.libreoffice.org/57278 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-on: https://gerrit.libreoffice.org/57759 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-25tdf#118777: Disable signature line slot if non-text objectKatarina Behrens1-1/+7
in 6.1 only in sw, the functionality ain't there yet in sc Change-Id: I54f7ec336026013d09ac6262779e7fcbd17c2084 Reviewed-on: https://gerrit.libreoffice.org/57949 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-on: https://gerrit.libreoffice.org/57990 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-07-25tdf#118528 sw layout: only direct formatting for EmulateTableKeepJustin Luth2-7/+7
Emulating MSWord's way of keeping a table with the next paragraph has caused a few complaints, but never anything that seemed to clearly indicate a real problem - usually just badly designed documents. But a common theme has been the keep attribute coming through styles. Since our export-emulation writes directly to the paragraph properties, lets make the emulation dependent on direct formatting to avoid some of these complaints. Change-Id: I008fc7b6a7083292463c20972ad209761ec97601 Reviewed-on: https://gerrit.libreoffice.org/57613 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit ef86b2e7a08ea25c434db85087d094f030f762cc) Reviewed-on: https://gerrit.libreoffice.org/57697 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-25tdf#63561 docx export: "clear" unused inherited tabsJustin Luth3-22/+28
If a style contains tab definitions, then the paragraph inherits these. They are added to any tabs defined at the paragraph level. Unwanted inherited tabs must be explicitly removed. (TODO: LO ought to be inheriting from ALL parents, so the same logic ought to apply to a style's parent tabs, but currently LO does not import that way. So the proof unit test looks different in MSO compared to LO.) Change-Id: Ida8ed2792482655d512c753fdff8d02062d895a8 Reviewed-on: https://gerrit.libreoffice.org/57255 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 859a0389b5639397e9c46cd4828a35793bd194f8) Reviewed-on: https://gerrit.libreoffice.org/57267 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-24sw,sc: Signature Line: fix VclPtr assertionMichael Stahl1-2/+2
Insert a Signature Line, right click, Sign..., Cancel include/vcl/vclptr.hxx:116: VclPtr<T>::~VclPtr() [with reference_type = AbstractSignSignatureLineDialog]: Assertion `(!m_rInnerRef.get() || m_rInnerRef->isDisposed() || m_rInnerRef->getRefCount() > 1) && "someone forgot to call dispose()"' failed. Reviewed-on: https://gerrit.libreoffice.org/57913 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 6de194cb685dbe105a73812afa73070d04341bfb) (The sc part is missing in libreoffice-6-1 so only fix sw) Change-Id: I09a1b37b917b267a84ee95fb375658974ee1b320 Reviewed-on: https://gerrit.libreoffice.org/57924 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-07-24tdf#81943 sw RTF import: fix missing wrap in background for in-table shapeMiklos Vajna2-0/+54
Regression from commit 015fd55c94b7b650ed8e572cafaf3b0f903b01b9 (tdf#96275 RTF import: fix anchor of shapes inside tables, 2016-05-10), remember more context when delaying the import of a shape. (cherry picked from commit 0c91f8f839d36c8b5af272b1d3c835d2f4af6b65) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Idc02868eb3fe5b7637c9fd00c841bf71423adf2b Reviewed-on: https://gerrit.libreoffice.org/57555 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-07-24tdf#118716 Inner border of an embedded table can't be dragged aroundNoel Grandin2-7/+7
regression from commit f14b9d30293f180500fc56d81e5390021758e7c1 convert (a>b?a:b) to std::max(a,b) In this code int a; std::max<sal_uInt16>(a,0) std::max will first convert a and b to sal_uInt16, therefore potentially converting a negative number to a positive number due to the conversion rules. Then it will take the larger number. While this code int a; static_cast<sal_uInt16>(a > 0 ? a : 0) will compare first, and then convert the larger number to sal_uInt16, which might result in making a "a" that is larger than 2^16 into a smaller value, but which will never convert a negative "a" value into a positive value. Change-Id: Id4f6df0089b1a74ea4ac1c5d05655e7c1d8f0c7f Reviewed-on: https://gerrit.libreoffice.org/57846 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit c13865a4caf7898c4e59a5b22bbd493d6dad9661) Reviewed-on: https://gerrit.libreoffice.org/57908 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-07-24forcepoint#51 anchor location deleted before graphic anchor processedCaolán McNamara2-1/+5
try deferring to after anchor stack is cleared Change-Id: Iaa42d19635968d1656e171a7e0c5e473879cd8f3 Reviewed-on: https://gerrit.libreoffice.org/57776 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-07-20tdf#104797 DOCX change tracking: handle moveFrom and moveToLászló Németh2-0/+19
data as deletion and insertion instead of importing them as normal (unmodified) texts (messing up document content and losing change tracking information). Change-Id: I9c0a7da83f3e8235d65d47afdb99ffe188f52704 Reviewed-on: https://gerrit.libreoffice.org/57723 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/57729 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-19Resolves: tdf#118827 SetCareWin should be SetCareDialogCaolán McNamara2-2/+2
Change-Id: I84c00a193e65a18b3ba82351c07be0b63e0cd5d4 Reviewed-on: https://gerrit.libreoffice.org/57720 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-07-19tdf#118651 OOXML ActiveX textbox: fix multiline supportBalazs Varga2-0/+25
of textfield component in DOCX/PPTX by handling properties AX_FLAGS_MULTILINE and AX_FLAGS_WORDWRAP during the import and export. Both of them need to be enabled to get multiline textfield in MSO, but LibreOffice has got only one multiline property. With this fix, LibreOffice imports only really multiline textfields as multiline, and it doesn't export multiline textfields as single line anymore. Change-Id: I9b567c3fcdc5d01a5838a3ec2517579f8d788954 Reviewed-on: https://gerrit.libreoffice.org/57552 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/57619 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2018-07-19tdf#118579 ignore body in body instead of flagging as an errorCaolán McNamara1-3/+1
Change-Id: Ie6626a320a5264aea004f7c57244643798703de8 Reviewed-on: https://gerrit.libreoffice.org/57653 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-07-19tdf#118635 relative checkbox disabled on reopenCaolán McNamara1-7/+7
Change-Id: Ic52737e5122b1ae37390061a5f7cf17b69e7e665 Reviewed-on: https://gerrit.libreoffice.org/57499 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-07-18tdf#118738: use SwDepend instead of WriterMultiListener in SwContentNodeXisco Fauli5-168/+217
This reverts commit 83243003b46dfb258c2b41049b0e1cb82a2d7ddb use WriterMultiListener instead of SwDepend in SwContentNode - also move SwContentNode and SwTextNode from Modify to SwClientNotify - this removes the last public use of SwDepend, which should now become an implementation detail of WriterMultiListener and commit ecf50fe71596c3edba8ce437481ab80ae1cd8935 remove now obsolete SwDepend Revert them for now ( specially before the relese of LibreOffice 6.1 ) until a fix for the bugs listed in tdf#118738 is provided Change-Id: I174feb3b092ff31b4c4837011c31343296c0c693 Reviewed-on: https://gerrit.libreoffice.org/57698 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-07-18bubble referer to LinkManager::GetGraphicFromAnyCaolán McNamara1-1/+8
Change-Id: Id2c6d629692a365f96f3f81c5686930668389a6a Reviewed-on: https://gerrit.libreoffice.org/57549 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>