summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-06-24sw: make postithelper.hxx self-containedMiklos Vajna2-12/+14
The problem was that the inline SwSidebarItem ctor/dtor needed a complete type for sw::annotation::SwAnnotationWin, but AnnotationWin.hxx already includes this header, so we can't include it. Move the ctor/dtor to postithelper.cxx where we include AnnotationWin.hxx already. Change-Id: I619bd5d21493a80436a333c128eadfff2a6834b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97011 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-06-24tdf#128197: sw: different line height for DOCX with compat=14Vasily Melenchuk9-1/+61
Lines containing just a shape inline without any other text are treated in DOCX with compatibility option 15 and 14 in a different way: while compat=15 is layouting line exatly as LO does, in compat=14 mode minimal line height takes into account just shape height and not current font. Change-Id: Id2bdab941a0bbaa9080567d736435d9e0babd490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96080 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-24Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'master' to 1e6bf2ef267495ec8ab483418a79c23d1fa73e0b - update translations for master/7.0 and add ckb (Central Kurdish) files Change-Id: If4a63e426ebf7de50806fbd2699cea08b26453e4
2020-06-24sd signature line: support signing multiple timesMiklos Vajna1-0/+9
Reload the document after signing. This way in case the signature line is not exported correctly, we notice it immediately. Also the infobar state gets reset, allowing a next signature to be added. Change-Id: Iaeaf4c9aebadbd63b44a0620d345cd0dd0214f30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96983 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-06-24sd: ignore UNDO when importing a PDF with SdPdfFilterTomaž Vajngerl1-1/+7
Change-Id: I6c695ca4edb284d70726b6f30148a508d0e70911 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96944 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-06-24optimize AlphaMask::BlendWith()Luboš Luňák1-6/+9
It shows up in profiling in some cases (e.g. tdf#134160). - If it's 8-bit, simply work on scanlines instead of pixel by pixel. - The extra precision from using floats doesn't matter and the round() costs something (at least with MSVC). Change-Id: I37bbe31fae03d61946a7382de1fb79cfe2d2ec30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97010 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-06-24in Skia raster mode cache even enlarging of images (tdf#134160)Luboš Luňák1-7/+14
Change-Id: I842b55cd922eb0e411fd7450e84224b41ba82a2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96989 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-06-24faster Skia SkCanvas::drawImageRect() with an offsetLuboš Luňák1-0/+5
Without this, the drawing avoids the fast path just because the position has an offset, even though it normally works. It seems this should be enabled by default, but it isn't. Change-Id: Ic74a2502af3c8cd58222af8b5cade4e7cbef3c4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96988 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-06-24one more BmpConversion::N8BitNoConversion for alpha hackLuboš Luňák1-1/+1
This was supposed to be included in 2fcfbd73768b69ba58607a054e7f851be2942992. Change-Id: I79b6f1c953784d3288d3830dbe232630aac392f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96987 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-06-24tdf#40436 tdf#47914 RGB personalized color for math and laplace symbol 2dante9-27/+103
Change-Id: Id0791609ada5b9f5460e46b20cfc7ce600cd3043 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96890 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-24jsdialog: generate JSON for drawing areaSzymon Kłos1-0/+25
Change-Id: Ic9402f0f7c891868790b657cd7e9860e46f3e8e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96852 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96985 Tested-by: Jenkins
2020-06-24jsdialog: implement plus/minus for welded spinfieldsSzymon Kłos1-0/+17
Change-Id: I8a0bf4190c09520d7be78c44742902539cb9bf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94483 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96914 Tested-by: Jenkins
2020-06-24tdf#133670 DOCX import: fix shape width relative to right marginSzabolcs Toth4-0/+24
using UNO API RelativeWidthRelation and the associated lo-ext attribute for OpenDocument export. See commit 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4 (offapi: document the 4 new properties which are no longer read-only). Co-authored-by: Balázs Regényi Change-Id: Ic5d25701d46cdace6502ec55dbc0e5f0ebd7742b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95582 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-06-24tdf#127138: Fix detection of system icon theme with Qt5/KF5Igor Poboiko1-0/+3
The title is self-explanatory. The QIcon::themeName() actually uses Qt Platform Abstraction plugins, i.e. it's aware of KDE preferred icon theme via Qt Plasma integration module. (note that it is _currently_ broken due to KDE bug https://bugs.kde.org/show_bug.cgi?id=402172, which causes themeName to return empty string; however, it's being worked on) Change-Id: Ibc7cf9ee9ae73b492046219487760561d7d2ea45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94691 Tested-by: Jenkins Reviewed-by: Katarina Behrens <bubli@bubli.org>
2020-06-24Fix sending reference marks for current selectionSzymon Kłos1-5/+11
When selecting range on mobile in validation dialog the message wasn't sent due to missing ViewShell Change-Id: Iaab543368469cd363b54b1a89f6983b8c01877ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94693 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96933 Tested-by: Jenkins
2020-06-24jsdialog: send selected tab and namesSzymon Kłos1-0/+2
Change-Id: I54db09a7a0311b5ed9bc0764c353b82bb99b9e41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94620 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96932 Tested-by: Jenkins
2020-06-24two entries missing use-underline propertyCaolán McNamara1-0/+2
Change-Id: Ia6e6b73a9bb4948e3938105ffffa1d912bca5b61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96979 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-24test: set LoadExoticFileFormats to 2 for cppunit test purposesMiklos Vajna1-0/+7
So that in case the officecfg/ default for LoadExoticFileFormats is set to 1 for more conservative users, the tests still pass. make CppunitTest_writerperfect_epubexport CPPUNIT_TEST_NAME="testAbi11105" was one such case when a failure happens without this fix. Change-Id: I7b2dbbf7e64da850cf442ff41e2b6e5fec47d00a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96978 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-06-24Add test as an example how to add CPU intrinsics supportTomaž Vajngerl5-10/+214
Also makes sure that if the CPU dataction or compiler detection doesn't work correctly, the test could potentially crash. Change-Id: If0862c0a736c8e1f5ba1117b248918e4c1fb2f4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96779 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-06-24tdf#133326 Crash after redoNoel Grandin1-2/+3
regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: I6a3d6b35dbd442014c84785d97cbd7eae19244cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96958 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-24use more std::container::insert instead of std::copyNoel Grandin52-192/+85
which is both more compact code, and more efficient, since the insert method can do smarter resizing Change-Id: I17f226660f87cdf002edccc29b4af8fd59a25f91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96948 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-23Brown paper bag fix for e69f547bce7de376a0af464c5f7af5e7d2c8784aTor Lillqvist1-1/+1
No idea why Jenkins didn't notice. Change-Id: Iaab45f40ad97db3118373eb0d27fd57692f979ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96981 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-23tdf#134243 only do the toc-terms localization when showing toc previewCaolán McNamara3-4/+5
and not when previewing another document, which sidesteps the infinite loop in this example Change-Id: Ideb41029f4c98a50555cd35227867d9fdd5ae5a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96977 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23spurious receives-defaultCaolán McNamara1-1/+0
Change-Id: I16b8bd561ea630ca71b56b061e6cccbb6c081eb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96960 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23fix commit "remove JSON node erasing"Noel Grandin1-3/+1
this commit 84881e32317765e7752d57fceac8d979dd801b8c Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Fri Jun 19 16:17:25 2020 +0200 remove JSON node erasing left some intermediate state behind Change-Id: I3d14b3f14c56e2e866903ac7985aa1a5c09ce471 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96947 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-23tdf#133629 calc, crash on format borders on multiple sheetsNoel Grandin1-0/+1
regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: Ie862ec4a29d495c71aa3a21a1941f801fa3a789e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96957 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-23Fix -Werror,-Wimplicit-function-declaration in posrgresql configuryTor Lillqvist2-0/+20
Change-Id: I3c2dfb94a3c9627e802956cc03cebcbdb7d498cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96912 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-23Add getopt declarationsTor Lillqvist2-0/+26
Avoids: implicit declaration of function 'getopt' is invalid in C99 [-Werror,-Wimplicit-function-declaration]. Change-Id: Ic178f53d1002425df52e220b1723fb12edca13df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96910 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-23HACK to decouple URP release calls from all other threadsStephan Bergmann1-2/+19
Abandoned <b9ecec7c74687ed5a9470cffb7d02e0e6e83107e> "Don't call out to UNO with SolarMutex locked" documents a deadlock where a synchronous documentEventOccurred call made with SolarMutex locked evokes an asynchronous release call back (serviced on a different physical thread, but which blocks the original thread) that then wants to acquire the SolarMutex. While we usually appear to get away with wrapping those UNO calls in SolarMutexReleaser (though knowing all too well that that is nothing but a bad hack that may well cause crashes and deadlocks at least in theory), the place in SfxBaseModel::postEvent_Impl was obviously too sensitive for that hack: It did cause enough different crashes (e.g., hitting assert(pSchedulerData == pMostUrgent); in Scheduler::ProcessTaskScheduling, vcl/source/app/scheduler.cxx) and deadlocks (e.g., different threads now taking the SolarMutex and JobExecutor's mutex in framework/source/jobs/jobexecutor.cxx in different orders) to make me search for a different "fix", so I came up with this hack instead. Change-Id: Icd26926279cb86ce529edb4544a3ec0bc9a8b108 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-23inline typedef WeakSdrObjectContainerTypeNoel Grandin2-22/+10
Change-Id: Icdbdc73552b81a71d2551c36f54218deba6149bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96949 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-23tdf#132976 DOCX import: fix shape width relative to left marginSzabolcs Toth4-4/+33
using UNO API RelativeWidthRelation and the associated lo-ext attribute for OpenDocument export. See commit 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4 (offapi: document the 4 new properties which are no longer read-only). Co-authored-by: Balázs Regényi Change-Id: I2dada8ad764a1fba33d241117cc4bc5eddae74ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95525 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-06-23tdf#97694 Add test for macro signature preservation in BaseSamuel Mehrbrodt4-4/+132
Change-Id: I35fb8d499eed66f9a5e208a4778a1f0f12637079 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93630 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-06-23tdf#83309: sw: do not create bullet with no charVasily Melenchuk1-5/+8
On some machines (depending on fonts installed) creation of SwBulletPortion with bullet = \0 leads to drawing a bullet as a empty rectangle. Change-Id: I2826944f2278e8c9a6c740b11b69d2e4e5108158 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96711 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-23Update git submodulesAdolfo Jayme Barrientos1-0/+0
* Update helpcontent2 from branch 'master' to 47b0c69b0a1cefe027366d6e01f4f14470edaa2f - Update CSS box colors to match new Colibre Change-Id: I5ed9fdcad79fc34032e6c8d1536aaaf12d32e177
2020-06-23sw doc model xml dump: improve undo-redo coverage:Miklos Vajna12-5/+177
- show the undo manager's node array - show SwUndoDelete - show SwUndoSaveContent - show SwHistory - show SwHistoryHint - show SwHistoryTextFlyCnt - show SwUndoFlyBase - show SwHistorySetFormat - show SwUndoInserts When an action + undo pair goes wrong, it's easier to see the state of the undo stack after the action this way, then decide if the undo stack is already bad, or the problem is with the undo implementation. Change-Id: Ic509a233dce3c47db9697982eb7ea423f4706129 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96930 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-06-23remove JSON node erasingNoel Grandin3-46/+9
as a step towards using tools::JsonWriter for DumpAsPropertyTree Since this method is only used by the LOK stuff, we can just remove the node down at the generation site in vcl::Window Change-Id: I1b3b9a0732dcdb18267cb56e545a30c8f56b4ae2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96839 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-23tdf#133699 Slow sorting of a columnNoel Grandin1-2/+1
reserve inside a loop is a pessimization, since it breaks the logarithmic resizing of the std::vector data area. Also use the std::vector::insert method, instead of std::copy, since the insert method will perform less resizing operations. On my machine, this takes the sort operation from 25s to less than 1s. Change-Id: I30b99d42c56abc5a4ad5c133c7579fac3952173c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96929 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-23move ListBox to toolkit-only headersCaolán McNamara21-21/+28
Change-Id: I6266dedb17cd7c3b730fc69804695536fef37cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96751 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23salvtables.hxx not needed outside vclCaolán McNamara4-4/+5
Change-Id: I7193c511ec4695b70f482aedffcfc76ee4ded4b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96775 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23most of jsdialogbuilder is not used outside vclCaolán McNamara5-23/+44
so split it into the bit that is needed and just include that. add missing license headers Change-Id: I875f91176e6881e830fee6a58368d0b28ce9a0f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96774 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-06-23jsdialog: use welding for button click eventSzymon Kłos1-0/+13
Change-Id: I0320dfb5cdc4f936eddff003bda7d16bdd1c4667 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94342 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96913 Tested-by: Jenkins
2020-06-23tdf#130218 sw: show hanging indent in narrow cellsLászló Németh3-0/+112
Instead of hiding it, show hanging first paragraph line in narrow table cells, like MSO does. Change-Id: Ibfa7242644db36c1be4d2fe93af75cb295d443b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96865 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-06-23Update git submodulesOlivier Hallot1-0/+0
* Update helpcontent2 from branch 'master' to f9e41ddb473fdb17dab310d17e68e2d0470a8518 - Add Pattern fill Help page, fix Bitmap page Change-Id: I34fd1b55a9f63d7b1764a0fec926a67194fd6d21 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96911 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-06-23sw: fix missing OLE preview on updating linksMiklos Vajna3-3/+34
Regression from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3 (disable generation of ole previews in ODF format until after load, 2016-09-13), if the document has charts without previews, it's loaded, fields are updated and saved, we no longer generate those previews. Given that Tools -> Update -> Update all is always an explicit user action, restore the permission to update OLE previews / links before performing the actual update. With this, comphelper::EmbeddedObjectContainer::StoreAsChildren() will generate those missing previews inside the getUserAllowsLinkUpdate() conditional block. Change-Id: Ib54e06a2e2f2e1c65951fdec302e59e63c71d008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96928 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-06-23FixedBitmap can be in a toolkit only headerCaolán McNamara24-60/+89
Change-Id: I22bb548f7f0c1ef0de157f99915fbaf6473c284b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96861 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23weld emoji dropdownCaolán McNamara10-321/+238
sharing a single widget between multiple notebook pages isn't going to work with native notebooks, so replace with a row of toggle buttons Change-Id: Ic24632f6d94d9238423f8b5e61d5e945c98e4a3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96891 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23weld DataNavigatorCaolán McNamara9-966/+905
Change-Id: I78241701de0756f5fe9bc9b793dadccd4ae119d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96750 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23Accept iOS SDK 14.0Tor Lillqvist1-2/+2
Change-Id: If2d049c59ba4c10aa3c9d42496880b7d6e3fc591 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96918 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-23jsdialog: use Idle timer to send updatesSzymon Kłos2-14/+46
Change-Id: Ib4f18bab1279c622b576dca53169b40c4a2526bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94482 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96847 Tested-by: Jenkins
2020-06-23tdf#119081 sw: fix RTF paste into outer table cellMiklos Vajna5-2/+170
Regression from commit ed654c4aa7f9f10fcb16127349009bc0c38b12e8 (Revert "fdo#43869 use the old rtf importer for paste", 2012-11-30), the direct problem is that SwXText::insertTextPortion() is now used by writerfilter, so in case it's not as good as the internal API used by the old RTF filter, we have a problem. This function calls SwXCell::CreateCursor(), which calls SwXCell::createTextCursor(), which uses Move() to go to the first content node in the cell, but that means we end up at the inner cell's XText for an outer cell. So later when we want to go to the end of the outer cell, we can't, as that would be a different XText and we throw an exception. Fix the problem by instead using createTextCursorByRange(), which immediately positions the cursor at the insert position, so the XText will be correct. FWIW, the ODF import at SwXMLImport::setTextInsertMode() also uses createTextCursorByRange() to handle this situation. Change-Id: I1db13b860bc60771d98c2b4099be73f4bf41c375 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96901 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 09:33:45 +0000