summaryrefslogtreecommitdiff
path: root/sw/source/core
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 Stahl1-1/+6
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-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>
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek5-14/+30
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
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-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 Bosdonnat6-4/+45
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 Bosdonnat5-1/+29
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-09-28n#778133 sw: add BackgroundParaOverDrawings compat flagMiklos Vajna4-8/+21
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#777337 SwEditWin::UpdatePointer: fix mouse pointer wrt. background imagesMiklos Vajna1-0/+17
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 Vajna3-1/+43
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-26rhbz#827695: sw: prevent crashes after incomplete print:Michael Stahl1-0/+5
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 Stahl2-3/+16
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>
2012-09-13fdo#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>
2012-09-07fdo#54620 do not use vector iterator after insertDavid Tardon1-6/+7
Change-Id: I5e809f38a500ab818e9acef80b419dfece7a29fa (cherry picked from commit 06ae26b5676c29c4d1cc9c65f5bbaede9483a21d) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-09-06Headers/Footers: don't create temporary parts of document (perf problems)Cédric Bosdonnat1-0/+11
Clicking on an empty header/footer only displays the separator as creating empty header/footer could cause important layout recomputing on long documents. Change-Id: I800c5dd27744772833dee0da4269e7591bd0a10b Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Rainer Bielefeld <LibreOffice@bielefeldundbuss.de> Signed-off-by: Roman Eisele <bugs@eikota.de>
2012-08-28fdo#53399 Word count is inconsistent and wrong with non-breaking spaceMuhammad Haggag1-10/+3
This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, which covers all Unicode separators. It also updates and fixes one of the SwScanner unit tests. Bug details: SwScanner::NextWord skips whitespace before calling into ICU's BreakIterator. The function used to identify whitespace (lcl_IsSkippableWhitespace) doesn't cover the full category of Unicode separators (code [Zs], 18 in total. See: http://www.fileformat.info/info/unicode/category/Zs/index.htm). Since 0xA0 (no-break space) is not identified as whitespace and not skipped, we end up calling ICU starting at the position 0xA0, asking it to get us the boundary of the next word forward. ICU sees that it's called at the end of a word, and reverses the query direction to backward, and returns the word before. This causes NextWord to think we've hit the end of the string and call it a day, terminating word count for the rest of the line. Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5 Reviewed-on: https://gerrit.libreoffice.org/453 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com> (cherry picked from commit 3ba107606682b5e675127483a514f0e6580ecfd1) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-08-24Revert "initialize member": the commit to fix isn't in 3.6Cédric Bosdonnat1-1/+0
This reverts commit 7f18b80a3bd2b3c126ac852c7ecd5ceb376f389d. Change-Id: Ie577edba915ad78eaa82a66280a51ddd6ba9398e
2012-08-24initialize memberLuboš Luňák1-0/+1
Introduced by b95d203bc17c83ec0fe5139f519d53ed1d842d3a . Change-Id: I2497ee7cd55776fbd801d07470968e5aa47e971a Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat@free.fr>
2012-08-23fdo#51514: SwXBookmarks: only consider real bookmarks:Michael Stahl1-14/+60
Since CWS swrefactormarks2 the SwXBookmarks collection handles not only bookmarks but at least cross-ref marks as well, which then bother users when they show up in the Insert->Hyperlink dialog; remove non-bookmarks again. (regression from df6d312ca537402463e4eb0530f22b956600fc02) Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824 (cherry picked from commit 45be3ac8151d63ccb61879f876696704542a4ce7) Reviewed-on: https://gerrit.libreoffice.org/459 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-08-14fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sectionsMiklos Vajna1-2/+28
(cherry picked from commit bb6bd1ff9cd3eecec7eb2cd7bd0a4dcef584c903) Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-08-13fdo#53439 SwPageFrm::PaintBorderAndShadow fix painting at small zoomMiklos Vajna1-5/+16
Change-Id: I235895caaf95225148e61d96f4c3b14bf9f5542e (cherry picked from commit c5b9c197d70a0fb7d75bcedf2d70e6320175e846) Signed-off-by: Ivan Timofeev <timofeev.i.s@gmail.com>
2012-08-08n#773515 SwPageFrm::PaintBorderAndShadow fix shadow color on partial redrawMiklos Vajna1-4/+18
How to reproduce: if you have a paragraph of text, and hit Enter in the middle of the paragraph, the frame around the document below the cursor position gets darker. Regression from f23d055dbee887ef9ebdf0a72b83ee1de91b7b8b. Change-Id: I41f9972b9be8d3ea02b52c0bc7355b012b41395d Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2012-08-02sw: fix some warningsMichael Stahl1-2/+2
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-08-02some tweaks in RTF filterMichael Stahl1-0/+8
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-07-24fdo#39812: Writer: fix collapsing merged table border painting:Michael Stahl1-13/+26
Create a table with a merged cell like in the screenshot in the bug, with a SAL_DEBUG in SwTabFrmPainter::PaintLines the following lines are painted: debug: paint start 1 debug: start: 2749,1488 end: 12387,1488 2 debug: start: 2749,1945 end: 7567,1945 3 debug: start: 7567,1945 end: 12387,1945 4 debug: start: 2749,2015 end: 12387,2015 5 debug: start: 2749,2542 end: 7567,2542 6 debug: start: 7567,2542 end: 12387,2542 7 debug: start: 2749,1488 end: 2749,1945 8 debug: start: 2749,1945 end: 2749,2015 9 debug: start: 2749,2015 end: 2749,2542 A debug: start: 7567,1945 end: 7567,2542 B debug: start: 12387,1488 end: 12387,1945 C debug: start: 12387,1945 end: 12387,2015 D debug: start: 12387,2015 end: 12387,2542 debug: paint end *11111*11111* 7 B 7 B *22222*33333* 8 A C *44444*44444* 9 A D 9 A D *55555*66666* The problem is obviously that the Y coordinates of the lines 2, 3 and 4 differ; they should be on the same Y position. The problem here is that logically horizontal lines must be painted not centered but "below" the line, and It turns out that SwTabFrmPainter::Insert cannot correct the positions properly to do that, because it only looks at borders in a single cell. When using the UI to set the borders, we get (for innner table borders) only a bottom border in the cells, but no top borders, so the top position of the logically vertical borders needs to be corrected with the width of the bottom border of the cell _above_; a symmetric correction of the bottom position to the top border of the cell below is also necessary. Fortunately if we just leave the positons alone in Insert then TabFrmPainter will eliminate duplicate lines with equal positions and so it's only necessary to correct the positions when actually painting the line in wTabFrmPainter::PaintLines, where we have the neighboring lines available. (cherry picked from commit 02e80d2e431a57ad775a674eb3cfcd6cec53e09f) Change-Id: Ia8519f6673db0f3a1ecaa68038896cac39609129 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-07-19fdo#52241 remove just one entryDavid Tardon1-3/+2
Change-Id: Ida7920c3196105f7f8aab519da12e79135839345 (cherry picked from commit 859018061956b1937c7be3809a9858cbd610fa9c) Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2012-07-18fdo#50801 fix cross-reference text when Caption order is Numbering firstUray M. János2-48/+88
Change-Id: I7306f99c18d0f9cfb3b0ce147ecc200662d23b3d Signed-off-by: Andras Timar <atimar@suse.com>
2012-07-15Resolves: fdo#52013 use vector::insert insteadCaolán McNamara1-1/+2
Change-Id: Ie12e5b11196b1b0f919bd18f28a0b86f60cc6513 Signed-off-by: Takeshi Abe <tabe@fixedpoint.jp>
2012-07-11fdo#51793: FormatNumber can handle sal_uInt32 values after all...Cédric Bosdonnat2-2/+2
Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee (cherry picked from commit 32c7ba61a9ce620c1c9544ac469ccfd143e60bb9) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-07-06fdo#38071: roll back change to MarkBase::IsCoveringPosition:Michael Stahl1-3/+4
This change seems wrong as the end position is actually behind the CH_TXT_ATR_FIELDEND; fortunately it is also unnecessary because the change in MSWordExportBase::OutputTextNode is sufficient to fix the crash. Change-Id: I79d508b13ecc8d85c4e09149b44695436416ba6d (cherry picked from commit f2b6d71ccd04f41a849a0e5386f6619bfcc211da)
2012-07-06fdo#33960: fix cross reference number test failureMichael Stahl1-7/+28
(cherry picked from commit 190ca072fc1c8679c586867582c816d98016f343) Conflicts: sw/source/core/doc/number.cxx Change-Id: If50a09a14ad30fa3dcb587d6e59a5a0d161394b1
2012-07-04replace enum SvxBorderStyle with css::table::BorderLineSyleMichael Stahl9-35/+50
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67 (cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)
2012-07-04rename SvxBorderLine::SetStyle to something unambiguousMichael Stahl3-8/+8
Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae (cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)
2012-06-28fdo#39415: sw: fix vertical collapsing border painting:Michael Stahl1-20/+22
For borders in vertically oriented text it's necessary to correct positions at different sides, i.e., right and left instead of top and bottom; refactor SwTabFrmPainter::Insert some more to handle this properly. Change-Id: If20b9477415e9bd12e63aab4eed2f070065eb473 (cherry picked from commit d0bbbfdef6b31650a351883de09b5338562048a2) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-28fdo#39415: sw: fix collapsing border painting more:Michael Stahl1-19/+27
There is a special case for i#9860, which is for first line in follow table (i.e. continued on new page) without repeated headlines: Here the bottom border of the cell is used as the top border in case the cell does not have a top border; this is fixed now with a bit of refactoring, so the correct half width adjustment can be made. Change-Id: I58ef81b7e13544014ef75973ea793f673a242488 (cherry picked from commit 3a4b7c3555f2ffb4e89502bb04ff063d8c08f628) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-28fdo#39415: sw: fix collapsing border painting:Michael Stahl1-4/+9
In a table with collapsing borders, the horizontal borders need to be painted "below" the reference line, and not "centered" on the line like the vertical borders. a0486f02433703744f487e599422714d03937956 was apparently an attempt to fix this, but unfortunately it adjusted both top and bottom borders with the top border width, which has horrible results if the top and bottom borders have different widths. Change-Id: I7605eda6ef8111612ceb1ded79c0811de9ca7b25 (cherry picked from commit aa8240e80394887a4af45710de69aacacec66d25) Signed-off-by: Michael Stahl <mstahl@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 05:03:00 +0000