summaryrefslogtreecommitdiff
path: root/sw/source/uibase
AgeCommit message (Collapse)Author
2021-03-16tdf#141012: do not try to expand the node if RequestingChildrenHdl failedMike Kaganski
Just select the database node itself, so that it's still obvious which database is associated with this document. After selecting this node when initializing the tab, another call to SwDBTreeList::Select will be made, so make sure to handle empty table and column names. Change-Id: Ie1d1bd445e18d5900910c780a24102b4dde5c787 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112467 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 351edb44eb0548f7e56464de42c1758a1f5e4ab4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112423 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-03-16check for quit when calling Yield in loopNoel Grandin
so we don't get stuck threads when the main application quits Change-Id: Id36e99267ceb4154873b6ef8ef494622fff6c19a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112409 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit c880d3e30405342a5ae6239cc77f69ed3ca6cc15) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112491 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-03-11tdf#40427: use node index as position, not Y position on screenMike Kaganski
As mentioned in comment to SwContent::nYPosition in sw/source/uibase/inc/swcont.hxx: some subclasses appear to use this for a tools/gen.hxx-style geometric Y position, while e.g. SwOutlineContent wants to store the index in its subtree Abusing the nYPosition to store vertical position *on screen* gives wrong results when a following section is positioned on screen higher than a previous section - e.g., when multiple-page view is active. So just use the section's node as Y position of the Navigator entry. When the section is inside a fly frame, use the frame's anchor node. Change-Id: I6caf26aeb19d845129dc837138c37f42bbc18655 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112197 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112283 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-03-04Styles preview: use listener to trigger updateSzymon Kłos
Do not render all styles on every selection change. Use listener to detect styles modification. Change-Id: I6d41acd7acad160d1477281d2b3d473233def4d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111833 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-02-25sw: fix incorrect loop condition in SwTransferable::isComplex()Miklos Vajna
We're not consuming hints in that loop, so we want to end when the iteration ended, not when the list of hints is empty. Conflicts: sw/qa/uibase/dochdl/dochdl.cxx Change-Id: I2cb735c03c3551f7b0be8b314183780eedff9ecf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111558 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-02-24Implemented MoveShapeHandle uno command for swmert
Change-Id: I9feccc4fa1a4d7426609afa474f87ab12c769090 Signed-off-by: mert <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111192 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-02-23sw lok: simplify SwTransferable::isComplex()Miklos Vajna
Commit 169a87563a3940299811d874b4df0ad13591771c (LOK: Implement getSelectionType, 2019-06-24) implemented detecting complex selections by copying the selection to a new SwDoc, which probably had two benefits: first, the created SwPaM instance didn't touch the document; second, this means no bounds has to be set when scanning nodes: the entire document is the selection. Later commit 7fe30d1cb00c576469d6cbe5606268a9cdf35bd3 (LOK: detect Graphics in isComplex for Writer, 2019-06-25) got rid of the SwPaM (which would register itself into text nodes), so now it's possible to not touch the document, even if we work on the original document. Instead, solve the partial scanning by iterating over the list of selections. This is meant to be faster, and also less likely to crash in case some internal document model invariant is broken. No testcase, testComplexSelection in CppunitTest_desktop_lib already covers thie behavior. (cherry picked from commit 7a8dc25defee31edbb75a2f8c35f92ee2d3f3a83) Conflicts: sw/source/uibase/dochdl/swdtflvr.cxx Change-Id: Ia528c06a48defd06c5e34ed7d61621e5ce10bb06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111385 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-02-17Avoid crash in online on a document with commentsAron Budea
Crashed on a specific doc with the following backtrace: Thread 1 "kitbroker_001" received signal SIGSEGV, Segmentation fault. 0x00007f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField (this=0x0) at /.../libreoffice/sw/inc/AnnotationWin.hxx:71 71 const SwPostItField* GetPostItField() const { return mpField; } 0 0x00007f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField() const (this=0x0) at /.../libreoffice/sw/inc/AnnotationWin.hxx:71 1 0x00007f4807f0641b in SwXTextDocument::getPostIts(tools::JsonWriter&) (this=0x557e1d985a10, rJsonWriter=...) at /.../libreoffice/sw/source/uibase/uno/unotxdoc.cxx:3337 2 0x00007f4823216534 in getPostIts(LibreOfficeKitDocument*) (pThis=0x557e1d93c890) at /.../libreoffice/desktop/source/lib/init.cxx:3425 ... Change-Id: Ib97fd33fda936cad0c9ed3a29564fc0a49ff20c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110917 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-02-10Dropdown form field: don't increase code compexity for gen backend.Tamás Zolnai
It's just an internal thing, we don't really need to optimize the code for it. This HideButton() function is not use anywhere else. Change-Id: I2e5fff73f6d50a0dedbd8d5f7eea748d09de6330 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110709 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2021-02-10tdf#91920 sw page gutter margin, from top: add UIMiklos Vajna
- read from sw::DocumentSettingManager::mbGutterAtTop - improve the preview widget to take gutter position into account - also change it when the gutter position widget changes - write it back to sw::DocumentSettingManager::mbGutterAtTop on modification - always check if the dialog's input item set has SID_ATTR_CHAR_GRABBAG, otherwise do nothing to keep Calc/Impress unchanged [ And in this branch, fix a silent merge conflict that mis-positioned labelGutterMargin in the .ui file. ] (cherry picked from commit 63d3bf99101e2138a21a74a3d717d4f25d3d242f) Conflicts: cui/uiconfig/ui/pageformatpage.ui sw/source/core/doc/DocumentSettingManager.cxx Change-Id: I05ef864bf7ac18f4c6829d78312044560e6402d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110671 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-02-10fontwork: center in online in writerSzymon Kłos
Avoid unnecessary position change Change-Id: I338b9a28653569e1b7c19ba3a1f590363fb2f94c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110664 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2021-02-09tdf#91920 sw page gutter margin, from top: add doc model & UNO APIMiklos Vajna
Do this per-doc, rather than per-page-desc, because Word doesn't support it per-section, so we would just create interop problems for ourselves with supporting it per-page-desc. (cherry picked from commit 97abf85bb152b8a665dff6fd8b65fffea5365dc8) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/source/core/doc/DocumentSettingManager.cxx sw/source/core/inc/DocumentSettingManager.hxx sw/source/uibase/uno/SwXDocumentSettings.cxx Change-Id: Id3c6aac7323deb8d27bab08675ff623f90a63cd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110639 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-02-09Introduce Fontwork contextSzymon Kłos
Change-Id: I61512e4da13514d3e5a199ccb46468ba199b808f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110023 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2021-02-09fontwork: insert in the center of LOK viewSzymon Kłos
Change-Id: Iabde4ee927546b0e396c4fbd6d0099fa82240166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109968 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2021-02-02lok: remove annotation viewshell notifierHenry Castro
Unfortunately the Annotation window sends cursor position to client side and it causes horrible effects like scrolling document due to different coordinates with the document. This patch will disable any notification to client side, also it removes a unit test related to check annotation cursor position. Change-Id: Ib432ef020c48bb1a9c82acc43ffccdb4230589c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110328 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-02-02sw lok: disable field shadingsMiklos Vajna
There are two problems with it: First, the field shading is rendered behind bullet portions depending on the cursor position (if the cursor is before the bullet, then we render it; but not if the cursor is after the bullet), and tiled rendering assumes that the render result is independent from the cursor position. Second, field shading is always painted directly (not going via invalidation), so it's possible to end up with one tile showing field shadings and another not, which is inconsistent. And even if it would be there consistently, that would mean a lot of unnecessary invalidations. The alternative would be to disable this from online.git's loolconfig.xcu, but the item's path would end with something like "ColorScheme['LibreOfficeDev']/WriterFieldShadings", which means it's not easy to do this in a way that's independent from the product name. (cherry picked from commit 876da94619d561e4b4c6c7d12a8d6726eb857df8) Change-Id: I23c62acc3c15966cfba98fcee99cc96854ba4394 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110283 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-01-22tdf#139830: keep the right context for chart after view switch (writer).Tamás Zolnai
Change-Id: Id4829e4bf8f52e2348ebd7874c77e245b18a2bb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109812 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2021-01-19lok: fix incorrect invalidate cursor positionHenry Castro
When the comment is created and it's shown in the "Writer" application, it creates an initial output area: mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,1,1) ) ); Unfortunately, it causes that send to client side cursor position and scroll to the beginning of the document. Change-Id: I13e21c71328b7f05781e7cdeed082d6cc2b9d679 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109371 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2021-01-19fix location of change tracking boxes in OnlineNoel Grandin
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108849 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 042bb632978a1d01f3240890ea9d39ead707633d) Change-Id: I65fcb52e224dce7df2a5a7baed2b8f23d0d49397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108861 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-01-13sw edit win: fix read-only selections while handling ExtTextInputMiklos Vajna
When typing into a protected section (or other read-only area), the code goes through SwEditWin::KeyInput(), which checks for HasReadonlySel(), and calls into sw::DocumentContentOperationsManager::InsertString() in the read-write case. When typing via ExtTextInput (e.g. Online), then SwEditWin::Command() called into sw::DocumentContentOperationsManager::InsertString() without such a check. The convention is to do a read-only check in the first Writer function called by vcl, so handle this in SwEditWin::Command(), to have exactly 1 read-only popup on typing a character. (cherry picked from commit 0c03a97fb8844ad0de1abea79b5265617a509460) Conflicts: sw/qa/extras/tiledrendering/tiledrendering.cxx Change-Id: I7d002e7d76bffeb6f16750de735c5bbf13a7bba9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109212 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-01-12Make Fontwork gallery dialog asyncSzymon Kłos
Change-Id: I156dc1b505b01dc7520ccfe80bbf97eba881d653 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109092 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-01-07tdf#129568 Rename the default table styleMaxim Monastirsky
As it turns out, UI names of table styles are leaking into documents, and changing those names actually breaks the import of documents from previous versions. The problem is that a table style itself is saved using its programmatic name, but is referenced by tables using its UI name. So after changing the UI name, these no longer map. It's still possible to manually reapply the style, but if not doing this and just saving, the style and its child cell styles will be silently lost. Moreover, if the given document is of fodt type, it's not even possible to save it (even not as "save as" to odt). Obviously, the issue isn't just with renaming. The same happens also with documents created with a different UI language (even English). Fortunately, up to now English UI names were identical to the programmatic ones. So the first thing we can do is to accept both kinds of names for table:template-name. This way, we solved the problem for documents created in an English UI, and in addition made them work in non-English UI (unlike before). As for export, we want to always writes programmatic names, so newly edited documents will continue to work regardless of future UI changes or UI language switching (and also stay compatible with older versions). For the fodt export failure, changed the order of things in SwXTextTableStyle::replaceByName, as setting a new box breaks SwXTextCellStyle::getName in this specific case. Also changed cell styles to be named using the parent style's programmatic name, so new documents won't have this problem when opened in older versions. This also fixed part of the PythonTest_sw_python failure. The remaining PythonTest_sw_python failure was about the "TableTemplateName" UNO API property of a table, which didn't work with programmatic names. That's a real bug by itself, and was fixed. Also an explicit test was added, to make sure the API always returns the programmatic name. Finally, an odf export test was added. It tests files with both old-style UI names, and new-style programmatic names. Styles should be correctly imported, used by the table, and survive export. Change-Id: I45dfda193813fea184dc42e5e75544ebc05d4a92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87826 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2021-01-07convert XML_STYLE_FAMILY to scoped enumNoel Grandin
Change-Id: I5335b0190a2f5a8111993c0c9c224c8a6a8f0cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88723 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-12-28Fix crash in SwXTextDocument::getSelection() method.Tamás Zolnai
pWrtShell was nullptr. This crash was triggered by an collaborative editing use case. Change-Id: Id64298b424f5ac4d96df97581c6fe3067e799eb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108410 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-11-30rework treeview initial toggle button col to be like expander colCaolán McNamara
cause this assumption is baked into the vcl one making it hard to adapt remaining cases Change-Id: I75dd5264c65b1ffbf4d26c9a86f6d4d08b400d90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95622 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106874 Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-11-25sw tiled rendering: fix paint->invalidation loop when paint is started by vclMiklos Vajna
SwViewShell::PaintTile() already calls comphelper::LibreOfficeKit::setTiledPainting(), so by the time it would rearch SwViewShell::Paint(), callbacks (e.g. invalidations) are ignored during paint. Do the same for SwEditWin::Paint(), where we processed invalidations during paint, potentially leading to paint->invalidation loops. Conflicts: sw/qa/extras/tiledrendering/tiledrendering.cxx sw/source/uibase/docvw/edtwin2.cxx Change-Id: I8280f5c2571beeae6c0f2986d275dde3c2d33161 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106543 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-11-16DOCX import: don't throw away cached value of SwHiddenTextField ...Miklos Vajna
... when we also have an SwUserField. The problem is that a DocVariable gets imported as an SwUserField, but then SwDocUpdateField::InsertFieldType() marks the field as dirty. This causes IsFieldsDirty() to return true, so then DocumentTimerManager::GetNextIdleJob() decides to recalc all fields. This leads to loosing the cached result of conditional fields. (cherry picked from commit 1abf4e6d07ca0ac31bc54f812df84efc82d2af1b) Conflicts: sw/qa/uibase/uno/uno.cxx Change-Id: I4f5c032648f8fc2aff98e4f8c883492375c7752d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105923 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-10-31tdf#135260 sw_redlinehide: fix insert-with-delete differentlyMichael Stahl
The problem with the fix for tdf#127635 is that now the cursor doesn't move left on backspace if change tracking is on. (regression from 398ba26077f9029bdf6f7378bfc9ce8376b6f02d) Revert that and fix the autocorrect position in SwWrtShell::Insert() instead. Change-Id: I5989a589b654fc6e5ba3dd66922af15eff758ecc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104280 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit be4616d6b49b8c9cf1a90b212b24ead3dabcab6c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104299 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105093 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-10-19Check render parameters for AutoSpellCheckingMert Tumer
Change-Id: Ife2551b4023461da26e70ac3de505adf9d7db1e8 Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104274 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-10-13leaflet: User may continue writing a comment after it loses focus/core part.gokaysatir
This path enables Online users to continue writing their comment after they click somewhere else in the document. Online side will remember original position of comment and it will send the cursor position when needed. When there is no cursor position, default behaviour will work. Change-Id: Ided951481af6e0ec6c930e125bec7fdf687614d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102377 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-10-09Added optional parameter Enabled for uno:SpellOnlineMert Tumer
Change-Id: I3578b0a002ea2cdcc7893972607f26732ce545ea Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104083 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-10-08Online: "Copy hyperlink location" feature improvement.gokaysatir
Lambda functions are replaced with class pointers. Change-Id: I48628d3105533aad2463bd8ade1f65cf5b154b0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104054 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-10-06Make Split Table Cell dialog asyncSzymon Kłos
Change-Id: I4efbb24f721aa50cc4dbbe78ae1e7e6087f8c876 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103670 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-09-30Online: Copy hyperlink location. / Core side.gokaysatir
Payload format is added to LOK_CALLBACK_CLIPBOARD_CHANGED. Clipboard changed event is not fired when "copy hyperlink location" command is issued. So i added a call to LOK_CALLBACK_CLIPBOARD_CHANGED inside TextDataObject::CopyStringTo function. Change-Id: I8157572288da88b5522662e13abe151ef8548b34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103164 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-09-25tdf#134782 sw: split AddParaSpacingToTableCells flag in 2Michael Stahl
commit 3cccdabf19a99fd3f657985c1822436d7679df2b "extend AddParaSpacingToTableCells with line spacing" changed how the ADD_PARA_SPACING_TO_TABLE_CELLS compat flag works, to improve interop with Word. This commit splits out the change as a separate new compat flag ADD_PARA_LINE_SPACING_TO_TABLE_CELLS ("AddParaLineSpacingToTableCells"), to preserve compatibility with ODT documents that were produced by LO < 6.4 (via SwXMLImport::SetConfigurationSettings()). New documents and WW8/RTF/DOCX import have both flags enabled. The combination false/true is invalid, and treated as equivalent to false/false. Change-Id: Ida20df8fe4a8192a714f91da95345f9726fd7d98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103317 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 38aa699f265c17548769aaa4f20e1ae35d18f202) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103359 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-09-22Added new command to delete the comment threadPranam Lashkari
Change-Id: I16d46787a6972afb0c3ab2e56482888082af1d27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102695 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-09-22Added new command to resolve the comment threadPranam Lashkari
Change-Id: I8a4e5f63ee6ea5e560fae8a5d3602178f2b58b36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102627 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-09-22changed FN_RESOLVE_NOTE behaviour to resolve single notePranam Lashkari
Earlier it used to resolve the entire thread and there was no way to resolve a single comment in thread Change-Id: I471c5b575dd365d52653835be5b0d40009bb5cfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102580 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-09-19LOK: fix display of page number on status barEzinne Nnamani
Somehow after 8cd1c1efb46cd98a597e3b6fbb6e3340 we got an empty string in the incoming statechanged: .uno:StatePageNumber= message instead to the Page x of y string. Without understanding the details we can safely ignore the extended tip in the LOK case, because we do not use extended tips in Online. Change-Id: I3b89f176c455b830c48d3c53db75e8ab81c7d9f9
2020-09-09Resolves: tdf#136189 don't try and sort until treeview is filledCaolán McNamara
Change-Id: Ic5ac71d88bab7627e14220912f4b9c935f2f1f26 and... Related: tdf#136189 don't assert on unsetting non-existing previous sort column Change-Id: If2330cc83ace9ec0133b99eec8c2f0be3919013e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101710 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit c52ac477beefc46802148033adbca9edb9970ac1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101967 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-07Hide InsertFormula in Writer onlineSzymon Kłos
Change-Id: I5875559b46d242434b8e47f214e7f7f7a4a3db6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102146 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-09-03sw: insert plain tab char at a numbered para start if indent wouldn't changeMiklos Vajna
Pressing the <tab> key at the start of a numbered paragraph typically is not interpreted literally, rather we increase the numbering level by one. This results in a similar increase of indentation, and results in a semantically better document. However, this automagic is annoying in case the numbering is a leftover, which is not even visible, so the user only sees that pressing tab is "ignored" (if they don't pay attention to the status bar). Fix the problem by guessing if "downing" the numbering will change the indent, and if not, fall back to inserting a plain tab character instead, which will increase the indentation. Conflicts: sw/qa/core/doc/doc.cxx Change-Id: I260d3caab447c03a98655d8f5da310082ba0b46e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102004 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-23tdf#135721 sw: fix spell check context menu deleting flysMichael Stahl
Kind of similar to e1629c210ad78310e3d48c0756723134a27b89df but the problem is at a higher level: SwTextShell::Execute() with SID_SPELLCHECK_APPLY_SUGGESTION should not DelLeft() + Insert() but just Replace(). (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: I78487c7841ba22ccc6751240a8e55e08a86fba32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101014 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ec579354af954867b829e7d08e4d752518c83728) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101072 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101231 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-08-18tdf#134439 honor FN_PARAM_PAM argumentsCaolán McNamara
which was dropped by commit bba8e5aa6d1968e5279b3fe368c0f81145513d04 Date: Thu Mar 1 21:00:24 2018 +0100 tdf#116070: Use a valid PaM when confirming the dialog. when fixing commit 34527cec54ca634b831cfa5ac1098c4046818ac3 Date: Tue Jan 16 18:54:19 2018 +0100 lokdialog: Convert the Format -> Paragraph... dialog to async exec. so, go back to using pPaM instead of rWrtSh.GetCursor but make a copy of pPaM to avoid the crash of tdf#116070 Change-Id: I0aaaf5173c6be47dd306b77eacbb07d0e1c4eaf1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100528 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-08-17tdf#128197: sw: different line height for DOCX with compat=14Vasily Melenchuk
Lines containing just a shape inline without any other text are treated in DOCX with compatibility option 15 and 14 in a different way: while compat=15 is layouting line exatly as LO does, in compat=14 mode minimal line height takes into account just shape height and not current font. Change-Id: Id2bdab941a0bbaa9080567d736435d9e0babd490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96080 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100542
2020-08-03lok: state updates for vertical alignmentSzymon Kłos
Change-Id: I6767904e3d3366e1316c932555b979a26e77b8c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99998 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-07-22tdf#134654 sw: Alt-X - end keyboard selection tooJustin Luth
The selection itself was cancelled, but not the fact that a keyboard selection was "in progress". EndSelect is slightly heavy, so wrap it in a very lightweight if statement. ClearMark also checks HasMark, so real purpose in first checking it. Change-Id: I969a694c46d92201f3c3f2121e3fa3a2af27253c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98719 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit cef5a2d780ad01105dae860f6293f6f137603027) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98649 (cherry picked from commit 8901f44746f3df147d327e95125cbd4a08049843) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98762
2020-07-20Make Bookmarks dialog asyncSzymon Kłos
Change-Id: I820019f6906fef57743886fb1ba9c98217955370 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99041 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-07-20Make Line Numbering dialog asyncSzymon Kłos
Change-Id: I196008ec58feab9d9a2e41c8901ed5d5a2fc9b4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99037 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-07-20Make Title Page dialog asyncSzymon Kłos
Change-Id: I5d7b3b494e874a5107f4977fb7d93802b241f833 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99036 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>