summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2013-01-13fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:Michael Stahl1-6/+8
The function does not handle the case where a paragraph was hit but no background frame was hit properly, which may or may not (depending on the platform) cause it to return a position of a frame when that is undesirable, such as when called from SwWrtShell::UnSelectFrm(). When UnselectFrm() leaves a frame selected pasting multiple pictures leads to a crash. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077 (cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee) Reviewed-on: https://gerrit.libreoffice.org/1314 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-01-13fdo#57780: sw: lcl_ArrangeLowers: register drawing ...Michael Stahl1-2/+2
... objects at the right page. This was effectively disabled for all anchor types except FLY_AT_PARA by a misplaced ! in the conditional, and C++ not being a type safe language. Change-Id: I64af2141e577ac896292eecd9f8c46c62a0548db (cherry picked from commit c479ccc438edeb7197a2d05bdb99067365d7bac0) Reviewed-on: https://gerrit.libreoffice.org/1290 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-01-13fdo#55289: fix crash in SwXShape::setPropertyValue:Michael Stahl2-1/+49
In the libreoffice-3-6 branch the docx import crashes here when setting the anchor position of a shape, because the previous setting of the AnchorType was not done properly: the position of the anchor in the SwFmt did not match the actual position of the text attribute, so we get these assertions: "Missing FlyInCnt-Hint." and crash. This cannot be reproduced with the docx import on master, because on master a different intermediate AnchorType is set, and transitioning from that happens not to cause the crash. But it can be reproduced with a unit test. The regression was introduced in libreoffice-3-6 with backport commit bbbb10a0774b9da546557632cd09c4f6958f8939. Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c (cherry picked from commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a) Reviewed-on: https://gerrit.libreoffice.org/1264 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-01-13handle properly anchor transition at page->at paragraph->as characterLuboš Luňák1-10/+21
Otherwise setting text range afterwards crashes with pHnt being NULL. Change-Id: Ib4ac2712c061605dcaaa262280c0307f7a9af2ce (cherry picked from commit 5de61f7a4ddb502730454e4bf3232f7f4b4175e1) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-13fix incorrect OSL_ENSURE -> SAL_WARN_IF conversion (condition not inverted)Luboš Luňák1-9/+9
Change-Id: I57dfa64c55e046ed51797b2abeb7ba3242e637da (cherry picked from commit dfc4832049c140b7442c085062599aef1953e8fd) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-13Resolves: fdo#56549 crash in format->autocorrect->apply and edit changesCaolán McNamara2-5/+5
regression from cad9afa15f53d547733fa55f1353772f6d696611 Change-Id: I1aa36bf86969a5a90456817d360d59125948e519 (cherry picked from commit 32c26ffb1f7585318a11f684a9886b58cea5b307) Reviewed-on: https://gerrit.libreoffice.org/1218 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-13fix bug 53508Maxime de Roucy1-1/+9
In the format paintbrush function : Apply the paragraph automatic attributes to all the nodes in the selection instead of just the last node. Change-Id: I655f00cbf44d3d80c19a7ef623bc1c7cb505ead9 Reviewed-on: https://gerrit.libreoffice.org/1180 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-01-13fdo#52182: Fixed click in frames located in header/footerCédric Bosdonnat12-41/+77
Using a distance to click to select the best object to select between normal text and background object. (cherry picked from commit e8fbe97900f13305b17015d9044993bde4adab36) Conflicts: sw/source/ui/docvw/edtwin.cxx sw/source/ui/inc/edtwin.hxx Change-Id: Ib5b53161c7af2c16f4df379382f2e53fc6d8092b Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-13.dot files sometimes rejected by writer, bnc#793422Caolán McNamara1-0/+6
because CWW8 appears twice, once for normal .doc and once for .dot. So a .dot files is tested twice if it's supported by the WW8 filter. Depending on the (effectively arbitrary) order they appear in the list .dots may fail the "is a normal non template .doc" test after the "is a template .dot" test and get rejected as a CWW8 candidate. Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461 Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
2013-01-13optional ppFlt argument never usedCaolán McNamara3-8/+3
Change-Id: Ib2c68091f14d04818ae5e7db0ad7b8a1ec151f4f Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
2013-01-13Simplify SwIoSystem::IsFileFilterCaolán McNamara1-2/+1
bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); is already inside an if bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); condition bRet = xStg.Is() && IsValidStgFilter( *xStg, *pFltr ); is already inside an if ( xStg.Is() ) condition Change-Id: I2115041d99b6fcbae7a829557c37627d03b5ee24 Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
2012-11-20fdo#51550 fix DOCX export dataloss on non-math/chart OLE exportMiklos Vajna2-21/+33
This is still not complete, but having the replacement graphic only is far better than having nothing. (cherry picked from commit bd6ae389008e110be62a335dfcd82c655d512e63) Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx Change-Id: I141a3de1a449f4261c7086e10f2c141b3f6cdb10 Reviewed-on: https://gerrit.libreoffice.org/1017 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-11-16n#780277: select field when clicking it instead of having cursor before itCédric Bosdonnat1-2/+22
Change-Id: I93d623b62e9357a71bfca3403cc98092ef58c7e4
2012-11-15n#789482 DOCX: export track change data after w:hyperlinkMiklos Vajna2-6/+9
(cherry picked from commit eac3e6e746300df379226941ba75c4e0ce1feb7a) Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx Change-Id: If204523d7da544b11b2d809993ada180476104ef
2012-11-07Fix fdo#56603 by NULL pointer checking in SwDrawTextShell::ExecuteArnaud Versini1-2/+5
Pushed in master as c954e6e1317f82e06fac66556674bc066b429469 Change-Id: I98f246b2bafcf2669a8f6c3ec4c86ccee56519bf Reviewed-on: https://gerrit.libreoffice.org/984 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/985 Tested-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2012-11-05Resolves: fdo#35991 rowspan is of size sal_Int32, not size longCaolán McNamara1-1/+1
Change-Id: I347672a2175cf7a0304cf5d6c0f8f3f6afa92cd4 (cherry picked from commit 8bd3bf0ff20fc18a0a6358e36b3f8a7e3b34a2bb) Reviewed-on: https://gerrit.libreoffice.org/919 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2012-11-05Resolves: fdo#50285 merging props unsafe with intermediate charstyle propCaolán McNamara1-2/+4
Its a nice idea to merge properties of the same type and value if one starts and the same place the last one ended. But character styles are properties as well, so if we have character-style+superscript on range a, and character-style+superscript on range b and merge these so that we end up as... character-style on range a, superscript on range a+b, and character-style on range b then that clearly gives the wrong result if applied in that order. So its only safe to merge if there are no intermediate properties that can affect the merge candidates. A regression from b3cee382f449aa69213dc21f7b1ba6a5356d2865 Change-Id: I541563d11265426736b840de068922eef8d45573 (cherry picked from commit 08ffb7bc5ec4472126762f4cb9677349b61122f6) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-11-05fdo#55939 fix RTF export of footnotesMiklos Vajna1-1/+4
Regression from d4069372484f18b242a42a1996767f57b031fff6. Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx Change-Id: I58e8d48ac3222b795f7edfd0e74ecd86ea36f380 Reviewed-on: https://gerrit.libreoffice.org/913 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-11-05Resolves: fdo#48569 crash on export to .docx of inline anchored frameCaolán McNamara2-7/+11
we're currently deferring to the end of the text node to export the contents of frames. If its anchored as character then the sw::Frame (which is allocated on stack) has gone out of scope so this pointer points to junk. Copy it instead. Sill need to export frames property at some stage. Change-Id: Ib9f8c6857ce1afe6acba84986b692139e44a7aad (cherry picked from commit 60a93729c95d31edab50a905236faa9e38a81556) Signed-off-by: Eike Rathke <erack@redhat.com>
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek16-165/+94
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
2012-10-30n#780645 docx export: export default table cell margins, based on 1st cellPierre-Eric Pelloux-Prayer2-34/+115
Reviewed-on: https://gerrit.libreoffice.org/716 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 9751056ba806ba9614392f3c70ada3cbd1251814) Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e
2012-10-29rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash:Michael Stahl1-27/+24
The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. (cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4) Conflicts: sw/source/core/docnode/ndtbl.cxx Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Reviewed-on: https://gerrit.libreoffice.org/764 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-22Fix fdo#47669: also check if we started the tag before ending itKorrawit Pruegsanusak1-1/+5
The problem is we created imbalance end tag </w:hyperlink> which shouldn't be there. So, place a check before inserting end tag should help. Inspired by (read: copied from) c1c2688912e769dfd7654e11e87dae380a8ce1eb ;) (cherry picked from commit 3b042335208cb2c995f4860bf8ba3bd1e2f2e859) Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-10add editeng::ConvertBorderWidthFromWord:Michael Stahl1-73/+3
Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813 (cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270) Reviewed-on: https://gerrit.libreoffice.org/846 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-10fdo#54648: WW8 export: test that FlyFrm actually has layout frmMichael Stahl1-0/+4
The bugdoc has 2 "hidden" drawing objects that are invisible. Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2 (cherry picked from commit c1d2eed375293d7c27bb885f344cc24ec0cd40ca) Reviewed-on: https://gerrit.libreoffice.org/845 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-07rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash:Michael Stahl1-27/+24
The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. (cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4) Conflicts: sw/source/core/docnode/ndtbl.cxx Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Reviewed-on: https://gerrit.libreoffice.org/764 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-02sw: implement page-relative size for drawing objects and import them from docxCédric Bosdonnat7-5/+46
Conflicts: oox/inc/oox/vml/vmlshape.hxx oox/source/vml/vmlshapecontext.cxx svx/inc/svx/svdobj.hxx Change-Id: I98b5c53d4860278e3646324ca045114e37b4cf61
2012-10-02n#779627: table empty cell para collapse fix with fly framesCédric Bosdonnat1-2/+2
Make sure that the collapsed empty cell paragraph is more important in FormatEmpty than anything else (fly frames are the onle case. Change-Id: Id88e3370e988b45eabe4b9b30628e5472e9db1fe
2012-10-02n#779627: fixed the collapse empty cell paragraphs compat optionCédric Bosdonnat2-11/+10
This option didn't work if the paragraph to collapse had an alignment or spacing defined. This fix was needed to properly import docx/doc files Change-Id: I6b3522905714fe3def7d87cd82cca84746310793
2012-10-02n#777699: Clip the objects to the pagewe are paintingCédric Bosdonnat2-4/+4
Change-Id: I78ac7de5346a2adea9a2c6cf3cbb0321e05d79dc
2012-10-02n#775270: clip pictures instead of scaling they don't fitCédric Bosdonnat10-2/+55
Word clips pictures that are bigger than a page instead of scaling them down. This patch introduces a new compatibility option to allow clipping a picture in Writer instead of scaling it down. Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/docnew.cxx sw/source/filter/xml/xmlimp.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I4defbee05be81e23ec28a2ed272eaf4e4cc6faf5
2012-10-02n#772094: pictures was eaten by document default LR settingsCédric Bosdonnat1-0/+4
Why should we take care of LR Space for SwNoTxtNode... those are images-like contents that don't contain text. Change-Id: I58f6d77efc01febf422073032802f57c5158a034
2012-10-02Output typeid().name( ) in layout dump for easier debuggingCédric Bosdonnat1-0/+2
Change-Id: I12c0583b73200fa9fa4d4d56be464b1467149630
2012-10-02fix test after the recent w:position fix (i.e. bnc#773061)Luboš Luňák1-1/+1
The value 58 was hardcoded in w:position handling before and so was reused for the test, but now use the value that is (hopefully) correct. (cherry picked from commit fc41a73a67a2bd30006a49d061d870533d49c0e8) Change-Id: I1191fce9859d688a60f1b3fbdb0e704b130c1670
2012-10-02Resolves: fdo#54862 extra ++n causing merged cells to be skippedCaolán McNamara1-1/+0
commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f but didn't revert the ++n of that commit, leading to merge groups getting skipped Change-Id: Ie2b46ebc433df636ebe0092f4a992631b7f06a3f (cherry picked from commit b966a09c2da9441961c93c44be556399575db849) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-10-02fdo#53673 fix for layout problems with version 3.6 and upWinfried Donkers1-54/+23
Change-Id: I626ec5bce931005dccbc8f4d235e8208ae98f9a5
2012-10-01fdo#31405 CommandType is a LONG, so use a sal_Int32 to retrieve itLionel Elie Mamane1-3/+3
Else, operator>>= flat out refuses to extract it, even though the particular value in this particular call would fit. Also OSL_VERIFY the result of >>= (instead of ignoring it) to facilitate future detection of similar problem Change-Id: I859c38c3589dc9e9ef5bdd882663aa3386a43237 (cherry picked from commit 3f84462b47f070b4921fdd5fdab8397ab1439fd6) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-09-28n#778148 sw: fix mouse pointer over urls with background imageMiklos Vajna1-1/+3
Change-Id: Idbc93dfc95dfefc4c962ef36e0557a717550b7d7 (cherry picked from commit 1fe4aa6ed810d1be7b81875977da1da33e9fe4bf)
2012-09-28n#778133 sw: add BackgroundParaOverDrawings compat flagMiklos Vajna8-9/+45
In Word, the layer that contains a background image is behind the layer that contains the paragraph background. In Writer, the paragraph background is painted before the hell layer. Add a compat flag to change the order, so the DOCX importer can trigger that. To reproduce, create an XShape, send it to the background, set some color for a paragraph background, and notice that the background color is missing where the shape is behind the text. (cherry picked from commit 741132e8a60891684d40726a3d34ef784268a21e) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/docnew.cxx sw/source/filter/xml/xmlimp.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I94aa58fcfe47e4a2fd27d411d7e04ccce92824fa
2012-09-28n#778148 SwEditWin::MouseButtonDown: prefer url over hell frames on ctrl-clickMiklos Vajna1-3/+15
To reproduce, create a large XShape, put it to the background, set wrap style to 'through', then add some text, including a hyperlink. Click should select text, ctrl-click should select the hyperlink, or in case the text is normal, the shape. Change-Id: I6cd62af30b58555f8b58c7db4648444fceba83dc (cherry picked from commit 3925a10d4784cf5966c5ee182dd64296b1cfba21)
2012-09-28n#777337 SwEditWin::UpdatePointer: fix mouse pointer wrt. background imagesMiklos Vajna3-1/+23
When the image is in the background, just show the normal text cursor, since we're able to select text as well in that situation. Change-Id: I4b4303834245e402d40567cff4a2bf53a0a13e5e (cherry picked from commit 1223dd3bc84899d8f77c46340c46565ca74cbe1b)
2012-09-28n#775899 sw: add FloattableNomargins compat flagMiklos Vajna6-3/+61
The DOCX filter imports floating tables as frames containing a table. Word ignores the margins of paragraphs next to such a table, Writer does not. Add a compatibility flag the import filter can set that triggers this weird behaviour. (cherry picked from commit 50a1df360c907d8419ce49f098b6bc87a37a9956) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: Iaaa1d2a2e2f9d0eaea17832b2e418f9a845efffd
2012-09-28n#775899 SwXText::convertToTextFrame fix for multi-paragraph tablesMiklos Vajna1-1/+3
The problem was that when we only had a table inside the frame, the DelFullPara() call removed the last paragraph of the first cell, and returned no error. Instead, check if we had to remove paragraphs both before and after, and if so, use the manual remove all the time. Change-Id: I9a3591ce9a92a2aca7d2f65b62fdf641f54e4f05 (cherry picked from commit fd99896fcd4826e5326fe01dd28f168cf1844fd4)
2012-09-28n#775899 SwXText::convertToTextFrame fix removing fake paragraphMiklos Vajna1-1/+8
In case the textrange contains a single table, the DelFullPara() call to remove the ending fake paragraph failed. When this happens, we now find the paragraph in question manually to delete it. Change-Id: I7055d4489192a8a694aef118f7646d8db87a64df (cherry picked from commit 12ce1c3a06e07f16fefe11fce9ae35c94ef657e7)
2012-09-28n#774681 SwFltControlStack::NewAttr don't extend font name / size attributesMiklos Vajna1-1/+1
Regression from commit b3cee382, the bugdoc is an example of why those can't be optimized with the current method. (Yes, it is somewhat special, after a resave in Word, the bug is no longer there.) Change-Id: I4b5e82b13242726d6df47c447642ca8916aa6f31 (cherry picked from commit 9eb05aa6883ea41fb1d1dad2f7f1870e8e63ce32)
2012-09-26rhbz#827695: sw: prevent crashes after incomplete print:Michael Stahl4-11/+27
If the last page is not printed for whatever reason, then SwXTextDocument's destructor will delete a SwViewOptionAdjust_Impl, which accesses the document's ViewShell, which has already been deleted at that point. Add a horrible kludge to not crash for now. Change-Id: I67fe37970d60782030b84f2badddd1e66ef3f9c6 (cherry picked from commit d53e12c7a9c2d0a3b487303673c1fafd09f6593c) Reviewed-on: https://gerrit.libreoffice.org/699 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2012-09-21fdo#42450: fix crash in SwXTextSection::attach:Michael Stahl1-0/+8
Inserting the section can fail if the given text range is not valid. Change-Id: Ib6ba3b02dd581dce08b646b841354073caf894b2 (cherry picked from commit 5bc6c7b2e170a35914d7cd07347c77a9c9d23664 and commit 2940a697dce2292e9c5b118feb8ec4159e3606fa) Reviewed-on: https://gerrit.libreoffice.org/602 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 525127d5b605bf34a8ff0b71f4b169fa7b72c435) Reviewed-on: https://gerrit.libreoffice.org/607 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-20rhbz#689053: fix crash following delete at last table cell:Michael Stahl1-7/+8
The IsSelOvr() in SwCrsrShell::Combine() detects that the PaM with mark in the last table cell and point ouside the table is invalid, but unfortunatley restores the wrong position, which does not actually correct the PaM; the deletion on the invalid PaM then removes the last SwTxtNode in the document, which leads to crash later. (cherry picked from commit af4b6c94c68b5f67b931cde8d0acda6ec8b288bb) Conflicts: sw/source/core/crsr/crsrsh.cxx Change-Id: Ib2ae0b54e6c15dbe5b6811d8696531bf2022e1a4 Reviewed-on: https://gerrit.libreoffice.org/652 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-09-19warning C4702: unreachable codeStephan Bergmann1-4/+1
Change-Id: Ia3e119e1b9ac68fbdd9aa4a9a5177e28c1a0d605 (cherry picked from commit b265709fbf9ff9f03645cbcbbc441699402c73a8)
2012-09-19rhbz#852128: sw: avoid table undo crash:Michael Stahl3-3/+17
SwUndoTblNdsChg::UndoImpl: to prevent access of deleted table box start node, disconnect the SwTableBox from the start node before removing the table box nodes. This problem was probably introduced with CWS swnewtable db4de0817df6906db2743239d45f9f0834ab1e91, which changed the order of the removal operations for unknown reasons. (cherry picked from commit cf842d7c7f9559bfdbb3924cd05a3a50d1dff5e3) Conflicts: sw/source/core/table/swtable.cxx Change-Id: Ic59823a84082cc6ff453b2b512cbb8253886ecf3 Reviewed-on: https://gerrit.libreoffice.org/640 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 16:18:09 +0000