summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2021-04-22tdf#139701 change uno:UnderlineSimple to uno:Underlineharu-02
Change-Id: Ideb436dbbef1c6fb36cae93e5dd55ef2d00698c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114454 Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2021-04-22tdf#141540 fix docx import of group or line with rotationRegina Henschel
... and fix case wrap 'Square' and 'in Line' with them. Non-uniform scaling of a rotated shape might produce skew. Such had happened, when setting group or line to the size contained in GraphicImport. Avoid it. Writer has special rules for shape position and marging in case of wrap 'Square' and 'in Line', depending on rotation angle. The patch adds the needed margins. The patch changes some unit tests where we now get slightly different values. The patch fixes the wrong skew in sample document of tdf#73022. Change-Id: Ic743790c3fc8b8b10a4324d9e0184ad945cdceb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114193 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-22Replace magic numbers in SwFrame::UpdateAttrFrame()Miklos Vajna
By using the same SwFrameInvFlags constants that SwFrame::SwClientNotify() already does. Change-Id: I029006f95758bd91515ecc59ae02b28396a57d0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114453 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-21sw bibliography, refer to a page: add dedicate widget to show the page numberMiklos Vajna
This way the user doesn't have to interpret the URL manually, we can show the fragment-less URL and the page number separately. So far only the doc model -> UI is done, not yet the other way around. Change-Id: I16116dc0ac55d459f86c54cab32172137377548d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114443 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-21loplugin:stringadd replace OUStringLiteral temporaries with OUString::ConcatNoel Grandin
Change-Id: I656f06a74d9f0180ae460264563d6a935c7d2c60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114377 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-21sw bibliography, refer to a page: edit the page number of individual entriesMiklos Vajna
Usually it's handy that editing a bibliography entry field updates all other fields referring to the same source. But avoid doing this in case only the page number changes, that's typically specific to that field. Change-Id: I2b2608c6c4fdb859c430294eaecdadfeb1c802a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114380 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-21tdf#94326 doc import: allow direct numbering to cancel outlineStyleJustin Luth
Prior to this, if a Chapter Numbering style was assigned as the paragraph style, any direct numbering would have been skipped. In this unit test, DOC defines WW8Num2 as the numbering style for the Heading styles. LO copies this to its special "Outline" style. So any direct formatting with WW8Num2 must be ignored. However, any other numbering rules should be allowed, and that is what this patch does. Make sure that WW8Num2 can also be applied outside of the Heading styles. (Unfortunately, the numbering is probably broken since these are now considered to be two different lists - unless someone has connected them in the background some way.) Change-Id: If29c8bbd096acc0edd6f1fe32cedc054f16460d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114298 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-21Introduce SwFrameInvFlags to replace magic numbers in SwFrame::SwClientNotify()Miklos Vajna
SwFrame::UpdateAttrFrame() is not yet updated to produce these. Change-Id: Ibe822139858cbb39a9ecc14e9631dde8ba369871 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114350 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-20sw bibliography table, text generator: handle relative URLsMiklos Vajna
Now that the doc model always contains absolute URLs, it is possible to decide when it does and when it doesn't make sense to convert to relative URLs. The bibliography table does a mixed approach: the document text depends on configuration (relative by default), but the underlying URL is an absolute one. This way it's always clickable and the ODT filter can save it as a relative one (again, depending on configuration). With this, all fields are meant to be clickable: biblio field vs biblio table, relative or absolute ones, with or with a (page) fragment, Writer UI vs PDF export. Change-Id: Ib6879709314fa127094faf7fa615fe57289b41f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114299 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-20tdf#138785 sw: fix mis-positioned as-char flys when deleting empty pageMichael Stahl
When SwFrame::CheckPageDescs() deletes an empty page in the middle of the document, which happens during SetRedlineFlags() here, the SwFlyInContentFrame::maFrameArea is moved in lcl_MoveAllLowers(), but the SwFlyInContentFrame::m_aRefPoint stays unchanged. Because the formatting occurs only after the redline mode is reset, the position of the SwFlyInContentFrame when it is formatted is exactly the same as its (stale) m_aRefPoint, so the setting of (updated) maFrameArea is skipped in SwAsCharAnchoredObjectPosition::CalcPosition(), so the fly ends up a page above where it should be. So keep m_aRefPoint consistent with maFrameArea in lcl_MoveAllLowers(). (regression from b9ef71476fd70bc13f50ebe80390e0730d1b7afb) Change-Id: If1b421daa0d71718d89d9772f5c0d9e367e76845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114332 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-20use OUString::Concat here, not OUStringLiteralNoel Grandin
Change-Id: Ia2172bcab60f32c9d9d4f6ca0230484343eef69b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114321 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-20tdf#129836 - Alphabetize styles in the footnotes/endnotes dialogAndreas Heinisch
Change-Id: Ia578d902648ef9d2c11e5ba40b16f87197d0fa2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114319 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
2021-04-20ofz#33433 Heap-Buffer-overflowCaolán McNamara
since... commit 531993161d6fe8065436191666cc88d7c4c20749 Date: Mon Apr 12 08:13:53 2021 +0200 cid#1476017 Read_GrafLayer's subfunction params are never null Change-Id: Ic4fe55d92abbb0ba90abc70668fd6a837511240f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114307 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-20uniformly remove xalign of 0Caolán McNamara
Change-Id: I7a866326cbe065c87a6cedc02f2925880d46d4af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114311 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-20fix .ui indentationCaolán McNamara
Change-Id: I59785bcf81df775901f5bbb86561803709153286 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114309 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-20tdf#122962 DOCX drawingML export: fix polygon shape in group shapeMiklos Vajna
Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0 (DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default, 2013-12-18), there were two problems here. First, <a:chOff> and <a:chExt> was not written for docx group shapes. This can be done for toplevel shapes just by writing what would be the shape position and size (but for docx, we don't write the size). Second, (poly)polygon shapes used the bounding rectangle of their points as size, which doesn't necessarily match the shape size. Given that the group shape is meant to simply contain its children in LibreOffice (and not have an own size), switch to using the UNO API for polygon shapes as well, that way the two sizes will always match. Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-20lok: Pass object ord num in the uno commandmerttumer
When multiple objects' glue points collide the ordnum will be used to decide which glue point to connect to for the connectors. Without that the default logic chooses the lowest ordered object which is searched and found in the object list Change-Id: I64579d28bbe6cbd92bab745838fe2995585b6a3f Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113517 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114032 Tested-by: Jenkins
2021-04-20Fix Line and Connectors enable interactive drawingmerttumer
We add them directly for LOK case and have no functionality for interactive drawing. Noticed that in Writer we didnt even add them directly I also implemented that as well. Change-Id: If90bfc8d2cdf84f200bc7963ae4126ef789524ff Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112703 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114025 Tested-by: Jenkins
2021-04-19tdf#141548 DOCX import: fix lost text after endnoteRefLászló Németh
First run of the endnote (footnote) can contain not only the footnoteRef/endnoteRef, but endnote (footnote) text, too. This text was lost as a regression from commit 7dd8f8aace536a8e60e87e61ee1d90d61fba15eb "tdf#120351 DOCX import: fix slow endnote import", and in the case of the footnotes, from commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357 "tdf#76260 DOCX import: fix slow footnote import". Change-Id: I9964ee47f456a7632a21ab3b0588d3cb70388011 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114300 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-04-19convert some #define to OUStringLiteralNoel Grandin
Change-Id: I3d2ce76d30ec4f42495d27f1913c6718d2c5078f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114293 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-19Missing includeMike Kaganski
Change-Id: I2af1e4d3bdef9e9689762adae13da23feb554a36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114265 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-04-19sw: layout: if fly's anchor moves forward, move fly off SwPageFrameMichael Stahl
The problem is that on Show Changes->Hide Changes->Show Changes in a 311 page document, the fly "Grafik1" was initially on page 203 but ends up on page 204, with a fly-sized gap on page 194. In a 25 page cut down version of the bugdoc, on layout action 659 the fly's anchor SwTextFrame moves from page 21 to page 22, but the fly remains in the SwPageFrame's m_pSortedObjs, because it's not the anchor frame itself that moves but a distant previous frame, and page 21 goes valid. 0 SwFlowFrame::PasteTree(SwFrame*, SwLayoutFrame*, SwFrame*, SwFrame*) (pStart=0x57c9e30, pParent=0xba15c50, pSibling=0x5a0f920, pOldParent=0xb057690) at sw/source/core/layout/flowfrm.cxx:586 1 SwFlowFrame::MoveSubTree(SwLayoutFrame*, SwFrame*) (this=0x57c9f48, pParent=0xba15c50, pSibling=0x5a0f920) at sw/source/core/layout/flowfrm.cxx:677 2 SwFlowFrame::MoveFwd(bool, bool, bool) (this=0x57c9f48, bMakePage=true, bPageBreak=false, bMoveAlways=false) at sw/source/core/layout/flowfrm.cxx:2061 3 SwContentFrame::MakeAll(OutputDevice*) (this=0x57c9e30) at sw/source/core/layout/calcmove.cxx:1831 4 SwFrame::OptPrepareMake() (this=0x57c9e30) at sw/source/core/layout/calcmove.cxx:399 5 SwFrame::OptCalc() const (this=0x57c9e30) at sw/source/core/inc/frame.hxx:1065 6 SwLayAction::FormatContent_(SwContentFrame const*, SwPageFrame const*) (this=0x7ffec0191b30, pContent=0x57c9e30, pPage=0xb9a1fd0) at sw/source/core/layout/layact.cxx:1833 In subsequent layout actions the anchor frame moves forward one page at a time, until in action 665, when things get really interesting. On page 24, the anchor text frame 582 is formatted for the first time, and it moves the fly to page 24, after positioning it on the page. 2 SwPageFrame::MoveFly(SwFlyFrame*, SwPageFrame*) (this=0xb9a1fd0, pToMove=0x641d310, pDest=0x9125bb0) at sw/source/core/layout/flylay.cxx:972 3 SwFlyAtContentFrame::RegisterAtCorrectPage() (this=0x641d310) at sw/source/core/layout/flycnt.cxx:1432 4 SwAnchoredObject::SetVertPosOrientFrame(SwLayoutFrame const&) (this=0x641d468, _rVertPosOrientFrame=...) at sw/source/core/layout/anchoredobject.cxx:195 5 SwFlyAtContentFrame::MakeObjPos() (this=0x641d310) at sw/source/core/layout/flycnt.cxx:1466 6 SwFlyFreeFrame::MakeAll(OutputDevice*) (this=0x641d310) at sw/source/core/layout/flylay.cxx:223 7 SwFlyAtContentFrame::MakeAll(OutputDevice*) (this=0x641d310, pRenderContext=0x55b1f00) at sw/source/core/layout/flycnt.cxx:384 8 SwFrame::PrepareMake(OutputDevice*) (this=0x641d310, pRenderContext=0x55b1f00) at sw/source/core/layout/calcmove.cxx:375 9 SwFrame::Calc(OutputDevice*) const (this=0x641d310, pRenderContext=0x55b1f00) at sw/source/core/layout/trvlfrm.cxx:1791 10 SwFlyFrame::Calc(OutputDevice*) const (this=0x641d310, pRenderContext=0x55b1f00) at sw/source/core/layout/fly.cxx:2874 11 SwLayAction::FormatLayoutFly(SwFlyFrame*) (this=0x7ffec0191b30, pFly=0x641d310) at sw/source/core/layout/layact.cxx:1455 12 SwObjectFormatter::FormatObj_(SwAnchoredObject&) (this=0xa5c0d10, _rAnchoredObj=...) at sw/source/core/layout/objectformatter.cxx:286 13 SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) (this=0xa5c0d10, _rAnchoredObj=..., _bCheckForMovedFwd=false) at sw/source/core/layout/objectformattertxtfrm.cxx:135 14 SwObjectFormatter::FormatObjsAtFrame_(SwTextFrame*) (this=0xa5c0d10, _pMasterTextFrame=0x0) at sw/source/core/layout/objectformatter.cxx:408 15 SwObjectFormatterTextFrame::DoFormatObjs() (this=0xa5c0d10) at sw/source/core/layout/objectformattertxtfrm.cxx:337 16 SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) (_rAnchorFrame=..., _rPageFrame=..., _pLayAction=0x7ffec0191b30) at sw/source/core/layout/objectformatter.cxx:160 17 SwLayAction::FormatContent(SwPageFrame const*) (this=0x7ffec0191b30, pPage=0x9125bb0) at sw/source/core/layout/layact.cxx:1675 18 SwLayAction::InternalAction(OutputDevice*) (this=0x7ffec0191b30, pRenderContext=0x55b1f00) at sw/source/core/layout/layact.cxx:771 Nothing invalidates page 21 now that the fly is gone, and formatting on page 24 is kind of pointless now because everything from page 21 on is wrongly positioned. (It's possible to skip out of the main layout action loop via SetNextCycle()/IsAgain(), but at this point it's in layact:771 in the layout-all-the-visible-pages loop that follows the main loop, and that one can't be cancelled.) Then DoFormatObjs() is called on frame 582, and this calls FormatAnchorFrameForCheckMoveFwd(), which formats previous frame 581, splitting it and moving its follow along with 582 to page 25. Here SwMovedFwdFramesByObjPos::Insert() is called, and now the anchor text frame 582 cannot move back to page 24 because it's prevented by SwMovedFwdFramesByObjPos::FrameMovedFwdByObjPos(), but that was all based on the wrong assumption that the pages before 24 were completely formatted (this happens in action 670). Something later formats page 21 again, and so at the end there is a fly-sized hole at the bottom of page 24, with frame 582 at the top of page 25. It won't help to detect a situation where the fly is on a page previous to the page it's anchor frame is on in DoFormatObjs() because it was actually moved to the same page in a previous formatting of the anchor frame, in the same layout action. To fix this, try to detect in SwLayAction::FormatContent() if the anchor frame of any fly on the page has moved forward, and move those flys off the page; this is enough for the 25 page document. The 311 page document still has a hole on page 194 though; apparently the last content frame on the page is never reformatted, so invalidate its size. Change-Id: I232c6b305e8593bfecd885c36058777f3980f82f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114066 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-19sw bibliography, relative URLs: switch to absolute URLs in the doc modelMiklos Vajna
Interestingly at least on Linux, our click handler doesn't know how to open "test.pdf", but "test.pdf#page=2" works. If these URLs are normal hyperlinks (and not biblio source URLs) then both work. It turns out the hyperlink case works because the doc model deals with absolute URLs and only ODF import/export converts to relative ones. Do the same for <text:bibliography-mark text:url="..."> and that way the click handler gets an absolute URL even for "test.pdf", which then works. Change-Id: If8282f444d0f6e6defe4282e2753ae8b37b5b09a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114266 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-19use more string_view in comphelper::stringNoel Grandin
Change-Id: I5d27824694e38de540e5f1fcd8704f8777f65140 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114261 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-19Updated README.md filesHossein
* Updated README.md contents to fix various issues * Fixed source links by using [git:], processed by mkdocs scripts * Added README.md for ios, setup_native, unotest * Fixed issues with "underline" and "less than" sign Change-Id: I3e52a1d3372586c390ee6c42a2ef48bbabc81398 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114248 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-19sw: prefix members of SwDoCapitals, SwDoGetCapitalSize, SwFntObj and ...Miklos Vajna
... SwFrameEventDescriptor See tdf#94879 for motivation. Change-Id: If2f85e543bc482e59ebe47a398df716f76b9adbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114254 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-19tdf#141550 tdf#141557 tdf#140975 sw: fix textbox crashAttila Bakos (NISZ)
and regressions by refactoring SwTextBoxHelper. tdf#141550 was a DOCX import regression from commit ff321dd36554d25f0817903becf4598065e0a194 (tdf#140828 sw textbox: fix AS_CHAR regression), resulting bad horizontal position of the frame of the textbox. tdf#141557 was a regression resulting crash by changing text box anchoring "To Paragraph". tdf#140975 was an implementation error, resulting broken textbox by changing box anchoring to "As Character". In the SwTextBoxHelper class there were many repeating code parts for textbox positioning. Now these parts have been replaced with the calls of several new functions: 1) getShapeFormat() returns with the SwFrameFormat of the UNO XShape; 2) setWrapThrough() only sets the surround of the textframe (used in the code frequently); 3) changeAnchor() sets the anchor of the textframe according to the anchor of the shape; 4) doTextFramePositioning() sets the position of the textbox according to the shape (used in the code frequently); 5) isAnchorTypeDifferent() shows difference of the anchor types of the shape and the textframe. Also it handles the situation of anchoring "As Character"; 6) isTextBoxHasValidTextFrame() checks if the shape is a part of a textbox or not. Every function returns with true on success, otherwise gives information to the log. All of them can be called with ShapeFormat or UNO XShape. The goal of this to make the possibility to advance this class for further functions – rotation, grouped textboxes etc. – without code copying. Change-Id: I4441cab87931f161d0ace4983646d6d2a68a7321 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113463 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-04-19cid#1476017 Read_GrafLayer's subfunction params are never nullJustin Luth
A more comprehensive backtrack of pRecord shows that it was never null in this context (and might as well do the same for any other never-null-variables in these sub-functions). I also took pains to (most of the time) clang-format the lines that I modified. I'm not sure how some subfunctions (like SetAttributesAtGrfNode) get away with no errors when they are passed a pointer, but never check if it exists. Perhaps if you use it without ever checking it accepts that? Change-Id: Iaaacd142310340d1f54af4eb61d856d61df0dd50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113990 Tested-by: Jenkins Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2021-04-19cid#1476278 silence Null pointer dereferencesCaolán McNamara
Change-Id: I8b98551c284d04378fe6dfa254be4f5f09efd9e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114249 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-19notebookbar: minify for onlineSzymon Kłos
Notebookbar load takes some time. We don't use most of the items in online so minify .ui file to contain only needed widgets. Change-Id: I4796caae14bb63e3e04d318093209adfb87a77df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113623 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114154 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-04-19Fix two string matches to not include the trailing NULsStephan Bergmann
...which had apparently been broken ever since they got introduced with 399fb822ef81bd2440da8ab48cc2028a6b44d5b7 "swunolocking1: #i105557#: fix locking for SwXDocumentIndex". (The first mis-use of sizeof had already been silently fixed with 46ce0d28b4c765076c7871358375c4e85e44534b "loplugin:stringliteralvar look for assignments". And we can now use the OUString::match overloads that take const char arrays, instead of using OUString::matchAsciiL, and simplify the first one even further to use OUString::startsWith.) Change-Id: I1e7975f29e225bae74ed0c2d447e541fa47bd954 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114146 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-04-19fix build: partial revert loplugin:unusedmethodsJustin Luth
Apr 14 commit a41aef4c1648519b934f0aed06d1c75f75fd852a removed the method, and Apr 19 commit d748430c7d12d71a4cc4ed178e072026ea218641 called it. Change-Id: I5c1071a386413069933ff8329eab921b92704688 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114253 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
2021-04-19Ensure outline content visibility 'Hide' button is removedJim Raykowski
when mouse move leaving window event results in move outside of the outline frame area and when entering a 'Show' button directly from a 'Hide' button which is required by gtk3 but not gen. Change-Id: Ib4d834b8a3b9051ec628406b8da369986a9e1e21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114071 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2021-04-19Only Toggle in Outline Folding menu when sublevels are includedJim Raykowski
Change-Id: Ib0d61d96f46acfeca1c017ec77d315e68ce33fb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114072 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2021-04-18fix alignment of FootnoteAreaPage Dialog Tabandreas kainz
Change-Id: Id605b9c11d80356a2bb5658b3489655e90e65441 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114236 Tested-by: Jenkins Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2021-04-17tdf#30709 sw Style Inspector: show bookmark dataLászló Németh
If the current character position is there in a bookmark (or in multiple bookmarks), show bookmark names and RDF metadata under the node "Bookmarks" in the Style Inspector. Follow-up of commit dd45df62d217db59be3f515b6c7e1bfd17ec4350 "tdf#30709 sw: show RDF metadata in Style Inspector". Change-Id: I943682bd13e7760a8f7a8d534f497e88f2769275 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114225 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-04-17tdf#30709 sw Style Inspector: show metadata xml:idLászló Németh
Follow-up of commit dd45df62d217db59be3f515b6c7e1bfd17ec4350 "tdf#30709 sw: show RDF metadata in Style Inspector". Change-Id: Id488f268e3c2d668680735f2092eddb252966cd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114224 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-04-17tdf#140764 add ImageMode to tabbed NBandreas kainz
Change-Id: I6d3e10fa945da303b1af69b1d631bd2dc8cdab43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114228 Tested-by: Jenkins Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2021-04-16tdf#122222: add DOCX import of resolved comments as "done"Mike Kaganski
Change-Id: Id596d18965de2d8c98853c281188fe8d749055f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114204 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-04-16tdf#122222: add DOCX export of resolved comments as "done"Mike Kaganski
Since implementation of tdf#119228, Writer comments may have "Resolved" state, which is the equivalent of Word's internal "done" flag. This relies on [MS-DOCX] extensions available since Word 2013. DOCX import will be implemented in a follow-up commit. [MS-DOCX]: https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx Change-Id: I3be1e8a096bdec41c8268974fe81328480eb0704 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114023 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-04-16lok: force writer web-view off.Michael Meeks
A number of callers mutate this, so make the setting un-writable. Change-Id: I0a3727020309b92543e42730c997168f076e7bfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114177 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2021-04-16tdf#141525 Fix "Line with Arrow/Circle" insertion error.Jeff Huang
When you insert "Line with Arrow/Circle" from "Lines and Arrows", it will show "Line Starts with Arrow" instead of "Line with Arrow/Circle". This patch can fix this issue. (This issue exists at least since 6.3 series.) Change-Id: I827b9582951fe359d89245970e73d63f7697553f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113963 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2021-04-16sw: DOCX export: write hyperlinks for TOXMark TOX entriesMichael Stahl
* add hyperlink preprocessing in MSWordExportBase::AddLinkTarget() * <w:hyperlink> in the TOX entry * <w:bookmarkStart>/<w:bookmarkEnd> in the field command Change-Id: I4d18778d8ac594a1b4cb43bf0e1234f875eeaf95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114170 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-16CppunitTest_sw_htmlexport: extract reqif export code to a functionMiklos Vajna
This is just the common case when the filter name and the filter options (needed for reqif) is set, no custom options. Change-Id: Ifae4d0810eb099e32b542579d839f5dd2acb4677 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114199 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-16tdf#141538 Make Remove button work in Select Address List dialogGabor Kelemen
... of the Mail Merge Wizard with non-GTK3 backends This works around the different return value of TreeView::get_selected_text() Change-Id: Id7542f8e73731ffe5d133703f0bd0d0ebf26b89f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113747 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-04-16sw: DOCX export: DocxAttributeOutput::EndField_Impl() omits bookmark endMichael Stahl
(regression from f5c266695a4a88da7db971a21915e2bbf758d48e) Change-Id: I00c871c096e8370e3ba4fccd1d02d350142d6b28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114166 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-16sw html/reqif export: fix size of embedded objectMiklos Vajna
We used to write the size of the underlying OLE object, which may or may not match the user-configured size. The PNG preview was correct, which works with the size from the SwFormatFlyCnt ("as-char formatting"). Do the same when writing the "object size" (i.e. \objw and \objh in the RTF snippet). Change-Id: I7e240c1e115846c17b0945376b0de02d19769100 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114197 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-04-16tdf#134373 add PopupLabel to update commands for NB see c5 option 2andreas kainz
Change-Id: I2f3a6470a8b376f66f303578492b59ca0b56388a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114194 Tested-by: Jenkins Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2021-04-16Remove some unused includesMiklos Vajna
See tdf#42949 for motivation. Change-Id: Idf7aa9c902b656c05dc7871675c90dae63289815 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114192 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-16tdf#134951 docxexport: stop duplicating stuff in postponed textJustin Luth
Certain attributes like comments, fields, and footnotes should not be duplicated when a character run is split by the bPostponeWritingText hack. Only DOCX PostponesWritingText. The comment-with-range is still not perfect, but at least it is not fully duplicated. Best would be to just get rid of the hack? A few more items suggested themselves as belonging to this list, but I don't really know what they are, and no instances of them in this position were found in the existing unit tests. So I just left them as a commented possibility. Change-Id: I950c4250b5f7ed62d63eeff71cabaa10b67dca5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114148 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>