summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2015-03-26fix bugdoc that wasn't cherry-picked properlyChristian Lohmaier1-0/+0
copy from 9ac4e1b0b5b3c2eab2405f6403ea9cf84252b41a, as git fails to cherry-pick/merge itself. Change-Id: Ie6b85546f327b92d7ea36b88eed6e5b7b068fa23 (cherry picked from commit 4ffd96036440545a24312f170cd1c5ce79154640)
2015-03-20tdf#89482 fix __refheading__ regression, set only CrossRefs as TOC.Justin Luth2-2/+11
bugfix tdf#68963 marked all __refheading__ bookmarks at TOC, but those crossreferences were deleted if they are not recorded in aReferencedTOCBookmarks. Redesigned the fix to include _Toc in the crossreference name that is auto-generated, which is how MSWord differentiates the markers.y Change-Id: Ie11b90b1b933d275e4d59ee89f22ff527eb6c2ba Reviewed-on: https://gerrit.libreoffice.org/14870 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-03-10tdf#84102: Expose duplicated "level" accessible attribute.Jacobo Aragunde Pérez1-0/+2
There is no standard for this so some ATs will expect "level" and others "heading-level"; we will expose both. Change-Id: Ia935f7efdea11dc9be66fd9a54e1df0432c74662 (cherry picked from commit e697d9694a62b2943fa19b0fcd19e9b3354f6ad7) Reviewed-on: https://gerrit.libreoffice.org/14808 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-03-10tdf#89520 Make TOX creation more robustTobias Lippert2-0/+21
The code is now more robust and will accept illegal arguments. Change-Id: I43ae82b953cea845fb170aa7b6e8d42470ad4e5e Reviewed-on: https://gerrit.libreoffice.org/14580 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4bdbea5447f36beb9cc33df173a89a49a9918290) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-03-04tdf#89266 SwDrawShell::GetState: fix crash on adding textbox to fontworkMiklos Vajna1-1/+9
Till we find a use case where it makes sense to support this, just hide the menu item to avoid the crash. (cherry picked from commit 5bfff14d8f2240ff37b91b78c337438214dfa1bc) Change-Id: Ic1df38edc38495d7899038ec2b8ad753da87d352 Reviewed-on: https://gerrit.libreoffice.org/14726 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04gbuild: CppunitTest: always use unittest configurationMichael Stahl17-34/+0
The sc_subsequent_filters_test was failing because of a lock file because it did not use the unittest configuration. Refactor gb_CppunitTest_use_configuration so it uses both the instdir and unittest configuration to prevent such errors. In case there ever is a test that does not work with the unittest configuration it should call gb_CppunitTest_use_instdir_configuration. (cherry picked from commit f0a60415597bae7ca54767b397a217882578ce97) Conflicts: dbaccess/CppunitTest_dbaccess_RowSetClones.mk sc/CppunitTest_sc_condformats.mk sc/CppunitTest_sc_recordchanges.mk Change-Id: Ibc00d42f8b6102d50d922f51173120798fa45c6e Reviewed-on: https://gerrit.libreoffice.org/14738 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-04sw: PVS V656 Variables initialized through call to same functionMichael Stahl1-2/+4
(regression from c2ccd20c0fd92bddfff76447754541705e3eb8f3) Change-Id: I78ac92869b0e9b56df708aa7d2d35b45bfb5f751 (cherry picked from commit 7d79ae437e16191a62dbe3ec81f9b82e79daf7ea) Reviewed-on: https://gerrit.libreoffice.org/14737 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-03cp#1000115 SwTxtFrm: don't join follow just because it has no contentMiklos Vajna5-34/+241
The problem was that the bugdoc had a table, and inside the table there was a long paragraph that flows to the next page, but only the paragraph mark of it does so. We first split the frame to have space for the paragraph mark, but later decided that all the content would fit the first frame, and this way the last hard line break and the paragraph mark was painted on each other. This is normally not a problem without tables, because SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to join it, and we're ready. However, when the paragraph is inside a table, then the paragraph was formatted multiple times, and next time when we already had a follow nNew was not set, so even if there was a correct split first, the new frame was joined later. Fix the problem by explicitly setting nNew for the "in a table and paragraph ends with a hard line break" case, that way we don't blindly join the frame, only in case there is enough space for the follow in the master. (cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a Reviewed-on: https://gerrit.libreoffice.org/14476 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-26tdf#38837 Reduce power consumption by minimizing idle timersAshod Nakashian1-1/+3
Based on profiling, Writer's most CPU consuming idle event was document statistics calculation. This patch stops the idle timer once statistics has been updated. Subsequent profiling shows a sharp decline in CPU usage. Modifications to the document should initiate statistics update. Change-Id: I8c38ad8847987264549945e4f482ea18d2635283 Reviewed-on: https://gerrit.libreoffice.org/14575 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c57213764b387dddad946e78145cea607ca9f460) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-02-25Fix dangling pointerStephan Bergmann1-2/+3
Change-Id: I352702ac50708a8f8c40e2752821178223052b7c (cherry picked from commit 1c4e95db104cd5f732bc41a539a7dc5fd9269ef6) Reviewed-on: https://gerrit.libreoffice.org/14632 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-22tdf#88811 SwXText::convertToTextFrame: handle shapes anchored to usMiklos Vajna3-3/+44
(cherry picked from commit 38f2b8b3b16aab19a2564ec699d253d3dccecc3c) Change-Id: Iedf8eacd37b8ed8e307a10e8ade32f53c7417c4a Reviewed-on: https://gerrit.libreoffice.org/14571 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2015-02-19tdf#82661 SwFrm::PaintBackground: handle fill attrs when comparing backgroundMiklos Vajna1-2/+11
Regression from 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: i#124638 Second step of DrawingLayer FillAttributes..., 2014-06-02), should be good enough till SdrAllFillAttributesHelper gets its own operator ==(). Change-Id: I03f847bc1589e3771790427d9894cc330a7b8dc6 (cherry picked from commit 1e33cd8355eb1d856a1439b4a095e379b3acf0bd) Reviewed-on: https://gerrit.libreoffice.org/14537 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-18asan: failure to load tdf#55620 attachment under asanCaolán McNamara1-0/+1
still loops in layout though how am I *still* finding bugs in this thing Change-Id: I048595956516b9acfc60e90c64180b904d6cc1d7 (cherry picked from commit d6b28f0bfe5df0248b18e306c3144282f052c7f0) Reviewed-on: https://gerrit.libreoffice.org/14524 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-17tdf#89105: sw: Remove unnecessary downcastMatteo Casalin1-2/+2
This fixes an infinite loop in SwPaM::DoSearch() that can happen with 32-bit paragraphs now. (cherry picked from commit dd9972f5f37063f5fe3eb5e011d2adc73f44d305) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I7511862ddf6ed672ba4f09ef6729fb1fa7c1d355
2015-02-14related tdf#89004 improve performance of document data collectionUrsache Vladimir1-41/+16
Change-Id: Ieca50aa0920753cd952123e27d5355d32e82c918
2015-02-13Resolves: tdf#89227 if no SwView then disable accept/reject change buttonsCaolán McNamara1-4/+14
e.g. if the context is an embedded draw ole then we don't have a SwView Change-Id: I6ba07f0ecf1c419e45f7e0ac628a82e6bd486668 (cherry picked from commit 25dd3d277e9b90a59e7b2a03202ef0cba7799b68) Reviewed-on: https://gerrit.libreoffice.org/14454 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-13Resolves: tdf#79569 crash undoing tricky cell mergeCaolán McNamara1-12/+13
Change-Id: I68d774d0d3758cdb67864d7939a7e1167dd9a7df (cherry picked from commit 21796a5fb92fd9773017b782a654a8b5a190cc66) Reviewed-on: https://gerrit.libreoffice.org/14467 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-13Resolves: tdf#76636 crash on merging certain cells imported from a .docCaolán McNamara1-1/+1
Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11 (cherry picked from commit e1f4022b9ea7ae99a31773c445d8229ba3bdea93) Reviewed-on: https://gerrit.libreoffice.org/14463 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-02-11Resolves: tdf#87083 images in help html stuck at default placeholder sizeCaolán McNamara2-16/+41
regression from the SwapIn work. The graphic size during SetGrfFlySize appears to assume its the pre-swapped in size, i.e. the old 0 by 0 "size is not set" for an html image used to be the value used here. So get that value (and update it if necessary) before updating the image data and pass that to SetGrfFlySize Without the swap-in in the html filter the data gets swapped in during the initial draw of the image which is too late to update the image size, so restore the equivalent of that swap-in via GetTwipSize commit 61a5abd5fab308c9e6580e752fa846f5bf0d7e51 Author: Zolnai Tamás <tamas.zolnai@collabora.com> Date: Fri Nov 7 10:43:34 2014 +0100 Make SwGrfNode swapping methods private Change the filter test accordingly. Change-Id: Ide3043f2f245c097a7b4c07ba2e0713510296b3e Change-Id: I0afe244f79d8628236b1e552036587a2b4540a76 (cherry picked from commit 233da237ad4b593c945903c3b32185a540025516) Reviewed-on: https://gerrit.libreoffice.org/14403 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-11Resolves: tdf#83073 use loaded graphic's width/height as defaultsCaolán McNamara1-25/+38
(cherry picked from commit 4327ee505f8507f653c8f4db9ac7503db2e15c3a) Conflicts: sw/source/filter/html/htmlgrin.cxx Change-Id: Idad25f82d884c40c55b886fd7634a6c6e51693c4 Reviewed-on: https://gerrit.libreoffice.org/14394 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-11Related: tdf#88583 RTF export: need to take care of fill attributes when ...Miklos Vajna3-0/+16
.. building the color table (cherry picked from commit 87a5cf7db1f070cbc4a674a1c12c805a2c950856) Change-Id: I8a74640e0d51d76b910394be5210c18d89818edd Reviewed-on: https://gerrit.libreoffice.org/14392 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-11Resolves: tdf#89179 fix Undo of Numbering Level change crashCaolán McNamara1-2/+2
regression from long paras presumably Change-Id: Ib89169e52e42fcbe6f8e1ab0a2eb9871d38ff06d (cherry picked from commit 29d2666d92e1105473f339609ba59e54a286b71c) Reviewed-on: https://gerrit.libreoffice.org/14420 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09Resolves: tdf#88933 Labeling of images impossible without categoryCaolán McNamara2-4/+11
(cherry picked from commit 1fac71668ac8a32633a7ee31698c0f4fe78e4d31) Change-Id: I8b618d5cd6b3e9d5e42e04e215592a7b748dbb9f Reviewed-on: https://gerrit.libreoffice.org/14383 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09Related: tdf#88583 writerfilter: import paragraph color as fill attributesMiklos Vajna2-6/+10
In theory this is to be in sync with the ODF import. In practice the old UNO property seems not to have a proper fallback to populate the doc model with the fillattributes, so without this even if the import result is visible, it would be lost on ODF export. Additionally, this detected a bug in SwUnoCursorHelper::makeRedline(), where paragraph format redline tried to use the map of a text portion instead of a paragraph. (cherry picked from commit 24077b2d52ab3d0fd0db5afb25d8b94b62386e3e) Change-Id: I026e38e1990ed2a460624a8d967a16ae3fb6c512 Reviewed-on: https://gerrit.libreoffice.org/14353 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-09Resolves: tdf#85004 Crash when clicking the Reminder icon...Caolán McNamara2-6/+13
on the Navigation toolbar the Parent window isn't a SwScrollNaviPopup anymore (cherry picked from commit 535f34bba60e06d390a6f3802072b16a9841bc4e) Conflicts: sw/source/uibase/ribbar/workctrl.cxx Change-Id: I5c539d125aac28bfee0beb842ff2df001e19c945 Reviewed-on: https://gerrit.libreoffice.org/14326 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-02-07tdf#76291 adapt unit test to libreoffice-4-4Andras Timar1-2/+3
Change-Id: I12c74380b65e463be352825c7f1459393883283b
2015-02-07tdf#76291 unit test for html export href encodingVasily Melenchuk2-0/+9
Change-Id: I273af8b570adfcb7bfb784495bc31d2f4f1ee00b Reviewed-on: https://gerrit.libreoffice.org/14333 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 675e1fe198298702ced8eab02a7df5164d66a8f0) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2015-02-07tdf#76291 write encoded URL as href in html outputVasily Melenchuk1-1/+3
INetURLObject class is used to create correctly encoded URL Change-Id: Icc9e71e848fd8a0b487f74232b9ad3e7ddde50b4 Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0706b5756e06b7773a78e3046a47efc2c81d92b1) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2015-02-06During DocumentRedlineManager::SetRedlineMode the array becomes unsortedCaolán McNamara5-56/+55
so GetPos cannot be used safely, so pass down the known index of the redline and propogate it everywhere the redline goes This reverts commit 36e158ce7a0effb130936ba4598a193102faa6a1 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Jan 19 12:09:17 2015 +0000 if we change the keys we have to resort based on the new keys which tried to keep the table sorted, but thats no use because DocumentRedlineManager::SetRedlineMode loops over by index so sorting the table during the process busts that. Taking a copy of the entries and looping over that shows another gadzillion problems. So try this approach instead. I imagine it should be possible to calculate the correct current index of pRedl in DocumentRedlineManager::AppendRedline but for now assume that we are sorted correctly at that point and can use GetPos Change-Id: If092dce185e3b36fd256db390132358cba155847 (cherry picked from commit a5a20187c3a5e5956492f932c49501f9547e4915) Reviewed-on: https://gerrit.libreoffice.org/14260 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-06Resolves: tdf#82942 updating field contents with incorrect attribute positionsCaolán McNamara1-6/+20
Updating a SwTxtInputFld requires expanding the contents of the node. Expanding the contents of the node requires all the positions of fields in the node to be correct in order to expand them to the right place. So on updating a SwTxtNode wait until all the attributes positions are adjusted to be correct before expanding the SwTxtInputFlds in that node Change-Id: I76500239a103e56be412707a708a303a58236070 (cherry picked from commit 95f4b2f4a6dfe47842336116d94edd175a6da960) Reviewed-on: https://gerrit.libreoffice.org/14253 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06tdf#88854 crash on opening drop capsCaolán McNamara1-1/+3
Change-Id: I3ab56e4909d2a20dc8f0bafe0273e81065296f17 (cherry picked from commit 727c3e088698dfd21cf4beaa5455d4c4d5b495fb) Reviewed-on: https://gerrit.libreoffice.org/14320 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-06Resolves: tdf#68137 crash in traversing script fieldsCaolán McNamara1-0/+5
use the same guards as the SwFldEditDlg does (cherry picked from commit 38a65f76bc944ea730ebac7640dc135248ec3da0) Conflicts: sw/source/ui/fldui/javaedit.cxx Change-Id: I7d135cf969d9925cec57a90ef0fba8fe40f664eb Reviewed-on: https://gerrit.libreoffice.org/14323 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-05sw: fix ASAN detected error in RtfSdrExport::Commit()Michael Stahl1-1/+2
EscherPropertyContainer may allocate a 1-byte buffer if there are no vertices / segments. (happens in sw_filters_test) in EscherPropertyContainer::CreateCustomShapeProperties(MSO_SPT, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) filter/source/msfilter/escherex.cxx:3853:25 Change-Id: I56dedbd57d38cd017183060e924cb1340ea58ebf (cherry picked from commit e73799f8a9310f04074bc0dd88d9092094338576) Reviewed-on: https://gerrit.libreoffice.org/14335 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-05tdf#88583 MSWordExportBase: fix handling of paragraph background colorMiklos Vajna3-0/+15
Regression from 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: i#124638 Second step of DrawingLayer FillAttributes..., 2014-06-02), the problem was that exporters still expect an SvxBrushItem for the para background color, while doc model was changed to have an XFillStyleItem / XFillColorItem pair instead. (cherry picked from commit 60cdeb2d441a6bf5c55f511f574b2b9dd598fbb8) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Ib94fda103ec35a6f087307aafdd890183d9d935f Reviewed-on: https://gerrit.libreoffice.org/14328 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-05Resolves: tdf#50640 make sure we don't move away from the current fieldCaolán McNamara2-25/+44
by accident by trying to select the entire field if its inside an invisible area where WrtShell::Right will skip automatically to the next visible area (cherry picked from commit d04540a55f533279d2b404223cc625fa251a6ea2) Change-Id: Iafe9ebd1430db8e6022fec89729d0abb62dad0bb Reviewed-on: https://gerrit.libreoffice.org/14229 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-02-03tdf#77241: sw: fix creation of field data source stringMichael Stahl1-1/+2
SwChangeDBDlg::UpdateFlds() depends on undefined behaviour in constructing sTemp, because the call to GetDBName initializes local variables that are already used in other sub-expressions of the statement. (regression from 8a7a9992906ba59d575ca9e4441b3e84fea5fae0) Change-Id: Ibf8c0091da672e133d7a35bc61c059eaf65a3bc2 Reviewed-on: https://gerrit.libreoffice.org/14304 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-02tdf#88899: sw: fix expanding of SwDocInfoField with DateTimeMichael Stahl1-1/+5
The lcl_TimeToDouble function produced very small numbers that round to zero. (regression from 9830fd36dbdb72c79703b0c61efc027fba793c5a) Change-Id: I091da9c2a913fae0c2bbf229942db3c1bd3598f4 Reviewed-on: https://gerrit.libreoffice.org/14282 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-02Related: tdf#82942 multiple crashes on changing text in SwInputFieldsCaolán McNamara1-23/+34
i.e. load doc keeping setting text of "LINE" + ok as each popup appears will crash eventually Change-Id: Ibc4bb8fe65bd5dd380c0fe833e5ece2b39de5dbe (cherry picked from commit 1ecf795ffaf8c63280ea92f776b53558b3227504) WaE: overriding destructor declaration not explicitly marked 'virtual' Change-Id: I4f155f8a28afa6a16b1859b254a339d8374a769b (cherry picked from commit e6a1f33e500c4fb5e38e7d6de7ddb55af8fa8650) coverity#1267699 Uninitialized pointer field Change-Id: I9d830e56bd06208664296f3310cd61b97588d160 (cherry picked from commit 51af2166d16ea5d47ee9b92ada2d95adff168bb2) Reviewed-on: https://gerrit.libreoffice.org/14261 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-30tdf#75996: sw: correct bookmark positions when deleting textMichael Stahl2-0/+47
The problem is that SwUndoDelete will move the fully selected nodes to the UndoNodes but it leaves bookmarks with their SwIndex pointing to the deleted nodes. The SwNodeIndex are corrected by SwNodes::_MoveNodes() so they point to a different node than the SwIndex. This only happens if only one position of the bookmark is inside the deletion range; if both are, the bookmark will be deleted by SwUndoSaveCntnt::DelCntntIndex(). Also joining the 2 start/end nodes of the selection will accidentally correct the bookmarks but only if it happens to delete the end node. (and apparently there is also a DeleteRange method that doesn't join) Change-Id: I91ec362bb833328f8d681fd9458cb915c4efb267 (cherry picked from commit 370febbf19a5f362394d1c9e69b12dcb218f6501) Reviewed-on: https://gerrit.libreoffice.org/14240 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-28fdo#86984: UI Line numbering works only for EN_USMuthu Subramanian1-3/+4
Change-Id: I0fadb6f5f96cccd4056a164a6b0f3b2fdd68a40b Reviewed-on: https://gerrit.libreoffice.org/14168 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit fb9e0063d64243ffd56174566b9eda723daf0cb3) Reviewed-on: https://gerrit.libreoffice.org/14224 Tested-by: Andras Timar <andras.timar@collabora.com>
2015-01-27Resolves: fdo#85666 when matching existing list indent use matching levelCaolán McNamara1-2/+10
Change-Id: I20bf0fa3a9b1562d46eba6321edca047cf02b128 (cherry picked from commit 30033deace805ce507c8532c51c42b9ede98db06) Reviewed-on: https://gerrit.libreoffice.org/13940 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-27Resolves: fdo#88378 flipping by reversing co-ord system no longer worksCaolán McNamara1-15/+15
not entirely sure when this stopped working, but our contempory code is riddled with asserts and throws for negative sizes so rework this to explicitly mirror the preview rather than try the no longer working technique Change-Id: Ie90283cad2797ab1c37848469b007dc01a2c9d75 (cherry picked from commit a8835936e9d3e19443c63b7b365174254741cf76) Reviewed-on: https://gerrit.libreoffice.org/14111 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-26coverity#1266508 Useless call (gold)Caolán McNamara1-2/+1
regression from commit 832e5aadbff006ec24959162c29756fe2b1982be Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Oct 8 10:06:59 2013 +0100 Related: fdo#38838 remove UniString::SearchAndReplaceAll (cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a) Conflicts: sw/source/filter/html/wrthtml.cxx Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c Reviewed-on: https://gerrit.libreoffice.org/14171 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-01-24fdo#72486 SwWrtShell::SelAll: if in table, then call extended select all ...Miklos Vajna3-9/+35
... only in case the whole table is already selected Change-Id: If7626954460e16945af6b21402a84e90c71ae138 (cherry picked from commit fa39e7970496537258eaad1f5351db2d675225b6) Reviewed-on: https://gerrit.libreoffice.org/14157 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-23valgrind invalid read after delete in rhbz499052-1.htmlCaolán McNamara3-3/+10
Change-Id: Iecada2f8b6d977cc3f76814e4b2f38895873c362 (cherry picked from commit ae5410086e6cbe30b8a650b10b4d2250e5e017ec) Reviewed-on: https://gerrit.libreoffice.org/14128 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-23fdo#68963 recognize __RefHeading__ bookmarks as TOCJustin Luth4-10/+24
LibreOffice recognizes MS Office TOC, but LO files saved as .doc format had no text showing. Now bookmarks using the LO naming convention are also imported as TOC bookmarks. testcase included Change-Id: I9b2855e9d00f4d103c3be22b1b1185c557865d87 Reviewed-on: https://gerrit.libreoffice.org/14099 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-22Resolves: fdo#87760 if we can't anchor at hidden text then...Caolán McNamara2-4/+13
anchor to the page instead ane don't crash on searching for a place to put the anchor 1 press return in an empty writer doc a few times 2 insert a stock 2x2 table 4 enter A1 and change format->character to hidden A1 3 draw a rectangle above A1 so it'll get anchored to paragraph above table 5 draw rectangle anchor into A1 (cherry picked from commit 15faeb4f9f111f7ea8d04fd64b3d065971cd4570) Change-Id: Ib7931fdd1c70e809ec442aeac125879980e20ec9 Reviewed-on: https://gerrit.libreoffice.org/14117 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-01-22Resolves: fdo#87601 specific html doc hangs on loadCaolán McNamara2-1/+101
Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349 (cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3) Reviewed-on: https://gerrit.libreoffice.org/14079 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-21sw: fix bogus assert in SwTxtNode::RstTxtAttr()Michael Stahl1-6/+13
The assert for case 3 is wrong and fires when importing ooo44732-2.doc but there is also a bug here where a hint could be skipped. Change-Id: I028d2d5df9e80cf0001d9bc11aa7fabcd01e83bb (cherry picked from commit 01d25c96db366de003e4570ddf8559da3dd9ea5b) Reviewed-on: https://gerrit.libreoffice.org/14072 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-21Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapesCaolán McNamara1-7/+11
where odt checks for a null pTxtCrsr and skips the object and fodt just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942) Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f (cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3) Reviewed-on: https://gerrit.libreoffice.org/14049 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
generated by cgit v1.2.1 (git 2.18.0) at 2023-03-26 15:24:02 +0000