summaryrefslogtreecommitdiff
path: root/sw/source
AgeCommit message (Collapse)Author
2020-02-12clang-analyzer-deadcode.DeadStoresNoel Grandin
Change-Id: Ifa384933569b27d0d08eb479bb95b799163ae386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88450 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-11make Base install via packagekit also confgurable (like fonts/langpacks)Rene Engelhard
Change-Id: I72f98e89d1c8e92f10da8e3843956658d035528d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87907 Tested-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-02-11related: tdf#106742 sw: DOCX import/export: fix default of table indentMichael Stahl
There's a compatibilityMode in word/settings.xml in DOCX files: https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx/90138c4d-eb18-4edc-aa6c-dfb799cb1d0d If a document doesn't contain compatibilityMode, then the default is 12, but the code for table indent import/export assumed that the default is 15, so loading an ODF document and exporting as DOCX results in wrong table indent when loaded in Word. (regression from 9a31d1c83e08600507689dc18f6f0973bc7e4389) Change-Id: I3ce32286473640e5b7e12b487aef5f123bfb8d12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88408 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-10refactor PostIt access to SwFormatFields in ...Bjoern Michaelsen
- SwTextShell::ExecField() - PostItManager Change-Id: I7eabf0a7d8170d0dacf3069925abfe1a91a4a9f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88334 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-02-10weld SvxFmAbsRecWin item windowCaolán McNamara
Change-Id: I6a11d8ba226b28447e2ab04925090491d6953132 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88348 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-10sw: prefix members of SwExtTextInput, SwLineNumberInfo, SwWriter and ...Miklos Vajna
... SwgReaderOption See tdf#94879 for motivation. Change-Id: Ib44eaa1adbc731499d22b0bf538380b8bc0cc4eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88357 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-10tdf#90834: Turn in-line version control comments into good commentsPelin Kuran
Change-Id: I366badf234f00536cd208a516eff9667f99d2f86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87719 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-10sw: DOCX export: fix rotated text fieldsMichael Stahl
The rotation works in RTF export and DOC export, but not DOCX. If a text field is rotated via SvxCharRotateItem, the w:eastAsianLayout element gets written on the run that contains the fldChar begin, but not the subsequent 4 runs that are written via DoWriteFieldRunProperties(), because it doesn't write m_pEastAsianLayoutAttrList. It's not clear why that function manually writes a subset of the run properties instead of simply calling WriteCollectedRunProperties() to get all of them. Change-Id: I6d8cacda4b62a6f6fdc77885149e7de8666e7200 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88196 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-10use FindFormatForField some moreBjoern Michaelsen
Change-Id: I96dc7599d755c035d4079d1bbe6b6c21201034d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88335 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-02-10Remove unused variable sWordMuhammet Kara
Change-Id: I56e7c23ae309df112392327a381a4104091222be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88351 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-02-09Simplify SwTableField::GetNodeOfFormula()Bjoern Michaelsen
... by using the new SwFormatType::FindFormatForField() Change-Id: If0492ca04ed836d89bcfcc56572859ba04e084b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88273 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-02-09Fix typoAndrea Gelmini
Change-Id: Ice5f07206708b688f76110fab996717118f95d0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88339 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-02-09Current color isn't highlighted in the table cell background toolbar dropdownMaxim Monastirsky
Change-Id: I32e29d8697a5b6ba914b7ccc030e840b31c38b74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88307 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2020-02-08introduce SwFieldType::FindFormatForField and use it (once)Bjoern Michaelsen
Change-Id: Id7136b936c0585e7013f3d06ad97436b51522da3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88264 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-02-08tdf#130475 Remove mysterious grab focusJim Raykowski
Grabing focus at this location in SwFormatTablePage::DeactivatePage prevents adjacent tab pages from keeping focus on their tab when keyboard navigating the dialog. Change-Id: Ie90722572569ac0cd5251682a19727c91e2a326d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88162 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-08tdf#130482 sw: fix text alignment in shape textMiklos Vajna
Regression from commit a3c7a8282ddd08c7ed4a15d23089d09e418f8fae (jsdialogs: apply .uno:Color and CharBackColor to floating text frames, 2019-11-08), the problem was that the original code populated aNewAttr, while SetAttrToMarked() was only invoked in case there were arguments. Fix this by making pNewAttrs a copy, so lcl_convertStringArguments() can work on it in place, and then restore the old code that copied from pNewAttrs to aNewAttr. This fixes the no-arguments case and keeps the lcl_convertStringArguments() case working. Change-Id: If7bf2d7b21e48d513a512ec6127b61ee74635ef5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88227 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-07DOCX export: fix handling of section starts that originally had page marginsMiklos Vajna
This is similar to commit 26f2a9e1a10a22e864e71ee7c94934821703e021 (DOCX export: fix handling of section starts that originally had headers, 2020-02-06), except here the top margin has to taken from that follow page style, not the header. Without this, it can happen that the page number in the original Writer doc model and the exported Word result do not match. This required reworking WriteNextStyleHeaderFooter(), which assumed that the header/footer status is already calculated by the time its called. But the page margin code runs earlier, so we need to make that decision earlier, even when the header/footer status is not yet calculated. Change-Id: Ife7396603702d2048d544aa46f96acfa337a041a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88211 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-07SwFormatField::Modify no more (folded into SwClientNotify)Bjoern Michaelsen
- refactor out field formatting * make direct calls explicit with new UpdateTextNode() call * try to bring at least some sanity to the event handler Change-Id: I40a39ddf70476b7fa0bf5e157fb263e863bb1d20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87927 Tested-by: Jenkins Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2020-02-07rename GetBaseOfstForFly->GetBaseOffsetForFlyNoel Grandin
Change-Id: Ieeeaa53d916e192e7219d7d3d405584a22249e7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88181 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-07sw: fix misnamed m_IsFootnoteInfoMichael Stahl
Silly copypasta in f3bb701223953df02f005b98d2eee13e82016bd7 Change-Id: Idf20017a7eb180e6a9f429e6976cea8c13cff066 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88194 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-02-07tdf#99693 Add Highlighting tab for WriterMaxim Monastirsky
Works with shapes and comments. Change-Id: Ic2e4b3cf7decce493426bed1ec077cc97ea17bb5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88173 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2020-02-07weld URLBox ItemWindowCaolán McNamara
Change-Id: I7dad000404a188e2f5588b90d73ea9b1236bd301 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88183 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-07weld SwZoomBox_ImplCaolán McNamara
Change-Id: I3cf7046eeb5bf58afc8d1db06fd50d42c6131d40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88145 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-07remove unnecessary includeCaolán McNamara
Change-Id: I205966f40472d187c63717ddf6e8153584c6b284 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88141 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-07weld SwJumpToSpecificBox_ImplCaolán McNamara
Change-Id: I4c140bccf821b6ee0ce0e734cebae722267f5430 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88140 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-07sw: improve DOCX export of footnote separatorMichael Stahl
Don't only check the width of the line, but also the line style and the thickness (0 is not visible). Also there isn't a separate continuationSeparator in sw, so it should depend on the same condition as the separator. Unfortuantely Word doesn't support different separators per section. Change-Id: I55cb3d82ff20c7a21f7d256ec8ba4a43f1e71faa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88131 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-07remove use of macro DeclPrimitive2DIDBlock in everywhereTomaž Vajngerl
Change-Id: I3fcba604ee3bc95274700ae7406f27e292cd09ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88154 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-02-06DOCX export: fix handling of section starts that originally had headersMiklos Vajna
Both the DOC import (in wwSectionManager::InsertSegments()) and DOCX import (in SectionPropertyMap::CloseSectionGroup()) have a mechanism to try to attach changed headers/footers from a continuous section break somewhere, so they are not lost. This means that even if the rendering of such documents is OK, explicit code is needed to undo the effect of the importer at export time, or those headers will be lost. Start doing this for the DOCX export case when the headers/footers are placed at the "previous-in-practice" paragraph, more cases (handled at the import side) can be added later. Change-Id: Ic2304a74919d18da3ba9cb4afe301e0247a50dc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88103 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-06tdf#129881 missing sections in link sectionNoel Grandin
actually this is a regression from commit 2b77d9dba51e1c3841428f3343e9186ca9c446ae Date: Wed Nov 6 11:19:12 2019 +0200 convert SwXMLSectionList to FastParser the commit mentioned in the bug report was fixed by caolan, and then I broke it again with the above commit Change-Id: If6d3dad7baadcdfcc73d87d1e9d6a91c9f65a6e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88019 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-06cid#1458160 Dereference before null checkCaolán McNamara
since... commit 6e2ed4ea934851f82611c3352b9551046fda89d0 Date: Mon Jan 20 11:55:02 2020 +0300 sw: set unique name for fontwork object and style on insertion Change-Id: I0030425c77bba9a8fe720002114c2b9076c93c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88078 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06merge FillTypeLB with SvxFillTypeBoxCaolán McNamara
Change-Id: Ia6229e8cc04c88e6740a12648c50cf5efca3bbd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88067 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06rename SvtFontSizeBox back to FontSizeBoxCaolán McNamara
Change-Id: I2ec0c6dd376f3a192a62dc97f7454af946e2a5ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88065 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06sw: read-only/protected content dialog was missing on Delete/BackspaceMichael Stahl
If SwWrtShell::DelRight()/DelLeft() are called without an active selection, they select 1 character to the right/left, but then they don't check if the selection is read-only, so then SwEditShell::Delete() calls HasReadonlySel() and silently returns. Pop up the dialog in this case too, for consistency. Change-Id: I3d72f136f4d132de3f8a6f3cc2aab493ced95a28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88055 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-06tdf#45589 sw: don't paint field shading for bookmarksMichael Stahl
Maybe it looks better without. Change-Id: Id603fbef361574cafbe2ec9f625ac54fea27a0f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88039 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-06rename SetOfst -> SetOffsetNoel Grandin
Change-Id: Ic33454dbbbe9c189eb5eebda2c25c6cff3251c84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88027 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-06find more symbols that can be privateNoel Grandin
Change-Id: Ief2538fb61f4519e733ce7592cc7c441b94ac124 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88030 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-05sw: set uniqe name and style to grouped shapesVasily Melenchuk
Unique name is required to dsiplay object in Navigator, style is used by undo/redo code. Change-Id: Id2417cbee3f92c0ee555eb093e1e9bbbc0a83e0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87996 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-05Fix typoAndrea Gelmini
Change-Id: Ie0506b80850b17571517653ca05f474ead033161 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88002 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2020-02-05sw: fix crash in SwFrame::dumpAsXml()Michael Stahl
when called from SfxObjectShell::GetPreviewMetaFile(), GetSfxViewShell() is null apparently. Change-Id: Id9f6b14fc044b97eb96f671dfded26f9cb96db22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87984 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-05tdf#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>
2020-02-05sw: convert CopyRange boolean parameters to enumMichael Stahl
Change-Id: Ic65753e1c6f5ef45494c1925cf2a5427427e5fe7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87985 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-05tdf#128814 Add delete to Hyperlinks Navigator context menuJim Raykowski
Change-Id: I401ea84aa32e7d01f9fe157eac4d51981550fc76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87945 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-05correct cast used for type id of contentJim Raykowski
A not always reproducible crash occurs when delete key is used in the Navigator. I have only noticed it for table delete. I believe this is caused by casting user data to SwContentType when it is actually SwContent. This patch changes the cast to SwContent. Change-Id: Ia7f59b3e8141c7dee7188276d6cd6722a3678922 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87992 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-04rename Get/SetPropTextFirstLineOfst -> Get/SetPropTextFirstLineOffsetNoel Grandin
Change-Id: Ib963dccf0f803534c741eacc31a44dc5c90889fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87958 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-04tdf#130362 sw: fix anchoring of inline math objectsMiklos Vajna
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. Change-Id: I2a91af6425035b48a0e47ad9b10939945855cd16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87976 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-04rename GetCursorOfst -> GetModelPositionForViewPointNoel Grandin
Change-Id: Ia7202e009f635032178e5467a1ac0ab43f82ccf2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87953 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-02-04rename Set/GetTextFirstLineOfst->Set/GetTextFirstLineOffsetNoel Grandin
Change-Id: Iaeb3c17fe157dec82cd70991122c08ee1e215752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87955 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-04rename GetOfst -> GetOffsetNoel Grandin
Change-Id: I9c0968bd93f41f983468ee7ba8a20e27c4866b32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87954 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-04std::set<T*> -> o3tl::sorted_vector in sw/Noel Grandin
Change-Id: I7b8e221b9e76f98efdbed9ee1c83e32379fde73f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87951 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-04tdf#42695 Fix a couple Writer Navigator "List Box" related bugsJim Raykowski
This patch resolves: 1) content not shown when Navigator is docked from a floating zoomed-in ("List Box" item unchecked) state 2) "List Box" item is visible when the Navigator is in docked state on document open. Change-Id: Id1fcaf0b581e26aabd4fd897ff142a60d6761e1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87758 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
generated by cgit (git 2.34.1) at 2024-07-20 03:03:03 +0000