summaryrefslogtreecommitdiff
path: root/sw/inc
AgeCommit message (Collapse)AuthorFilesLines
2020-05-09lok: MSForms: Handle event about item selection of a drop-down field.Tamás Zolnai1-0/+3
Change-Id: I095013097348c98361b6614e4ddf1e9029923c7f
2020-03-29tdf#131185 Prevent unnecessary SwapIn calls.Gülşah Köse1-1/+2
When the http response is 404 or something like that we shouldn't retry the download embeded image constantly. This causes libreoffice to short freezes. Change-Id: I7381d04f12e9fbea961dd0e3333ea0d39aa93d14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90102 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit 30b23d77c894bdf6f7ae0d18d594ea267a80f662) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90271 Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit ddd7277b218204dca539b3f93d36098df0349b38) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91296 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-03-03SwCursorShell argument of AttrChangedNotify is unusedCaolán McNamara2-4/+4
Change-Id: I1fde665dcb77d29cad7f6a5c12e82c1822cff022 Reviewed-on: https://gerrit.libreoffice.org/80621 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/c/core/+/89883 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-24sw: add UNO API for semi-transparent textMiklos Vajna1-0/+1
This makes the ODF filter work out of the box, since the same property was provided by Draw/Impress in the past already. (cherry picked from commit c48790b5cec73a49aed20c26b123c3656bb9eff9) Conflicts: sw/inc/unoprnms.hxx sw/qa/extras/unowriter/unowriter.cxx Change-Id: Ie6a053864c9fa41fad6ca4571d7d04a3756b7591 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89218 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-21DOCX import: fix lost objects anchored to the single para of a linked headerMiklos Vajna2-2/+3
Regression from commit 08f13ab85b5c65b5dc8adfa15918fb3e426fcc3c (tdf#112202 writerfilter,sw: fix loss of headers, 2019-12-16), the problem is that on one hand, copyText() is meant to copy a complete XText (header, table cell, footnote, etc), OTOH the internal API use used only copies at-para anchored objects for complete text nodes, so a one-paragraph header will loose its anchored objects when a linked header is copied. Introduce a new "CopyText" flag that provides the expected copyText() behavior and use that when the copyText() UNO API is invoked, but leave the selection behavior unchanged. Perform the inclusive check in IsSelectFrameAnchoredAtPara(), opt in for that from SwXText::copyText(), the rest is just passing the flag around. (cherry picked from commit 04b2310aaa094794ceedaa1bb6ff1823a2d29d3e) Conflicts: sw/source/core/doc/DocumentContentOperationsManager.cxx sw/source/core/inc/DocumentContentOperationsManager.hxx Change-Id: Id727f7ca4f6121a7050340359716a52ecb4886f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89152 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-20tdf#121300 sw: consistent fly at-pargraph selectionMichael Stahl1-1/+5
As a follow-up to commit 28b77c89dfcafae82cf2a6d85731b643ff9290e5, add IsSelectFrameAnchoredAtPara() function and use it to harmonize at-para fly selection across all relevant operations: * CopyImpl: - it had a pre-existing bugs that would lose a fly anchored to the 2nd (1st fully selected) node of a redline - remove a bunch of code for finding the last node of the body content, which doesn't matter for the remaining at-fly checks - flys that already existed at the insert position need to have their anchors corrected * DeleteRange: - get rid of the bDelFwrd checks * MoveRange: - the ALLFLYS flag would be obsoleted by the new selection, were it not for the writerfiler "special hack", see below * also adapt A11y and UI selection, SwRootFrame::CalcFrameRects() The selection behavior is changed: * the bDelFwrd case is quite odd, some code was checking whether a deletion was "forward" or "backward" and removing only the flys at the point node while retaining the flys at the mark node; this worked in a very non-obvious way relying on sw_GetJoinFlags actually calling Exchange() on the cursor, and then SwUndoDelete stored it in m_bJoinNext, but it turns out that only SwUndoMove also has a m_bJoinNext and it's dead, and no other Undo has such a flag, so this only worked for "delete". It's not obvious what the value of this is, let's just ignore the "direction". * Selections exclude the start and end position except if it's a fully selected node or at the start or end of a section (i.e. Ctrl+A should also select every at-para fly). * An exception is made in case the selection looks like it's a backspace/delete joining 2 paragraphs; flys are not deleted in that case because it seemed annoying (and as it happens, Word does not appear to delete flys in that case), particularly if both of the nodes are already empty. This is done with a heuristic, it's conceivable to pass down some flag from DelLeft()/DelRight() but probably this is good enough. A special hack is needed to keep writerfilter happy for now; it likes to anchor flys at nodes which it then deletes in RemoveLastParagraph(), which likely could be improved there. The ALLFLYS usage in SwRangeRedline::MoveFromSection() could be removed (because the end-of-section check already handles the case) except for this, because it turns out that the ODF import runs SetRedlineFlags with a temporarily reset IsInXMLImport() flag because of its effect in thints.cxx, so during the move IsSelectFrameAnchoredAtPara() can't check it. tdf#108124 scenario works better, now everything that's selected is both copied and deleted. Fixes the problem where an at-para fly at the 2nd node of a redline where the 1st node is partially deleted was lost on ODF export. (cherry picked from commit 91b2325808a75174f284c48c8b8afc118fad74e4) Conflicts: sw/source/core/undo/undobj.cxx sw/source/core/undo/untblk.cxx Change-Id: I168013665e70ff0a5f198e09f3fa3afc06ba0449 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89098 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-20tdf#117185 tdf#110442 sw: bring harmony & peace to fly at-char selectionMichael Stahl1-1/+14
Use IsDestroyFrameAnchoredAtChar() to harmonize the at-char fly selection across all relevant operations: * CopyImpl: this is the most tricky one: - the code in CopyWithFlyInFly() and CopyFlyInFlyImpl() is quite con- voluted as it needs to do some things ignoring a partially selected start node, while including it in other cases - it had pre-existing bugs too that would lose a fly anchored to the 2nd (1st fully selected) node of a redline - now it needs to copy the flys in the selection if it is inside a single node - another complication is that flys that already existed at the insert position need to have their anchors corrected - SwUndoInsLayFormat need to be created for the appropriate flys - SwUndoInserts Undo/Redo needs to run the nested SwUndoInsLayFormat at the appropriate time - SwUndoInserts::UndoImpl() needs a special case to *never* delete flys at the start/end of the selection because those are handled by nested SwUndoInsLayFormat - Insert File (shellio.cxx) needs adapting to the SwUndoInserts change * DeleteRange: this just needs to delete the flys via DelFlyInRange() * MoveRange: - this is used by the old SwRangeRedline Show/Hide, i.e. on ODF export - the SaveFlyInRange()/RestFlyInRange() was rather inadequate and didn't even restore content indexes at all... * IsShown: the sw_redlinehide code needs to check visibility against the (inverted) extents The selection behavior is changed so that at-char flys in the start and end node of the selection are also selected, instead of having their anchor moved to a different content index by the operation. This appears more obvious and user-friendly, fixes tdf#110442, and is also more like what Word does. Selections exclude the start and end position except if it's a fully selected node or at the start or end of a section (i.e. Ctrl+A should also select every at-char fly). A special hack is needed to keep writerfilter happy for now; it likes to anchor flys at nodes which it then deletes in RemoveLastParagraph(), which likely could be improved there (disposing the SwXParagraph runs into the same problem...). Crashes fixed by this: tdf#117185 tdf#117215 except comment#12 tdf#124720 tdf#124721 tdf#124739 Previously fixed bugs tested: i#97570 plus the 2 bugs that already have UITests (cherry picked from commit 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Conflicts: sw/qa/uitest/writer_tests6/tdf107975.py sw/source/core/doc/docedt.cxx sw/source/core/inc/frmtool.hxx sw/source/core/layout/frmtool.cxx Change-Id: I4fec2a3c15ca0e64e5c4e99acfb04f59bb2bcf64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89093 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-05tdf#130362 sw: fix anchoring of inline math objectsMiklos Vajna2-2/+2
Regression from a7528cd6f17ea5c5b29e7d607e54c62de0d9e7db (sw: insert image: set anchor to at-char by default, 2019-11-18), that defaulted to at-char anchoring for charts and images. What was not considered is that math objects had a previous as-char default (not to-para), and that is supposed to be unchanged. (cherry picked from commit a2f85c062aafb3fd9dfb1c6c6e87e1e73e7545a3) Conflicts: sw/Module_sw.mk Change-Id: I2a91af6425035b48a0e47ad9b10939945855cd16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87986 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-03tdf#128468: Add new UNO command "MoveTabstop"Tor Lillqvist1-1/+2
Work in progress. Implementation still incomplete. The stuff I added in the .sdi files is mostly copy-paste without any deeper understanding. Change-Id: Iad36c20e963c9df19645a04ca4a0d9bf81f3839a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87873 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-01-08sw: don't send LOK notifications about redlines during saveMiklos Vajna1-0/+4
SwXMLWriter::Write_() sets redline flags to show insertion and hide deletion, but it resets those flags before the function returns. So LOK notifications for redline changes during save is not useful. Conflicts: sw/qa/extras/tiledrendering/tiledrendering.cxx Change-Id: I4bf963bbe9c7003cbe85ea6c5538be733a3e3cdf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86369 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2019-12-26sw: paragraph-sign: process signatures in one pass on loadingAshod Nakashian1-2/+5
This combines the metadata field restoration logic with validation/update of said field in one pass upon loading docs. This cuts down overheads and makes the code more readable. In addition, now that paragraph signature validation is quite cheap (separate commits), esp. when no signatures exist, we validate and update signatures (where applicable) when fields are updated. Change-Id: I4adcea579c591f9be457ed742d2cf54fa308163d Reviewed-on: https://gerrit.libreoffice.org/63008 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit ad9902f34dd0b5837ab518445ea9f3a24352738b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85809 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-12-26sw: paragraph-sign: validate current SwTextNode directlyAshod Nakashian1-1/+4
When invoking undo, it turns out that the cursor position is updated after the text modification, which triggers the paragraph signature validation. Relying on the cursor position, then, results in the wrong (previous) paragraph to be validated (if the undo is in a different paragraph). Since we have the correct SwTextNode when it's modified (due to undo or otherwise), there is no reason why we shouldn't use it and try to deduce it from the cursor. Change-Id: I4c3283d59738988dcc1c592a9f3ef2c818ce675d Reviewed-on: https://gerrit.libreoffice.org/63004 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 25446d1c7d021ba99201f36b04d59c29c85b7733) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85805 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-12-26paragraph-sign: exception-safe metadata graph enumerationAshod Nakashian1-0/+6
Metadata graph enumeration can throw from a number functions and break things in horrible ways. Here we sanitize against the most egregious offenders, but not all possible sources. Change-Id: I40e006ea433dd7274d4fa08f3e8f8507680ef2f4 Reviewed-on: https://gerrit.libreoffice.org/63009 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit f29f873d8e638d566f53f9ac5712e49910ee4094) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85803 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-12-26sw: rdf: Split graph-name lookup from getStatementAshod Nakashian1-0/+11
The graph-name lookup is significantly costly (compared to the statement lookup, esp. when no statements exist). Luckily, the graph-names do not change often and in the course of enumerating all paragraphs (as happens for paragraph-signature validation) it doesn't change at all. This split allows for doing the graph-name lookup only once and also allows for passing custom graph-names directly, if we know them already. Reviewed-on: https://gerrit.libreoffice.org/63002 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit d5c9288e00cf39292d077d58be550af566b779ac) Change-Id: I75425df201becb41105ba1fa6ba580af202d035c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85802 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2019-11-29Make resolved comments appear resolved when printedScott Clarke1-0/+1
Added an indication to resolved comments when printing them or exporting them as a PDF. Change-Id: I9a84b76d6f12cca3c4541d19a0890cbd1cf430a7 Reviewed-on: https://gerrit.libreoffice.org/78712 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-on: https://gerrit.libreoffice.org/83740 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2019-11-06android: ODR fix of RID_PAGEFORMATPANEL_MARGINS_CM.Jan Holesovsky1-0/+5
Without this, we get a linking error that RID_PAGEFORMATPANEL_MARGINS_CM is defined twice. Change-Id: Ib9c07adcb0a8def991d1e39429c1bb4947cd7d32 Reviewed-on: https://gerrit.libreoffice.org/82158 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-11-04Table panel: Implement functionality of Column Width spinbuttonTamás Zolnai1-0/+1
Change-Id: I809cfe4af82cebabe80c171cdd488ff43d749a86 Reviewed-on: https://gerrit.libreoffice.org/81895 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit ac48a33060304a62372b00bfef08b067cec6ceb6) Reviewed-on: https://gerrit.libreoffice.org/82026 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-11-04Table panel: Implement functionality of Row Height spinbuttonTamás Zolnai1-0/+1
Reviewed-on: https://gerrit.libreoffice.org/81894 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 5e113259f8382c2d045193abd79267529a6a5f6b) Change-Id: Ic3e3ce31fdc74c9cb4c41e1243f10f5977d5bb0c Reviewed-on: https://gerrit.libreoffice.org/82025 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-10-09tdf#128009: Allow spaces in AutoText suggestionsMike Kaganski1-1/+5
Currently autotext entries with long names starting with spaces, or containing spaces after first or second character, would never be suggested when SvxAutoCorrCfg::IsAutoTextTip() gives true (set in Tools -> AutoCorrect -> [x] Display remainder of name as suggestion while typing), because only a single word no less than 3 chars long left to cursor is considered a candidate for the name matching. This change allows to consider multiple chunks of text left to the cursor as the candidates for name matching. The chunks are 3-9 characters long, may start only between words, and have spaces, including leading. Thus, AutoText entries with long names like " Dr Foo" will now be suggested for an entry like "lorem dr f". Change-Id: If91c957341a4f4b281acb0e4ada558706ea2f8c1 Reviewed-on: https://gerrit.libreoffice.org/80392 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/80495 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-10-08lok sw: When inserting shapes, do that in the middle of the visible area.Jan Holesovsky1-0/+5
Instead of in the middle of the entire document, which may be far away. Change-Id: I50a1a5f159b73a3803cd7a549939b73a366e7dc5 Reviewed-on: https://gerrit.libreoffice.org/66584 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/80258 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-09-26Resolves tdf#122707 - Replace listbox for print range by radio buttonsheiko tietze1-5/+5
Some changes to the ui file (GtkGrid, alignment, radio buttons), setChoiceRadiosControlOpt() instead of *list Labels adjusted accordingly Patch partially reverts I62bd9affc9e065d7afcc60296a72eae4612b0ddd Reviewed-on: https://gerrit.libreoffice.org/68846 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> (cherry picked from commit 044fa501e95dcac8120767996dfb7ba8f25a703f) Change-Id: Ia06b8f2513d98fbdb1971477cf7b7127595d338c
2019-09-26Adds print even pages/print odd pages options in print dialogDaniel Silva1-0/+2
Change-Id: I17733d83cc652be8c5abaf20cd4b5e23d3a577a1 Reviewed-on: https://gerrit.libreoffice.org/57380 Tested-by: Jenkins Reviewed-by: Daniel Silva <danielfaleirosilva@gmail.com> (cherry picked from commit faf2b0f165e9d9e3160e5d54e3d2e9973facf0b8)
2019-09-26Configures page range in print dialogDaniel1-5/+4
Change-Id: I62bd9affc9e065d7afcc60296a72eae4612b0ddd Reviewed-on: https://gerrit.libreoffice.org/55840 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 76e22667625ce8d16dfaa8617a199b774e987a70)
2019-09-22tdf#86731 Don't show 'spelling complete' when dictionary is missingSzymon Kłos1-0/+8
To check if dictionary is missing we have to run spelling which checks used language for each text portion. When AutoSpelling or manually invoked Spelling is performed SwDoc receives notification about missing dictionaries. Then it is possible to not show 'Completed' dialog. Change-Id: I040ce6565632294796c0206d20c4cd0066ca9643 Reviewed-on: https://gerrit.libreoffice.org/66813 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 33f6848dc5abe71471b08dc6a8946feaa2d75ffc)
2019-09-05tdf#126784 sw: only distribute across selected columnsJustin Luth2-3/+2
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-08-28Change some handling for resolved commentsScott Clarke1-1/+2
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-28tdf#119228 Add 'Resolved Comments' option to the View menu.Scott Clarke2-2/+10
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>
2019-08-27tdf#119228 Add UI elements to resolve and unresolve commentsScott Clarke1-0/+1
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk> (cherry picked from commit 6986ebd4a0020e515a115acbe7f1f738a4fd83f4) Conflicts: sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml Change-Id: I22403299d034a638724077744070b3add64cacf2 Reviewed-on: https://gerrit.libreoffice.org/78184 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-27tdf#119228 Add UI elements to display the resolved stateScott Clarke2-0/+3
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk> (cherry picked from commit 7ade0c7d03594bfa5c067f32230a1e4ed93d7fbb) Change-Id: I3ba1572771bc893d2c74993a161d00c2acc70960 Reviewed-on: https://gerrit.libreoffice.org/78183 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-27tdf#119228 Add accessors for resolved stateScott Clarke2-4/+16
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk> (cherry picked from commit f4f5e3f98aee5d9d1679edab8248a4cfd12f74ce) Change-Id: Ic4051f4e7fda11eade1e50ce70bed11f70f0742d Reviewed-on: https://gerrit.libreoffice.org/78182 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-27AnnotationWin: Restore lines from annotations to comment anchorJim MacArthur1-0/+4
This changes all the uses of GetTopReplyNote, which were using nullptr to indicate the top reply. (cherry picked from commit 03263d6fffb711f4cf3527c77949253c97ff40fb) Change-Id: Ibb9b5fac5644a5d6d283e8ea2fa80b988ca0693e Reviewed-on: https://gerrit.libreoffice.org/78181 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-27tdf#119228 Add storage and serialisation for the Resolved flagScott Clarke2-0/+8
Co-authored-by: Jim MacArthur <jim.macarthur@codethink.co.uk> (cherry picked from commit d2025bdc33cc8d9e2f6c9f90da4574275ed6b0e4) Conflicts: include/svx/svxids.hrc sw/source/core/unocore/unofield.cxx Change-Id: I0278588dc533378104e544d05b60583c85271f6a Reviewed-on: https://gerrit.libreoffice.org/78180 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-08-21tdf#126792: DOCX legacy drop-downs are only supposed to hold 25 items, GUITamás Zolnai1-0/+1
Implement GUI part. Do not allow to add more items to the drop-down field if the count of items reached the 25 limit. Change-Id: I126edc500bc18e2f0f4b6864775f89be6801f887 Reviewed-on: https://gerrit.libreoffice.org/77843 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit d3c8973f54037f915e12cd038a6a76501d237ea4) Reviewed-on: https://gerrit.libreoffice.org/77871 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-08-15tdf#122529 lok - table border position manipulationTomaž Vajngerl1-0/+1
This adds a new LOK callback (LOK_CALLBACK_TABLE_SELECTED) that sends the border positions to the client when the user has the cursor or slelection in a table. In addition this adds a .uno:TableChangeCurrentBorderPosition uno command, which implements changing a specific border in the current table. Border can be either a column or a row border, which is either at the first, middle or last position. Reviewed-on: https://gerrit.libreoffice.org/77365 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 43cce4ef2cf865b2bb637e17b70102a4260295b0) Change-Id: Ife7cff14d91ffc84c95c040f0b42319e3d6194b4 Reviewed-on: https://gerrit.libreoffice.org/77485 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2019-08-05lok: writer: svg export transformed imagesMarco Cecchetti2-0/+3
Change-Id: I908a6e01573c35c0641519f4995730af0b033c33 Reviewed-on: https://gerrit.libreoffice.org/70565 Tested-by: Jenkins Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
2019-08-05lok: re-factor getTextSelection.Michael Meeks1-2/+2
Change-Id: I2c27c213ee980e19d6020e9599b2b72115e7f28e Reviewed-on: https://gerrit.libreoffice.org/73626 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2019-07-17MSForms: Rework text-based date form field's representationTamás Zolnai3-3/+22
* Better to represent it similar to text form field with two marking characters selecting a text range * So the text between the two marks can be anything (not only a well formatted date) and also have any character formatting. * With this we handle the case when the user needs a placeholder text in the date field or when the user needs time values (hour, minute, sec) next to the date. Reviewed-on: https://gerrit.libreoffice.org/75459 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 68e1be4ccbb90ee9a788962219a88312c4ffbea2) Change-Id: Id60a50a2028058f8a6a080e265c0730d88b98543
2019-07-17MSForms: Implement calculation of the displayed text in date form fieldTamás Zolnai1-2/+3
* Change ODF_FORMDATE_DATEFORMAT to store the date format in a standard way (e.g. "MM.DD.YY") * Also add a new attribute called ODF_FORMDATE_DATEFORMAT_LANGUAGE to store the language for the date format. * Set a default date format and language by insertion. * Display the date in the field using the set format. * Store the current date in a specific format, which will make import / export easier (MSO DOCX format). Reviewed-on: https://gerrit.libreoffice.org/75444 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 1df055ba2a01a4c83d90c7c64998e7950ca8d795) Change-Id: I852975bbf81556f0e21f8f85d1c293707fdf672e
2019-07-17MSForms: Introduce a properties dialog for date form fieldTamás Zolnai1-0/+2
* The dialog can be opened by the menu item and also by double click. * The dialog contains a list to specify the date format. Reviewed-on: https://gerrit.libreoffice.org/75439 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 870c66694e7ed392141f0956ef74d1f71cdf8975) Change-Id: I109a688752c5155f5bfabff272da3d6ab90dcded Reviewed-on: https://gerrit.libreoffice.org/75533 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-07-17MSForms: Insert text-based date field from MS compatible Forms menuTamás Zolnai1-0/+2
Reviewed-on: https://gerrit.libreoffice.org/75438 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 75099d6788672a98389d8592b88777c8d3a25fa6) Change-Id: I2f08fa806dc55a185adf67ca616af8d81bb23bda
2019-07-17MSForms: Introduce a new fieldmark class for text-based date fieldTamás Zolnai1-0/+1
Reviewed-on: https://gerrit.libreoffice.org/75437 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 0fd05f6503c42df35b16735c7b690e56f1acab30) Change-Id: I3df49c516603fb16601fc0a9c13c6d9ea401207a
2019-07-16sw comments on frames: avoid overlay that covers only an at-char imageMiklos Vajna1-0/+7
The comment is already attached to the image via the anchor, and the overlay would change the image, which is confusing. (cherry picked from commit 5914fae974875366026bb3b1245ef8bffeadd7d2) Change-Id: I7a1c2a25182f628effa224fb82b5bcd71fdf35d4 Reviewed-on: https://gerrit.libreoffice.org/75675 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-10sw comments on frames: fix comment handling when changing at-char anchorMiklos Vajna1-0/+5
If the user drags the at-char image and the anchor changes, then need to update the comment anchor (and its annotation range) as well. Use the same API that's used by SwTransferable::PrivateDrop(), except work with doc model positions, not with screen coordinates, like drag&drop does. (cherry picked from commit 5da29a31903e0c11802548327b41511519e61d7d) Change-Id: Ib9610b3eddc77f9973b68a1c5c8cdbe1f7079ab9 Reviewed-on: https://gerrit.libreoffice.org/75338 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-03sw comments on frames: fix layout to place anchor next to the imageMiklos Vajna1-1/+2
With this, if you load sw/qa/extras/unowriter/data/image-comment-at-char.odt, the comment anchor leads to the commented image, not to the anchor of the image (between "aaa" and "bbb"). (cherry picked from commit ac246d6ea1bc43bfc82c9b4c69c9c0f1fd678129) Conflicts: sw/qa/extras/unowriter/unowriter.cxx Change-Id: I99389c9fc849269eb20d0266f8f604db89faec12
2019-07-03sw btlr writing mode shell: fix cursor selectionMiklos Vajna1-1/+2
All changes are about not assuming logical top is a lower y value than logical bottom, by going via the SwRectFnSet abstraction, which already does the right thing. Change-Id: I94a9881b018ad14b02e97425f60af01aa3fd9269 Reviewed-on: https://gerrit.libreoffice.org/69226 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 2f83055cdbd915d5036a7b4374b4ad10e6efc65f)
2019-07-03sw btlr writing mode shell: fix up/down cursor travellingMiklos Vajna1-2/+1
By teaching SwEditWin::KeyInput() about 2 vertical modes: the existing tbrl one and the new btlr one. Up now correctly goes to the next character and down to the previous one. Change-Id: I71faebe62e5fa3892b37e8bea6c15d1fb84df5d1 Reviewed-on: https://gerrit.libreoffice.org/68183 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 31f896bb6ef922cf4250c6b971fb9d24a60592b5)
2019-06-19MSForms: Add a drop-down button for drop-down form fieldTamás Zolnai3-4/+7
* Introduce a editing frame with a button for drop-down form field. ** The frame is mouse transparent. ** Pushing the button opens the popup window with the items of the field. * The button is visible when the cursor is inside the field. Reviewed-on: https://gerrit.libreoffice.org/68961 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 10be5b6ce972dff517f3ceed41cab04d3e051f57) Change-Id: I5c7db138d14380899fee046c95a5afe14cfea213
2019-06-19MSForms: Introduce a new IFieldMark for drop-down form fieldTamás Zolnai1-0/+2
* It was weird anyway that a drop-down form field was represented as an CheckboxFieldmark. * It will be useful for later commits, to have a separate field type for drop-down field. * Needed to fix-up the API a bit because it was designed to specify the field type after initialization. I solved it in a way to not break the API behavior. Hopefully it's not very slow. Reviewed-on: https://gerrit.libreoffice.org/68960 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit f66a83c95c21b4311918a64bb85016857b49f4d4) Change-Id: I3103e6b1c36289b27b62ab9ca7dfeebc14901c8a Reviewed-on: https://gerrit.libreoffice.org/69194 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-06-19MSForms: Update cursor position after the drop down form field was changedTamás Zolnai1-4/+4
Change-Id: I0e9e8a0e9212cdf539caa163f9071bc2f21e4c9f Reviewed-on: https://gerrit.libreoffice.org/68959 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 499501e8cf1d511eb95a7b72b755c2dc69985719) Reviewed-on: https://gerrit.libreoffice.org/69193 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-06-19MSForms: Implement undo / redo for insertion of legacy form fieldsTamás Zolnai3-1/+6
Need to handle undo / redo explicitely for form fields, because there is no a general working undo / redo mechanism for fieldmarks. During the insertion of the fieldmark, text insertion also happens which generates an interfering undo action, so we need to disable undoing temporary. Also need to invalidta SID_UNDO slot to make the undo toolbar item updated after we insert a form field. Reviewed-on: https://gerrit.libreoffice.org/68956 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 55d6be75732d1bb0067bba9496c74ef30be9a3ec) Change-Id: I358c2704cb30212a38f8a998888a36f72fa404e5