summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2019-07-01sw comments on frames: fix UI to be able to annotate with at-char anchorsMiklos Vajna
We used to just comment the doc model position at the end of the paragraph of the image anchor. Change this, so that in case an at-char anchored image is commented, first we insert the comment (which creates a placeholder character), and then we set the annotation range to cover exactly that placeholder character. This results in a layout that shows a commented image. Change-Id: Ie21d62ddb9f55f3e06ee39d9eccfaa0446ce7845 Reviewed-on: https://gerrit.libreoffice.org/74957 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-01NB writer groupedbar review for 6.3andreas kainz
Change-Id: Ic4e582adbacaa73d48e9b8194ab7c99b47fff4b7 Reviewed-on: https://gerrit.libreoffice.org/74923 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-07-01sw: prefix members of SwBlankPortionMiklos Vajna
See tdf#94879 for motivation. Change-Id: I4e137e71b32a1fa5fa0f20473142e7d72a891f4e Reviewed-on: https://gerrit.libreoffice.org/74945 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-01Improve the looks of a wave line by draw it with bezier curvesTomaž Vajngerl
This adds drawing the wave line (typically used to underline the wrongly spelled words) with bezier curves. Previously the wave lines were drawn with drawing pixels, which didn't look that good, especially on HiDPI display, so the looks of wave lines now is therefor much better. The creation of the wave line as a polygon has been added to the basegfx module, so it can be reused if needed. In addition, everytime we draw the waveline, we have to enable antialiasing, to have a much better quality of the curves. By default the antialiasing is disabled for some reason. This also adds ScopedStates.hxx file which currently includes ScopedAntialiasing, which sets the antialiasing to a certain state for the time the object is in scope, and then sets it back to the original state. Change-Id: I4b866fc5d69725eb7f6f78a1acf4176b1205aa73 Reviewed-on: https://gerrit.libreoffice.org/74810 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2019-06-29NB tabbed_compact review for 6.3 doneandreas kainz
Change-Id: I892844297b2d3ad3843a6e43af8f196fc889addd Reviewed-on: https://gerrit.libreoffice.org/74886 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-06-29NB tabbed writer and calc updateandreas kainz
Change-Id: Ia2822b62df9f467db424bb9741b0081dc0d7bbf4 Reviewed-on: https://gerrit.libreoffice.org/74862 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-06-29lokdialog: Convert the Format -> Position and Size... to async exec for swMuhammet Kara
Change-Id: Ie3383ebe7a712d711e28c626be9e0aaeed5379bb Reviewed-on: https://gerrit.libreoffice.org/74860 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-06-28tdf#125706 and tdf#125665 writer, speed up RDFNoel Grandin
The RDF stuff is sloooooooow, so (a) add some caching and (b) fold a very hot UNO_QUERY call. To add the caching we need to add a new UNO interface, since XEnumeration is not amenable to being cached. Add an optimised getStatementsGraph_NoLock2 that skips the intermediate enumeration object, and consequently a lot of locking/unlocking. Cache by OUString key, to avoid expensive OUString<->OString conversion when looking up entries in the cache. For the test document in tdf#125706, this takes the time from 7s to 5s for me. For the test document in tdf#125665, this takes the load time from 60s to 7s for me. Change-Id: I207387e975b4f107834edd0974134c481fb4012d Reviewed-on: https://gerrit.libreoffice.org/74740 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-28AnnotationWin: Fix for GetTopReplyNoteJim MacArthur
This allows GetTopReplyNote to work when 'this' is already the top reply note in a thread. Change-Id: Ic4cd5d18bdd022bd22bc97a0b0257639ef3f027d Reviewed-on: https://gerrit.libreoffice.org/74450 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-06-28Give a parent to the Position and Size (Transform) dialogMuhammet Kara
So that it can be used on lool side Change-Id: If4b4e286f2f21ed8a5e9907f182878690c65bf5a Reviewed-on: https://gerrit.libreoffice.org/74824 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-06-27lokdialog: Convert the Format -> Line... to async execMuhammet Kara
for sw and sc Change-Id: If89bff982d16ba8d4e4524445e56ee2fe23d7876 Reviewed-on: https://gerrit.libreoffice.org/74818 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-06-27lokdialog: Convert the Format -> ... -> Area... to async exec.Muhammet Kara
For sw and sc Change-Id: I83ad76658545d8df135e1a08abff4d0b5a81b46a Reviewed-on: https://gerrit.libreoffice.org/74808 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-06-27Breeze: fix for tdf#125879rizmut
- Breeze & Colibre: Rearrange Navigator's element - elementary & KJ: Add some Draw's tabbed icons - Reenable menubar icons Change-Id: Ic10c80e4674393714664568ff0914acdc54b5990 Reviewed-on: https://gerrit.libreoffice.org/74791 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2019-06-27sw: avoid deleting the iterated SwRowFrame on tdf104188-4.odtMichael Stahl
The change in commit 1e6dec4b4313212a3bdc6bb06155fd65e795368b was not enough to fix this problem. SwContentFrame::CalcLowers() may move a SwTextFrame to the previous page; in that case Calc() on the upper is a bad idea because it may then call RemoveFollowFlowLine() and delete the SwRowFrame that is being iterated. There is one other (unknown) bugdoc with this problem, let's hope it's fixed as well... (regression from commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: I3c55a0d7ef0350a482fb150d3e96c3b34853400d Reviewed-on: https://gerrit.libreoffice.org/74793 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27tdf#125751 sw: don't start recursive layout in SwTextFrame::EmptyHeight()Michael Stahl
Not sure if this has anything to do with the bug, but i noticed it while debugging... This is the only place that calls GetCurrFrame() *during* formatting, so make sure we don't do stupid recursive things. (regression from 56b2cf0c10d9caa01ebae1d80465e342d046a85c) Change-Id: Icd05f8d634bc9de4d5d16824d30075397e6c9960 Reviewed-on: https://gerrit.libreoffice.org/74750 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27tdf#125751 sw: fix crash on formatting in SwLayoutFrame::PaintSwFrame()Michael Stahl
It's less than ideal that the document is painted before being fully formatted, but let's try to apply a band-aid... 0x6120001a97d0 is located 144 bytes inside of 280-byte region [0x6120001a9740,0x6120001a9858) freed by thread T0 here: #1 SwFootnoteFrame::~SwFootnoteFrame() /home/ms/lo/master/sw/source/core/inc/ftnfrm.hxx:64:7 #2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 #3 SwContentFrame::Cut() sw/source/core/layout/wsfrm.cxx:1263:25 #4 SwFlowFrame::MoveBwd(bool&) sw/source/core/layout/flowfrm.cxx:2544:17 #5 SwContentFrame::MakeAll(OutputDevice*) sw/source/core/layout/calcmove.cxx:1522:17 #6 SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:366:5 #7 SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1791:37 #8 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3328:17 #9 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #10 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #11 SwRootFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3116:24 #12 SwViewShell::Paint(OutputDevice&, tools::Rectangle const&) sw/source/core/view/viewsh.cxx:1840:34 (reportedly a regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: Iff5e783985c180b704b273fa26b7c498820640ac Reviewed-on: https://gerrit.libreoffice.org/74749 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27tdf#125751 sw: tweak assert in SwFrame::PrepareMake() a bit moreMichael Stahl
This fixes 2 cases of the assert that was added in commit e14056e6e88d9b8d988b7b88b2776a8fc952031b * tdf#125751 bugdoc would assert because on a page there were a bunch of empty section frames preceding 2 SwTextFrames; the first SwTextFrame moved backwards skipping over the empty section frames, hence the second SwTextFrame is not the mpNext of the first one's follow * writerfilter_null_ptr_deref.sample had a SwTextNode with >80k characters; turns out there is a check in SwTextFrame::CalcFollow() to format only up to 10 follow frames, so the result is 2 follow frames on the same page Change-Id: Ia08afd5a0e227d0613421d74b469c409ee91cfca Reviewed-on: https://gerrit.libreoffice.org/74748 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27sw: fix SwXTextField::Impl::IsDescriptor()Michael Stahl
... to return false for a disposed instance. Follow-up to 36defda96fc62cef1e1ffb725f6768d54b0d9cd0 Unfortrunately have to resurrect the boolean flag again, because neither m_pDoc nor m_pFieldType can be used to check. (regression from e18359445fabad9ba1a704600e9ee327112cc6ae) Change-Id: I6009cb39cd49b930e042aa21f4b40877c4fdbdde Reviewed-on: https://gerrit.libreoffice.org/74739 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27weld SwCustomizeAddressBlockDialogCaolán McNamara
a) use EditEngine instead of TextEngine as the former can be hosted in a foreign widget b) use a SfxGrabBagItem to hold the custom pseudo-field info inside the EditEngine c) use a proxy XDropTargetListener/XDropTarget to massage the treelist entry drag source into the textengine drop target destination Change-Id: I6bf1613ed91341c24b77564405f38b5dab0aacd7 Reviewed-on: https://gerrit.libreoffice.org/74699 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27list too narrow in bibliography viewCaolán McNamara
Change-Id: Ie364823ad641469132973697228ca2ce556e9ba7 Reviewed-on: https://gerrit.libreoffice.org/74756 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-27Review all NB's and compare each otherandreas kainz
Change-Id: I1f6b18cb604059d890e9a3796b7b4dbca9d05134 Reviewed-on: https://gerrit.libreoffice.org/74769 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-06-26tdf#126114 - Form fields are displayed twice (double)Tamás Zolnai
We need to make sure that IsFieldResultAsString() returns true for drop-down field, to ignore the placeholder string. Change-Id: I127800bdff78eb68e000fdbfe433bc88181ac2c3 Reviewed-on: https://gerrit.libreoffice.org/74752 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-06-26tdf#125518: docx export: save anchors for diagramsVasily Melenchuk
Previously all diagrams were saved as inline objects ignoring possible wrapping options and anchors. Change-Id: I0952fb33d4be4c288c919156af9549f8195b7ead Reviewed-on: https://gerrit.libreoffice.org/72291 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-06-26tdf#125382: Check if pDoc is not nullXisco Fauli
regression from e18359445fabad9ba1a704600e9ee327112cc6ae Change-Id: Icd8db6a403b7736d6c8c9d40c8f2c7476c1eee87 Reviewed-on: https://gerrit.libreoffice.org/74533 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-26tdf#78657 DOCX export: fix hyperlink inserted to imageTünde Tóth
Hyperlink inserted to image lost after export. tdf78657_picture_hyperlink.docx: Test file from Microsoft Word 2016. Change-Id: I1b2b9fe023aea3f46848a9d616374f7c08598756 Reviewed-on: https://gerrit.libreoffice.org/74653 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-06-25tdf#126017 sw: do not restore SwFormatContent in SwUndoFormatAttrMichael Stahl
This is a very unusual item that only contains a SwNodeIndex, which may "go stale" because the node it's pointing to may be deleted, moving it to whatever node may be next. Restoring such a moved item causes crashes like this, where the SwSectionFormat's item does not point to its SwSectionNode. (crash is a regression from 4f0b568ef35353b276ae560fb43502b6f6b2bfdb, previously the Undo stack was cleared so you couldn't Undo) Change-Id: I41a9ed9acc72df5b4b3852875a50e51c29eabe95 Reviewed-on: https://gerrit.libreoffice.org/74693 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-25improve loplugin:simplifyconstructNoel Grandin
Change-Id: If863d28c6db470faa0d22273020888d4219e069e Reviewed-on: https://gerrit.libreoffice.org/74559 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-24Colibre: Fix for tdf#122924, tdf#126044rizmut
- Clean unecessary extra outline - Update Gallery, Paste, EPUB, language - Sync extra large AutoFormat - Update table formula in Writer's Navigator - Update DB Form, Query, Report, Table - Update Draw/Impress master, Handout, Outline, Notes, Master Notes Change-Id: I1faabab504010c584f7a480ed6c521c47584df38 Writer: Re-enable some icons in menubar Reviewed-on: https://gerrit.libreoffice.org/74591 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2019-06-24tdf#89709 Make statusbar page number/bookmarks control tool tip showJim Raykowski
Change-Id: I6e78d144971d59f9c8c9706f9ce8f45b9492a5c4 Reviewed-on: https://gerrit.libreoffice.org/72715 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2019-06-24tdf#119571 fix style & numbering at tracked deletionLászló Németh
and direct paragraph formattings after partially deleted paragraphs. Clean-up and extension of the previous workaround, now with Undo. See also commit b69c518df68ce673b28d589da6626bd3d860f309 "tdf#54819 keep style & numbering at tracked deletion". Change-Id: Icc4d21e3fd0496442329c65e379522f4b7fdc6b4 Reviewed-on: https://gerrit.libreoffice.org/74633 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-06-24Drop sw::GetSupportedServiceNamesImplArkadiy Illarionov
Use braced initializer lists and std::transform. Change-Id: I5d1a57d766e39663a55f4921f486210d41fa917d Reviewed-on: https://gerrit.libreoffice.org/74588 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
2019-06-24sw: reduce accuracy of double compares in testFDO74215 even moreMichael Stahl
This failed again on Mac in Jenkins. - Expected: 12.1348314606742 - Actual : 12.15 - Delta : 0.01 Change-Id: Ic72f3f71f15e1b0d1547f836d2fa5ac6ce22ffd1 Reviewed-on: https://gerrit.libreoffice.org/74636 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-24Adapt new test to actual values observed on macOSStephan Bergmann
The test against 5892 was introduced with ac246d6ea1bc43bfc82c9b4c69c9c0f1fd678129 "sw comments on frames: fix layout to place anchor next to the image", causing various macOS builds (<https://ci.libreoffice.org//job/lo_tb_master_mac/30338/> and <https://ci.libreoffice.org//job/lo_tb_master_mac_dbg/26914/> as well as my own local build) to consistently fail with 6283 instead, for whatever reason. So, at least for now, adapt the test to check for >= 5892. Change-Id: Id5cb5dbb343873e02405957edec6be4f9e477f8f Reviewed-on: https://gerrit.libreoffice.org/74627 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-06-24tdf#125741 sw: avoid joining table frames in SwFrame::PrepareCursor()Michael Stahl
The problem is that the PrepareCursor() is called on a frame in a nested table, and the inner table is joined by its predecessor... 0x6120010a3348 is located 136 bytes inside of 296-byte region [0x6120010a32c0,0x6120010a33e8) freed by thread T0 here: #1 SwTabFrame::~SwTabFrame() sw/source/core/layout/tabfrm.cxx:143:1 #2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 #3 SwTabFrame::Join() sw/source/core/layout/tabfrm.cxx:1379:9 #4 SwTabFrame::MakeAll(OutputDevice*) sw/source/core/layout/tabfrm.cxx:1870:9 #5 SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:364:5 #6 SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1791:37 #7 lcl_InnerCalcLayout(SwFrame*, long, bool) sw/source/core/layout/tabfrm.cxx:1584:21 #8 lcl_InnerCalcLayout(SwFrame*, long, bool) sw/source/core/layout/tabfrm.cxx:1586:25 #9 lcl_InnerCalcLayout(SwFrame*, long, bool) sw/source/core/layout/tabfrm.cxx:1586:25 #10 lcl_RecalcRow(SwRowFrame*, long) sw/source/core/layout/tabfrm.cxx:1621:16 #11 SwTabFrame::MakeAll(OutputDevice*) sw/source/core/layout/tabfrm.cxx:2410:21 #12 SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:364:5 #13 SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1791:37 #14 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:481:5 #15 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:397:21 #16 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:397:21 #17 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:397:21 #18 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:397:21 #19 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:397:21 #20 SwFrame::PrepareCursor() sw/source/core/layout/calcmove.cxx:397:21 #21 SwCursorShell::UpdateCursor(unsigned short, bool) sw/source/core/crsr/crsrsh.cxx:1851:25 #22 SwCursorShell::EndAction(bool, bool) sw/source/core/crsr/crsrsh.cxx:269:5 #23 SwCursorShell::EndCursorMove(bool) sw/source/core/crsr/crsrsh.cxx:305:5 #24 SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) sw/source/core/layout/layact.cxx:2238:35 After the paste, the formatting goes only until SwLayAction::IsShortCut() exits early because the previous visible page is formatted - but the cursor position was moved downward and is no longer visible, so we get an idle-layout later where UpdateCursor() triggers more formatting... So prevent the use-after-free with some more guards, which isn't the most elegant solution, but with 4 levels of nested tables elegant solutions are in short supply... (apparently a regression from the SwFlowFrame::MoveBwd() change in 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: Ie166d3b58fe84c3e4808b52202802a471fa81026 Reviewed-on: https://gerrit.libreoffice.org/74518 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-24tdf#54819 keep style & numbering at tracked deletionLászló Németh
and direct paragraph formattings after wholly deleted paragraphs. Clean-up and extension of the previous workaround, now with Undo. See commit 22639148ae5400bac98f32a75d7431b857c80195 "change tracking: keep paragraph style after full deletion" and commit 23c159d948af360baecfe243e1321987760916d7 "change tracking: don't copy page break". (Note: the first fixed the numbering, the second reverted it accidentally.) Change-Id: Ic97af3b171490b011523d1bae11f75aaf4baab54 Reviewed-on: https://gerrit.libreoffice.org/74299 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-06-23Fix typoAndrea Gelmini
Change-Id: I5cfe3c3157b60ebd71989d1ca105283392c03fc0 Reviewed-on: https://gerrit.libreoffice.org/74313 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-06-22Related: tdf#126036 give options dialog consistent button orderCaolán McNamara
its not welded yet, but skip ahead and give it explicit consistent button order in the meantime Change-Id: Ia850a024cb5a87b9231b5ffdec701646d7014e08 Reviewed-on: https://gerrit.libreoffice.org/74573 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-21tdf#125362 Update tab dialog example set after ApplyJim Raykowski
Change-Id: I0f6ad5273b285080bf2bc55fca3a2365b5b42bbf Reviewed-on: https://gerrit.libreoffice.org/74325 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2019-06-21weld SpellDialogCaolán McNamara
a) use EditEngine instead of TextEngine as the former can be hosted in a foreign widget b) use a SfxGrabBagItem to hold the custom spellchecking info inside the EditEngine c) in longer paragraphs the current word is now auto-scrolled into view d) rename Invalidate to InvalidateDialog Change-Id: Ic6db019c32cdfd5f354c58ee7394fdaa040b86e1 Reviewed-on: https://gerrit.libreoffice.org/74119 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-21field dialogs all weldedCaolán McNamara
Change-Id: I0a468ec6926b8b1cd5666839ea0de192c6d11d16 Reviewed-on: https://gerrit.libreoffice.org/74525 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-21sw comments on frames: fix layout to place anchor next to the imageMiklos Vajna
With this, if you load sw/qa/extras/unowriter/data/image-comment-at-char.odt, the comment anchor leads to the commented image, not to the anchor of the image (between "aaa" and "bbb"). Change-Id: I99389c9fc849269eb20d0266f8f604db89faec12 Reviewed-on: https://gerrit.libreoffice.org/74519 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-06-21sw comments on frames: fix annotation start order in UNO portion enumMiklos Vajna
The problem was similar to commit 76a4305d1e90b6617054dd33036e64f005dbcf04 (sw: fix inconsistent bookmark behavior around at-char/as-char anchored frames, 2017-12-21), except here we have an (annotation) mark which does have a range, but still around at-char anchored frames, similar to the bookmark situation in that commit. Fix the problem similarly, by first adding comment-start portions to the enumeration, then frames, and finally the rest of the comment portions (as before). With this, an ODF <office:annotation/><draw:frame text:anchor-type="char"/><office:annotation-end/> sequence (commented at-char image) is roundtripped correctly. Change-Id: I8790d9efae625de48c689ca4180fe75f15b4833c Reviewed-on: https://gerrit.libreoffice.org/74503 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-06-21sw: fix SwUiWriterTest::testTdf114306_2Michael Stahl
sw/qa/extras/uiwriter/uiwriter.cxx:5908:SwUiWriterTest::testTdf114306_2 equality assertion failed - Expected: 4 - Actual : 5 Mysteriously this doesn't happen on master when running make sw.check but reproduces with make CppunitTest_sw_uiwriter CPPUNIT_TEST_NAME="testTdf114306_2" The problem is that the early-returns in SwTabFrame::RemoveFollowFlowLine() are too late: the SetFollowFlowLine( false ); was already executed and henceforth the SwTabFrame thinks it doesn't have a follow-flow-line, so it will never be merged again and new follow-flow-line may be created. (test fail is regression from 1e6dec4b4313212a3bdc6bb06155fd65e795368b) Change-Id: Ic5a2ef4219f212c8b4d34fd47d3d67f32de45f8e Reviewed-on: https://gerrit.libreoffice.org/74500 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-21sw: prepare for revert of hacky liveness checkMichael Stahl
This problem should hopefully be fixed with commit 1e6dec4b4313212a3bdc6bb06155fd65e795368b. Change-Id: Iebc223d1968350905869421a8a3a6ca2df0b8069 Reviewed-on: https://gerrit.libreoffice.org/74501 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-21Resolves: tdf#126005 make bookmark treeview sortableCaolán McNamara
and use iterators into the tree Change-Id: I38eb24d71cc089bf61baa221324a983c1eb782c9 Reviewed-on: https://gerrit.libreoffice.org/74470 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-21sw btlr writing mode: implement TextFrame tbrl export to drawingMLMiklos Vajna
Also remove the checkFrameBtlr() call in DocxSdrExport::writeOnlyTextOfFrame(), which was added in commit 1c876f5616522ab695de8c0316cdb0c601081815 (fdo#78590: Fix for Corruption of para with framePr & drawing object into para, 2014-06-13), but that looks like a copy&paste error, given that the old-style DOCX frames can't have a custom writing direction, it seems. Change-Id: I0940bbbf3adadd1fc480f3d754b4c8854a9c56b4 Reviewed-on: https://gerrit.libreoffice.org/74466 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-06-21tdf#125983 CRASH: Updating link to external filesNoel Grandin
Revert "loplugin:useuniqueptr in lcl_UpdateLinksInSect" This reverts commit 9abbe6746cb4d36e3ccb384f96ccafb9e0612cd6. No point in use std::unique_ptr, sometimes pPam points to something we want to delete, sometimes it does not. Change-Id: I37e9871b8d5d836b7e52b5b8a5a7c572d92487f5 Reviewed-on: https://gerrit.libreoffice.org/74449 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-06-21Drop INetURLObject::GetName and INetURLObject::GetExtensionMike Kaganski
They are just synonyms for GetLastName and GetFileExtension resp. Change-Id: Ic498c7025cc421b830394ed94d64529fd74fe7dd Reviewed-on: https://gerrit.libreoffice.org/74448 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-06-20fix putting ; between entriesCaolán McNamara
broken since... commit 8bddb3c77048814b370351e0eb72c31f289fb34f Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Mar 14 12:51:31 2019 +0000 weld SwInsertBookmarkDlg Change-Id: I2a07820dd5ea13976a1044323a5b52835fd711f1 Reviewed-on: https://gerrit.libreoffice.org/74458 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-06-20sw comments: allow ranges to be created which cover only the placeholder charMiklos Vajna
First, the old condition was a bit tricky: it wanted to avoid the case when only the placeholder character is covered, but given that start and end can be the same for collapsed ranges, this was true for comments without a range, too. In practice what remains blacklisted is just the case when the PaM has a mark, but it's the same as the point. The change has two motivations: 1) ODF can have '<office:annotation/>...<office:annotation-end/>', where '...' may be content which has no document position itself in the Writer implementation, like at-char anchored images. This change avoids loosing the range of such annotations during ODF roundtrip. 2) This starts adding support for comments on objects which don't have an own document position, though UI for that is still missing. Change-Id: If151b8e00e37e07830c0582b8f0920a91a787363 Reviewed-on: https://gerrit.libreoffice.org/74459 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
generated by cgit (git 2.34.1) at 2025-04-26 23:37:16 +0000