summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2019-10-01tdf#116234 Apply email settings just setMichael Weghorn
Email configuration that is entered in the SwMailConfigDlg dialog is written to the (global) configuration, while the existing SwMailMergeConfig item 'xConfigItem' was not updated, so the newly entered values for the email server connection weren't applied for the current mail merge previously. In order to have them take effect, take over the new settings to 'xConfigItem' from the global config where those were just set. Change-Id: If0dae3ce26af797ffa728dca96f08dce3197557c Reviewed-on: https://gerrit.libreoffice.org/79847 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-10-01Drop SfxItemIter::FirstItemMike Kaganski
It is always used right after the iterator is created, where simple GetCurItem gives the same value without reseting the position. Change-Id: I871dc7989b79e13f06436ef7928692645b5209f6 Reviewed-on: https://gerrit.libreoffice.org/79903 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-01Avoid redundant IsAtEnd: NextItem returns nullptr iif iterator is at endMike Kaganski
To keep the check efficient, split NextItem to inline and Impl parts Change-Id: Id5877a3c5bed73aac9c39c655b106a715cf888ea Reviewed-on: https://gerrit.libreoffice.org/79894 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-30tdf#124601 sw: add ContinuousEndnotes layout compat optionMiklos Vajna
Writer has two cases for laying out endnotes: either they are at the end of the section or are on a separate endnote page at the end of the document. Word always puts endnotes as continuous content at the end of the document, not on a separate page. Given that this continuous / separate page behavior difference seems to be not part of the ODF or OOXML file format and neither UI allows to configure this, the best way to resolve this looks like a new layout compat option. At a layout level, the "endnotes at the end of the section" code is close to what we need, we just need to make sure that: 1) Endnotes are never moved backwards, even if their reference moves back. 2) When appending an endnote, they should go to the footnote container on the last page, not close to their reference. With this, the page number in Word and Writer now match for the bugdoc. Change-Id: I6fd0ee191e001d7c3a6df46d5e9fe8d7eb0327dc Reviewed-on: https://gerrit.libreoffice.org/79857 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-09-30tdf#127840 Remove limit to Days offsetLaurent BP
Since 6.3 branch, offset in days is rectricted to 1 month, which could be too restricted. In previous versions, this limit was not effective. Change-Id: Iaddf6fe3ae5e8cd937127302917108d6f465ab81 Reviewed-on: https://gerrit.libreoffice.org/79788 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-30The argument of SwpHints::Insert should not be constMike Kaganski
Change-Id: Ic71a53140ae43c5936b0a63213e5c7d068bed45f Reviewed-on: https://gerrit.libreoffice.org/79850 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-30pNew could be nullptrMike Kaganski
Both if branches dereference pNew, so just check for that instead of useless check for ( pOld || pNew ) which is granted if pOld != pNew Change-Id: I5654c0a4e12e614d4d2068ddae582c1b86f2d61f Reviewed-on: https://gerrit.libreoffice.org/79837 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-30Simplify iterating in SwRegHistory::MakeSetWhichIds a littleMike Kaganski
The IsAtEnd check is redundant here. Change-Id: Ie576d039ea3db5f98d9c8c3dfd7e77519fcc1e1d Reviewed-on: https://gerrit.libreoffice.org/79836 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-30tdf#127735 DOCX export: fix internal hyperlinks to table targetTünde Tóth
Hyperlinks with internal table targets didn't work in Microsoft Word. Change-Id: I93b2b38d3d0196939f7aa5021811d2a9d5e482f5 Reviewed-on: https://gerrit.libreoffice.org/79524 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-09-30tdf#127734 DOCX export: fix internal hyperlinks to section targetTünde Tóth
Hyperlinks with internal section targets didn't work after export. Change-Id: I355091193f9b7f92d3fec77ee7d8a27bfd981724 Reviewed-on: https://gerrit.libreoffice.org/79522 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-09-30tdf#127733 DOCX export: fix internal hyperlinks to chart targetTünde Tóth
Hyperlinks to internal chart targets didn't work after export. Change-Id: I724c6af8fd7f1961260b82331b9f62d8cbd88f25 Reviewed-on: https://gerrit.libreoffice.org/79456 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-09-30tdf#127732 DOCX export: fix internal hyperlinks to frame targetTünde Tóth
Hyperlinks to internal frame targets didn't work in Word. Change-Id: Ia402bbdd2e77d8d3bb68ed2ed3a6bde1a913617c Reviewed-on: https://gerrit.libreoffice.org/79448 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-09-30null derefCaolán McNamara
since... commit a5081700bacb90d8560959a4d65d94a2d4e8dadd Date: Fri Sep 20 10:31:40 2019 +0200 Change-Id: I4876b0ddeede794d8c638cccb7c825d1db122fdd Reviewed-on: https://gerrit.libreoffice.org/79652 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-30sw: prefix members of SwGammaGrfMiklos Vajna
See tdf#94879 for motivation. Change-Id: I53e8dd6a24da0a35d36f415237525b8cb87854c4 Reviewed-on: https://gerrit.libreoffice.org/79824 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-09-30QR Code Dialog Test Writer and Calcshubham goyal
Change-Id: I72613afe607063663a2ae1d395c2cdf320b9c463 Reviewed-on: https://gerrit.libreoffice.org/78877 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-09-30Make resolved comments appear resolved when printedScott Clarke
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>
2019-09-29tdf#127422 draw text with correct pKernArray values.Mark Hung
Prior to 5f62b97ae7891b8c601f6093a1ec5358feb20790, Starting position was specified and DrawText was used to render the text without referring to pKernArray. After the patch, DrawTextArray was used but pKernArray was not update correctly. Instead of draw each substring seprated by space, this patch increases the values pKernArray when a space is encountered and call DrawTextArray only once. Change-Id: I9e61b2d0608400f26136490248740c5f00b56cc3 Reviewed-on: https://gerrit.libreoffice.org/79544 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2019-09-29Fix typosAndrea Gelmini
Change-Id: I8a93a6ed49661ddfae390a0302fca1fab5c95f14 Reviewed-on: https://gerrit.libreoffice.org/79795 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-09-28loplugin:constmethod in swNoel Grandin
Change-Id: I73c3c6d2165287d2d581a04b23b1d3b48166a488 Reviewed-on: https://gerrit.libreoffice.org/79780 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-09-28tdf#126321: avoid flickering in page size popupXisco Fauli
In a Tabbed notebookbar, Layout - Page Size Change-Id: I74ab54e96486de960d1ccc7bcb3c2679e25a6e9e Reviewed-on: https://gerrit.libreoffice.org/79752 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-09-27sw: document what Cont means in SwFootnoteContFrameMiklos Vajna
It's container, not content or continuation. Change-Id: I741798ff9dd72cc5d277107a935d8ccdf33d495c Reviewed-on: https://gerrit.libreoffice.org/79721 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-09-27Related: tdf#124601 DOC import: always allow floating tables in header/footerMiklos Vajna
So now the DOC import is in sync with the DOCX one, see commit 81ef96a2417c7843dfed0558c920ad3064e58921 (tdf#79639 DOCX import: don't delay text frame conversion of in-header tables, 2015-06-01). The bugdoc used to have 2 additional pages in Writer (compared to Word), it has only 1 after this. Change-Id: I24f0dc28599e608737dc19a0143e72832202a034 Reviewed-on: https://gerrit.libreoffice.org/79682 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-09-27Resolves: tdf#122487 avoid duplicates when auto-naming drawing objectsCaolán McNamara
we were looking inside groups already, but our set was limited to the length of toplevel objects, so it wasn't sufficient. just collect all used nums and return the first unused number Change-Id: I239118e9cff7b7ed2a40d68f284c3c4d1d9eb6c4 Reviewed-on: https://gerrit.libreoffice.org/79657 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-27cid#1448369 silence Unchecked dynamic_castCaolán McNamara
Change-Id: I578eac509805b2d363b09026899f2b2d60dc368e Reviewed-on: https://gerrit.libreoffice.org/79678 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-27Related: tdf#124601 DOC import: improve fLayoutInCell handlingMiklos Vajna
There were 3 problems here: First, SwWW8ImplReader::IsObjectLayoutInTableCell() should not use m_nProduct to determine the Word version. It depends on an undocumented field of the [MS-DOC] format and the bugdoc shows how it interprets a Word 2007-produced document as a Word 97 one. Instead, parse the cswNew field of the file header, which is a more or less documented way to find out if this file was produced by >=2000 or 97. See e.g. <https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-doc/841b5f72-487e-4fe7-8657-ec90d5af8750> where the Dop structure maps cswNew values to Word versions. Second, parse the fLayoutInCell correctly: it's part of a bitfield, with two variables: a bool and an other one which decides if the bool should be read at all. The bugdoc's case was evaluated as false, so do the proper parsing in that case and leave the existing logic as-is for now. Third, there doesn't seem to be a reason to exclude the wrap-through case for the fLayoutInCell -> follows-text-flow mapping. The bugdoc shows that Word interprects fLayoutInCell the same way for wrap-though objects, too. Change-Id: Iaddd5e522e0380b731899f32a17c14ce4442ac35 Reviewed-on: https://gerrit.libreoffice.org/79629 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-09-27tdf#127316 ww8export: use default escapement for AUTOJustin Luth
Previously it looked bad, but not horrendous when AUTO was 101. Now that AUTO is 13999, it is obviously wrong (in Word). Better to use the default of 33. Change-Id: If0e12d315346515ce6ec5ae4bcc4110efba14f9b Reviewed-on: https://gerrit.libreoffice.org/79651 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
2019-09-26menubars add separator before AutoCorrectDlg for better visibilityandreas kainz
Change-Id: If72ec102fe23b661582c80a3c194c7c3925ca9d8 Reviewed-on: https://gerrit.libreoffice.org/79578 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-09-26Resolves: tdf#127218 allow changes dialog to shrink when button text changesCaolán McNamara
original the dialog has super wide button contents when the initial size is calculated, and then the buttons are changed afterwards, but the dialog remains at its initial size. Change-Id: Ib29ab9ebdec01a93561a8b304572df60b6ad5ad2 Reviewed-on: https://gerrit.libreoffice.org/79634 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26drop some unnecessary includesCaolán McNamara
Change-Id: Ia0ad992559ecd6f7a0436de2a636391c387beff8 Reviewed-on: https://gerrit.libreoffice.org/79604 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26CppunitTest_sw_uiwriter: improve limit in testTdf105330Miklos Vajna
The problem was that the cursor was invisible. I thought that we can assert that the cursor height is 12pt + the linespacing (276 twips), but turns out the exact value is subject to pixel-alignment, so it's not a good test to require equality. Instead, make sure that the height is at least the 12pt, which is explicitly defined in the document. That fails without the fix, and is a saner limit. Change-Id: I4f9f512542cefc6fa20d6fdf02e9eb5d2e1c1d5e Reviewed-on: https://gerrit.libreoffice.org/79636 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-09-26tdf#127316 docxexport: use default escapement for AUTOJustin Luth
Previously it looked bad, but not horrendous when AUTO was 101. Now that AUTO is 13999, it is obviously wrong. Better to use the default of 33. The import algorithm still could use some work since it round-trips as 51% and not 33%. Change-Id: Id984ea3e6e0b50014389ec8a86668b7a271b96f4 Reviewed-on: https://gerrit.libreoffice.org/79628 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
2019-09-26add property name when throwing css::uno::UnknownPropertyExceptionNoel Grandin
Change-Id: I17f06c9415b9d43b6d8896360e07216c2856367a Reviewed-on: https://gerrit.libreoffice.org/79627 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-09-26loplugin:virtualdead in sw(2)Noel Grandin
Change-Id: Ib948148fa21d595faa8a4a86d4f47243755885ee Reviewed-on: https://gerrit.libreoffice.org/79588 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-09-26drop unnecessary includesCaolán McNamara
Change-Id: Ie7dcf55a78ec896ba937c521b59c0a1f2bbb6e94 Reviewed-on: https://gerrit.libreoffice.org/79598 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26loplugin:virtualdead in swNoel Grandin
Change-Id: Ib96caad8a2bbfc4ff9a5191abbd49789d142d2eb Reviewed-on: https://gerrit.libreoffice.org/79587 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-09-26TODO rename to GetFrameWeldCaolán McNamara
Change-Id: I28527b6773075fe682682a4812cf86bb7ac13180 Reviewed-on: https://gerrit.libreoffice.org/79560 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26weld SwAutoMarkDlg_ImplCaolán McNamara
Change-Id: I64fc2b503f76b61ea8c2f26c8170c72611935131 Reviewed-on: https://gerrit.libreoffice.org/79533 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26source/core/access: no more SwClientBjoern Michaelsen
- also, move BroadcastingModify up from TextNode to ContentNode Change-Id: I4e6e8767aaecb9cce20d5ec3da789532686dfe2a Reviewed-on: https://gerrit.libreoffice.org/79525 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2019-09-26SwAccessibleTable/SwAccessibleTableColHeaders: SwClient no moreBjoern Michaelsen
Change-Id: I0ca9f9d38f9f990fe4a41319d8dbd9b204544f49 Reviewed-on: https://gerrit.libreoffice.org/79506 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2019-09-26drop newly unused SfxModalDialogCaolán McNamara
Change-Id: Ia06713c9766a6731995c83ed0516535d13665ff1 Reviewed-on: https://gerrit.libreoffice.org/79526 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26Remove some unused includesMiklos Vajna
Change-Id: Ic28b4bdd401342d92b33913f7dab0ca875f8aab3 Reviewed-on: https://gerrit.libreoffice.org/79573 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-09-26drop unnecessary includes and update pchCaolán McNamara
Change-Id: Id7fa7d5b95c32fdc738a18208eb95eaec102d937 Reviewed-on: https://gerrit.libreoffice.org/79523 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26now drop TabPageParent intermediateCaolán McNamara
Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c Reviewed-on: https://gerrit.libreoffice.org/79469 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26disinherit OWizardPage and SfxTabPage from vcl TabPageCaolán McNamara
Now that there's no need to support weld/unwelded mixes of pages in dialog any more. inherit from a BuilderPage which contains a Builder and Toplevel container BuilderPage Activate and Deactivate replace TabPage ActivatePage and DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and DeactivatePage. Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812 Reviewed-on: https://gerrit.libreoffice.org/79317 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-26tdf#127673 lok: On double-click, don't enter the embedded objects in Writer.Jan Holesovsky
There are all sorts of problems when we'd try to edit the embedded objects, like that that LOK thinks it is a separate view etc., so better to disable it for now, before we really need to edit embedded objects. Change-Id: Ie8c0249cb0ca8b25a2ac97c1ccec4a5a62cbb770 Reviewed-on: https://gerrit.libreoffice.org/79555 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2019-09-25ODF Import: Add unittest for bibliography entriesXisco Fauli
This is the reason why 417d993b8b8a86c019758ee0850e4b42967e2afa was reverted In ODF format, the bibliography entries are displayed in fields as ['identifier'] Change-Id: Id2b51c37ba0141a88fa1298a9c9f271f23d22992 Reviewed-on: https://gerrit.libreoffice.org/79532 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-09-25tdf#84806 Writer: drag and drop selected tables, don't emptyLászló Németh
Drag and drop operation on a wholly selected table resulted a copy of the original table, keeping also the original one without its text content, ie. emptying it. Now drag and drop works as intended: moving the table instead of copying and emptying (like also MSO does). See also commit 144bdd189d07faef0f71edbd039359665a45876c "tdf#118311 Writer: cut selected table, not only its text content". Change-Id: I7156420d35bd8de320c2559bc9453dbad846517d Reviewed-on: https://gerrit.libreoffice.org/79517 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-09-25tdf#114099 mail merge: Copy JobSetup to working docMichael Weghorn
This is needed for the print dialog to take the document-specific printer settings into account when using 'SwMailMergeDlg', where the print dialog is initialized based on the merged document. Change-Id: I1a1659d49b3b1267ea2a36a81a865837eb105905 Reviewed-on: https://gerrit.libreoffice.org/79515 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-25tdf#107784: DOCX Import: Show citation's title in fields (2nd take)Xisco Fauli
Regression from 06f7d1a96eef5aa69d4872ff6d96eb5085296d09 The problem as I see it is that LibreOffice uses the identifier plus optionals prefix and suffix to display the bibliographic references. On the other hand, MSO displays the title for references starting with CITATION. So do the same MSO does, when working with CITATION refs We already add CITATION when we export to ooxml. See case SwFieldIds::TableOfAuthorities in AttributeOutputBase::TextField Change-Id: I144f27f711926658c8b6f89e69f0ddeeb7e7890c Reviewed-on: https://gerrit.libreoffice.org/79477 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-09-25Related: tdf#124600 sw anchored object allow overlap: add UIMiklos Vajna
Determine is-modified state by always constructing our pool item, and then compare to the old one, rather than depending on save_state(). It seems both are equally good, but this is simpler to implement. Change-Id: I8d7a07eb06904f9f11d8c10bc854f7e42531cefa Reviewed-on: https://gerrit.libreoffice.org/79501 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins