summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2019-09-20Interpret the parameter of WordBasic.FileClose() more correctlyTor Lillqvist
In particular, the value 2 means "do not save". Change-Id: I9788d201f8ecfcc016a12aa2088552ee994e1c17 (cherry picked from commit fb797eb41bf9b26261c4d9fe7a38ba635b80a20c) Reviewed-on: https://gerrit.libreoffice.org/79164 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20The WindowName param to WordBasic.AppMaximize() is optional and must be an AnyTor Lillqvist
Change-Id: I52d75427fe30945293f347e3f49d21bc2016edae (cherry picked from commit 699676cec58083afd7fa60b67e32cf7d6c9cf63f) Reviewed-on: https://gerrit.libreoffice.org/79163 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20The parameter to WordBasic.AppShow() is optional and thus has to be an AnyTor Lillqvist
Change-Id: I134101d1be5922051e34352331a49f5706030ff2 (cherry picked from commit b1b54a5faf899488e5045c6b3e26241c9d7299de) Reviewed-on: https://gerrit.libreoffice.org/79162 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Ignore RuntimeException in Application.WindowState setterTor Lillqvist
Probably helps VB6 clients. Change-Id: I3a1072e6ededbd0322c4b0dcd0ef4b16ace215d1 (cherry picked from commit e9f87f7b8e33352b66d52b37c459a52a6737eb80) Reviewed-on: https://gerrit.libreoffice.org/79161 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add a dummy implementation of WordBasic.AppCount()Tor Lillqvist
Change-Id: Ia9e78c331d2cb711653ee3e64597ebf2824e0eeb (cherry picked from commit c06a3f33d0de59f9cbfddef353f9018a6583df4a) Reviewed-on: https://gerrit.libreoffice.org/79160 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add a dummy implementation of WordBasic.AppShow()Tor Lillqvist
Change-Id: I14379c5732c1921b8f52293045d01acf99e0b840 (cherry picked from commit ad19df8696346e608b530a7e84b8da4fad6d8c80) Reviewed-on: https://gerrit.libreoffice.org/79159 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add a dummy implementation of WordBasic.DocMaximize()Tor Lillqvist
Change-Id: I972f9446560cc8ac51031dbc36fc05d438d150e7 (cherry picked from commit 3c42f006076ecd71371612d67d84381ac42b88da) Reviewed-on: https://gerrit.libreoffice.org/79158 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add a dummy implementation of WordBasic.AppMaximize()Tor Lillqvist
Change-Id: I4606e5a3717c3717d105dd2e63c9fd7d2e1abf83 (cherry picked from commit 990c88a9a84c1960a704052f84318bc33b744fb5) Reviewed-on: https://gerrit.libreoffice.org/79157 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Use bool and not sal_Bool, says a pluginTor Lillqvist
Change-Id: I1714a609ecb520260b99f361e4ed65bdc77ddddc (cherry picked from commit 5f5726d82e92e0ed403240dbcea57567a5c38a1f) Reviewed-on: https://gerrit.libreoffice.org/79156 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add WordBasic.FileClose()Tor Lillqvist
Change-Id: Ifc48e5fbcc212f0e80cf6877e2781910e38e5e54 (cherry picked from commit e4b3fd40e583fbcbeba0bfb0a1457c1f92e1cb0f) Reviewed-on: https://gerrit.libreoffice.org/79155 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Found documentation for WordBasic.ToolsOptionsView()Tor Lillqvist
Change-Id: Ic049f78fddcaabafbe6be18b92a87b56352c1a4c (cherry picked from commit ac97be7a81370289b2e82705952eea80ba00fc68) Reviewed-on: https://gerrit.libreoffice.org/79154 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add a couple know parameters to WordBasic.ToolsOptionsViewTor Lillqvist
Change-Id: Ifd472f4ca79ab97a1d6d5c5007537375121f6f58 (cherry picked from commit f3b2383b2c8967ad57c8b9316395edcb297121ed) Reviewed-on: https://gerrit.libreoffice.org/79153 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Implement WordBasic.FileSave()Tor Lillqvist
Change-Id: Iafb5be16ebb23aa09e0300a77c2f2dbe29b85cad (cherry picked from commit bd70fbe1d93c72dda2e8518975cf0b94e606199e) Reviewed-on: https://gerrit.libreoffice.org/79152 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Add a (dummy) WordBasic.FileSave()Tor Lillqvist
Change-Id: I021d63c9d57f1e0435bcc5f97abc57bc39fece01 (cherry picked from commit 78579b56ccb51ca0f011614f0549b2c9f9452eb7) Reviewed-on: https://gerrit.libreoffice.org/79150 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Add TODO FIXMETor Lillqvist
Change-Id: I1492c604ac39ce72fe2cfe8804ac15e8c41b9a46 (cherry picked from commit bac428070379c1da45851760a92971a6eaece408) Reviewed-on: https://gerrit.libreoffice.org/79149 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Add a dummy WordBasic.ToolsOptionsViewTor Lillqvist
Does nothing. Needed for customer application to proceed. Once we are further along in getting it to work, we can investigate what the parameters passed to this ToolsOptionsView method actually are. (This WordBasic thing is something that has been deprecated since last century, I suspect, so no wonder it is hard to find authoritative documentation on it.) Change-Id: I62a6d6d9abb9364afca110570fa341a2375a77a6 (cherry picked from commit ac43be5afca3691f85f455035628df009f2d9694) Reviewed-on: https://gerrit.libreoffice.org/79148 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Try ignoring RuntimeException in ComḿandBars(), VB6 clients don't like them?Tor Lillqvist
Change-Id: Ia577174fac926295db439349f6caca178b363ba0 (cherry picked from commit f5499236c69d602ae518359c8e3e7d5e239b8eda) Reviewed-on: https://gerrit.libreoffice.org/79147 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Don't throw an exception, just ignore trying to set an unhandled WindowStateTor Lillqvist
End-user VB6 applications might not like the exception. Better to just ignore. Change-Id: I42718de7855079e38c7983db39180c184ab7224f (cherry picked from commit 0043408b027be8664dbf88093da538ba8bbbbe24) Reviewed-on: https://gerrit.libreoffice.org/79146 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Add Documents.OpenOld() method and Application.CustomizationContext propertyTor Lillqvist
OpenOld() just forwards to the regular Open(), passing empty extra parameters. CustomizationContext is fully dummy for now. Change-Id: I167494700853768d971fe16afea35e90a647a00e (cherry picked from commit 5a615ebe4d4c076d9daff9610038a20397c45792) Reviewed-on: https://gerrit.libreoffice.org/79145 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19make insert-section dialog asyncNoel Grandin
Change-Id: Ia48f4103b8f346a93ebe1f2c5078f21a90884e3f Reviewed-on: https://gerrit.libreoffice.org/66065 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 09f9b5f6ba9e4590227b12eb8232a56d003086ea) Reviewed-on: https://gerrit.libreoffice.org/79126 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-19Make use of SwView::InsertGraphicDlg() in the mobile app case workTor Lillqvist
Despite the name of the function, when inserting an image that we already know the file name for, we don't actually need to invoke any interactive file dialog (file picker). We don't build any file picker for non-desktop platforms anyway, so make sure this code does not crash in trying to access a such. Change-Id: I91cc8c4d9dac26e66f4f852c3d84f5c778c90644 Reviewed-on: https://gerrit.libreoffice.org/79137 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19make table-of-contents dialog asyncNoel Grandin
Change-Id: I839eaa820952ff39818b5ed9bd06a44eec3f39d3 Reviewed-on: https://gerrit.libreoffice.org/66069 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 6fcb1baf4678c2c34595f38fa4e557cffd67f163) Reviewed-on: https://gerrit.libreoffice.org/79124 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-18The menu is called 'Form', not 'Forms'Andras Timar
Change-Id: I216e04bb54319cff5d790c5e223c6e49215d09a3 Reviewed-on: https://gerrit.libreoffice.org/79095 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-18sw lok: fix "Cannot deselect the shape after inserting the first in a...Henry Castro
document" Change-Id: I976318fe299306b65190b4f5ae0ed2565830c6f7 Reviewed-on: https://gerrit.libreoffice.org/70475 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Henry Castro <hcastro@collabora.com> (cherry picked from commit 304425807e9172ac7a85d5f17fceba2735218409) Reviewed-on: https://gerrit.libreoffice.org/79090 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-17tdf#118375, tdf#70838 correct position of rotated shape in docRegina Henschel
Word relates the position to the unrotated shape in legacy doc format. Writer uses the rotated shape. The patch corrects the difference on import and export. Reviewed-on: https://gerrit.libreoffice.org/70152 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 421e6fc3cd2e6fe37afbef341e2d0ad7b8edde37) Change-Id: I25537123656e62d6ffae5118ee8d621a4b5c5be0 Reviewed-on: https://gerrit.libreoffice.org/79000 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-16Disable (again) part of testBtlrCell on WindowsMike Kaganski
This test fails on my system; the actual values likely depend on DPI scaling, but even with scale set to 100%, it fails. This is strange, considering that the test passes on Windows buildbots. After commit 3f7e8ddea89f6340cd18b5b34f5a7c5f503962be Change-Id: Ia8c2e695ed918c3145dcd472e1da52398c1a8f52 Reviewed-on: https://gerrit.libreoffice.org/75335 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/79015
2019-09-16CppunitTest_sw_uiwriter: fix top/left confusion in testImageCommentMiklos Vajna
This worked before as usually both are 1418, but in the case of <https://ci.libreoffice.org/job/gerrit_windows/43226/console> the left is a larger value (4194), while the top stays the same. Change-Id: Ie31cb29720f6426ad9e2a28405f326e6e82febaa Reviewed-on: https://gerrit.libreoffice.org/77597 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/79009 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-16CppunitTest_sw_uiwriter: get rid of hardcoded 1418 in testImageCommentMiklos Vajna
See a different value at <https://ci.libreoffice.org/job/gerrit_windows/43196/console> and the intention is to make sure the comment anchor and the fly frame position matches, not to check the actual value. Change-Id: I28eb39cfe5cbb57713b2c642a703e8509da25323 Reviewed-on: https://gerrit.libreoffice.org/77582 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/79008 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-07lok: Make the welded Watermark dialog work with dialog tunneling.Mert Tumer
Change-Id: Ib5acd6fe4838aa09b74333c46cf38b9e0a926682 Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/66555 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 2a1ea372daa12c0041d2c080a8fab33a6a87950d) Reviewed-on: https://gerrit.libreoffice.org/78738 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2019-09-06tdf#127372: PPTX: Shape's background transparency changes during RTTamás Zolnai
Need to use a better null value for FillTransparenceGradient. Use black-black which has equal effect than having no transparency at all. XFillFloatTransparenceItem has also an enabled attribute, but it can not be accessed via the UNO API. We can acces only the gradient object, so with a better null value we can check whether the API attribute is actually set or not. Reviewed-on: https://gerrit.libreoffice.org/78657 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 0417fb9ccd5a5467107621b5ac5ba1edcda71c68) Change-Id: I480489f588376582f80d5062145b7f398ef61ad7 Reviewed-on: https://gerrit.libreoffice.org/78701 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-09-06lok: change table border position param. from new pos. to offsetTomaž Vajngerl
To implement table border position changing for Impress requires that instead of parameter with new absolute position, we use offset from the previous position. It's easy to change the code for Writer to do this instead of Impress so this commit does this. Reviewed-on: https://gerrit.libreoffice.org/78121 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 19d88b15ec52a0560b96c5e71b5a328952ba7f28) Change-Id: I2d3ebe5ba0dc30fb8b4a58cc9ca820cc8330204b Reviewed-on: https://gerrit.libreoffice.org/78686 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2019-09-05warn on load when a document binds an event to a macroCaolán McNamara
a) treat shared/Scripts equivalently to document scripts This doesn't automatically warn/block running those scripts when used in a freshly loaded document on its own however because DocumentMacroMode::checkMacrosOnLoading will see at... if ( m_xData->m_rDocumentAccess.documentStorageHasMacros() || hasMacroLibrary() ) that the document contains no macros and flip the allow macros flag to true so that potentially new uses of macros added by the user during the edit are allowed to run b) so, add an additional flag to indicate existence of use of macros in a document c) for odf import, set it when a script:event-listener tag is encountered d) for html import when registerScriptEvents or SwFormatINetFormat::SetMacroTable is called e) for doc import when Read_F_Macro or StoreMacroCmds is called as well for good measure f) for xls import when registerScriptEvent or ScMacroInfo::SetMacro is called g) for oox import when VbaProject::attachMacros is called Change-Id: Ic1203d8ec7dfc217aa217135033ae9db2888e19b Reviewed-on: https://gerrit.libreoffice.org/77387 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-09-05tdf#126784 sw: only distribute across selected columnsJustin Luth
partial revert of LO6.2 commit ab18c17d70e1dcf5cf9db38256d35e6af479373e because MERGED cells had a very unexpected effect on the columns that were altered. Unselected columns are INCLUDED in the calculation IF they extend over the selected columns when SwTableSearchType::Col uses the entire table column. The last table in the unit test demonstrates why the regressive behaviour was included. A user can make an ugly layout if they don't choose a good set of columns. However, the merged cell really changes the way the calculation works, and since giving power to the user is ultimately the best, just revert the portion that tries to save the user from themself. I struggled then and now to get a good enough understanding to improve the documentation - which really is needed since reading it didn't help me a lot. However, since my understanding was and is obviously flawed, I'll just revert back to the original wording. Change-Id: Icf8f01f095652e2a023e0398852f43aa6b90332f Reviewed-on: https://gerrit.libreoffice.org/77985 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-09-05Fix old boost build for goodTomáš Chvátal
With the previous approach the code could lead to crashes in the flowfrm.cxx Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2 Reviewed-on: https://gerrit.libreoffice.org/78001 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Tested-by: Tomáš Chvátal <tchvatal@suse.com> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-09-05Resolves: tdf#126693 cannot put focus into combobox entryCaolán McNamara
Change-Id: I52a316e5c88a41c66ef08be1bae8fcdd10d2ab8e Reviewed-on: https://gerrit.libreoffice.org/78032 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-09-05MSForms: Reorder categories in menuAron Budea
so it matches MSO's order: content controls, legacy form controls, ActiveX controls Change-Id: I348e49fe9118c397c18812a79c23aa89ab635a70 Reviewed-on: https://gerrit.libreoffice.org/78619 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 0f3fb26e7622f99560c6514f4b3ae663636025c9) Reviewed-on: https://gerrit.libreoffice.org/78621 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03lok: Don't change mouse pointer when hovering over table bordersTamás Zolnai
Reviewed-on: https://gerrit.libreoffice.org/78411 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit e015ce45c299bec5d4a571e127ca7422caea523b) Change-Id: If6cc3698e6e7229a01d3147d79a587ead65f9b5e Reviewed-on: https://gerrit.libreoffice.org/78415 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03sw: fail loading when the fallback text detection failsAshod Nakashian
When we document in question fails to match any known type, we try to open as plain text (and convert to a Writer doc). However we should not display non-text when we have failed to detect ascii or unicode contents in the file. This happens with corrupted documents, for example, where we end up displaying non-printable binary data. Change-Id: Iccc158a4cb6051a8b17ba01987a30a9882a27fa9 Reviewed-on: https://gerrit.libreoffice.org/75512 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit d1f6f27e2a014aa55e2762f1209dc520fb183404) Reviewed-on: https://gerrit.libreoffice.org/78452 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03sw: oox: unit-test for default Content_TypesAshod Nakashian
Change-Id: I59432487d1b995a4b3dd28396860990b73ad4252 Reviewed-on: https://gerrit.libreoffice.org/70176 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 5416cfcd31c3561b89ea8c030f15609fca02bca0) Reviewed-on: https://gerrit.libreoffice.org/78444 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03LOK: don't emit redline commentsAshod Nakashian
Change tracking can be quite numerous. Showing the markers (and their comments" as comment-boxes is sensible where there is limited change in a doc. However with extensively modified doc, this becomes overwhelming both in terms of browser load and editing performance. As such, we disable them as they don't add much value. The user can still access them from the Track Changes > Manage menu. Use a rather nasty env. var hack to propagate this setting from WSD for now. Change-Id: I3f964816b4a10f565012b273added8a8413cd309 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit c99e885565f9d741a659e7e18c22d092ed90b9de) Reviewed-on: https://gerrit.libreoffice.org/78431 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-08-30tdf#126627 sw_redlinehide: fix corner case in SwUndoDelete::UndoImpl()Michael Stahl
The assumption that the merge by the moved nodes would be sufficient to handle the end node's frames is wrong: the MakeFrames() uses FrameMode::New, so the frames on the end node are not deleted, even if a previous node is merged with the end node, so the end node has 2 frames in the same layout, which will cause all sorts of problems. Ensure that the ::MakeFrames() that is called from SwUndoDelete will *once* use FrameMode::Existing, which will delete the existing frames on the end node *iff* it is merged. Subsequent SwTextNode::MakeFrames() calls on the nodes must use FrameMode::New of course, to prevent deleting the newly created frames immediately. Hopefully the SwUndoDelete is the only caller of MakeFrames() that will run into this corner case, as the others typically operate on a nodes-array section... (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48) Reviewed-on: https://gerrit.libreoffice.org/77211 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit f6a7dee56c984f36261c75a1056cc3a5bf43b2f1) Reviewed-on: https://gerrit.libreoffice.org/77220 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4093811d1327e83edf216639d7b1173d8ebf7165) Backport needs some tweak to includes to avoid cyclic headers. Change-Id: I829c1e7a92434f93d56e3c88a4ba4a55bab818d4 Reviewed-on: https://gerrit.libreoffice.org/77340 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/77907 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-08-29sw lok: extend language status with BCP 47 language tag info in here as wellMiklos Vajna
This brings Writer in sync with Calc, which does this since commit 47025060e4474d23e3bd97053a77b3943eeae724 (Send Bcp47 codes with region, 2019-08-28). (cherry picked from commit f38566826cdd257214298c583a1ce8ae6715713c) Change-Id: I615af4a0692216f794c78955d337e6b8dbc8db5e Reviewed-on: https://gerrit.libreoffice.org/78257 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-29tdf#118169: ActiveX form control saved incorrectly with accented lettersTamás Zolnai
Write out unicode strings without any compression. Change-Id: I93cadc40bacbd679724c3404fd870cba48065650 Reviewed-on: https://gerrit.libreoffice.org/78234 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 4b82652c4de94db553dfd7a63801ea81d366315a) Reviewed-on: https://gerrit.libreoffice.org/78238 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-08-29Fix buidling with older boostTomáš Chvátal
Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d Reviewed-on: https://gerrit.libreoffice.org/77716 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Tested-by: Tomáš Chvátal <tchvatal@suse.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/77922 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-08-29tdf#126723 writerfilter::finishParagraph - me, not previousJustin Luth
In LO 6.2 commit 480ac84f2f5049fb4337b36f12fd6796e005761b the existing m_xPreviousParagraph was conveniently used to apply the changed properties. I never did like that choice, but despite looking at it, I failed to see that it is set in an inside loop, which means that it was NOT NECESSARILY reset to the current paragaph. So I'm happy to have proof that we should not use m_xPreviousParagraph. Reviewed-on: https://gerrit.libreoffice.org/77185 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d03c92b93d6ba1808a6641b4aa8cb4aae38058bf) Change-Id: I5c7f1b0f097711d65ae0d0be1f0fbc40c8b96e9d Reviewed-on: https://gerrit.libreoffice.org/77249 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/77906 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-08-28tdf#124293 add RedactDoc to writer, calc menubar in toolsandreas kainz
Change-Id: I8276506aaeaaee2bef5dad832d488450688081ee Reviewed-on: https://gerrit.libreoffice.org/69810 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com> (cherry picked from commit 1f7a2cee590ff5902d52630688b4e02745ed6c7b) Reviewed-on: https://gerrit.libreoffice.org/78124 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-08-28Set "Resolved Comments" view option on by defaultScott Clarke
The "Resolved Comments" view option now starts switched on by default to match the fact that resolved comments would be visible when a document was first opened anyway. (cherry picked from commit e7638f15fc945e6de73876949538682b854fdc41) Change-Id: Ib9c41c57c826f4282d0d6bf0ebcd485aa71ce1d6 Reviewed-on: https://gerrit.libreoffice.org/78188 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-28Change some handling for resolved commentsScott Clarke
Changed the way the lcl_CommentNotification method is called when a comment is resolved such that resolution is distinct from other changes. Resolved flag is now only stored in the top annotation of a thread when saved as ODT. (cherry picked from commit 9751b4b4fa00cf5175ccc0f9c52a22b07f73d4aa) Conflicts: sw/source/uibase/docvw/PostItMgr.cxx Change-Id: I5ef36718fd7e1dfcc16c077871653a70476e8804 Reviewed-on: https://gerrit.libreoffice.org/78187 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-28Add test for resolved comments in odfexportScott Clarke
(cherry picked from commit 0fbd3fcebf877ba25343443806e0d75f67c2d7b7) Change-Id: I069d84b1e6b80731c5d13a1f8b06f4ed9df0844a Reviewed-on: https://gerrit.libreoffice.org/78186 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-28tdf#119228 Add 'Resolved Comments' option to the View menu.Scott Clarke
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk> (cherry picked from commit fb3a0b084701ee1089a76568b3b110ac5b0df460) Conflicts: sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swxform/menubar/menubar.xml Change-Id: Ib4554b77857992959a386c71e99e424579196ded Reviewed-on: https://gerrit.libreoffice.org/78185 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
generated by cgit (git 2.34.1) at 2024-08-10 07:57:03 +0000