summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2012-06-20fdo#51243 infinite loop in SwFrameControlsManager::SetReadonlyControlsLionel Elie Mamane
Change-Id: Id2c6fa349203b62869b75b9b8560c9ce7e365897 Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> (cherry picked from commit fa84c91b85b6934b21b02b07de1409be38425229) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-06-12fdo#43249: WW8: fix double border import:Michael Stahl
The border widths are tripled on import, because that is effectively what SetWidth does for DOUBLE borders; set a divisor of 3 similar to e2ffb71305c5f085eec6d396651c76d6daee3406 70a6a4d425558340bb49507975343a3e0a1bdde8 Change-Id: I40b175bedc1ed2d564be126bf9e6870b43474aba (cherry picked from commit 36e43b52992735c622833e923faa63774b9e2f76) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-06-11n#757910 fix WW8 import of textboxes with thin border/inner marginMiklos Vajna
There were two problems here: First, nLineThick was already in twips, so converting it again from EMU rendered thin borders invisible. Second, when the border width is set to zero, that means a minimal border, but we interpreted it as default width (which resulted in less space for the textbox contents than required). (cherry picked from commit e652ba3c7357e0396498629891a1391ace67c4d7) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-11fdo#50141: Character count (with spaces) incorrect with numbering on.Muhammad Haggag
There was a typo in the character counting code of text nodes. When a numbered list is detected, the code attempts to add the character count of the "item number" to the total count, but ends up overwriting it instead (uses '=' instead of '+='). This resulted in the item number strings to be the only ones counted in a numbered list. Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4 (cherry picked from commit a585863f013aa4207270e11f5e031126adf1ed4a) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-07fdo#50144 put full reference text to selection fieldAndras Timar
Change-Id: I99a4a2a3fc6e20f9c8d35213609075f2269eab2f Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-06-06fdo#50139 do not cut first character of field textAndras Timar
Change-Id: Ia80e0bc0540259f9a752452ad677c645c97fc7f5 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-06-05Resolves: fdo#48932 super slow typing and scrolling in large documentsCaolán McNamara
AFAICS it appears that theres a one to one mapping from a SwFrameControl to a SwFrm, so in any of the three given classes of Page, Footer or Header a SwFrm will have zero or one SwFrameControls and a SwFrameControl doesn't get rebound to a different SwFrm or anything like that, so we can use a map and index off the SwFrm* to find them rather than constantly looping over vectors to find the right one. Maybe could move the SwFrameControl directly in the SwPageFrm's themselves. Change-Id: I4de0a34f657143ef2d4409b604cc8e114dad132f Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-06-04fdo#50676: silence SolarMutex not locked spewCaolán McNamara
(cherry picked from commit f9a4af41ca574760dbd22c8207661fabb6823e3b) Change-Id: I1c2a24e9f8fbbea7227c3c8e3a567ae22e070578 Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2012-06-01fdo#45522 fix crash on RTF export of sub-tables during copy&pasteMiklos Vajna
Change-Id: I71b0794c597344723dd53e114b5ad03605b8c859 (cherry picked from commit f506ca0fee6114210d41c9c4a5f7eff5f5666d02) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-05-31fix UNO ZOrderLuboš Luňák
this is from commits e05e77f4b7373b686f02cc51c7003e72efb07053 and 9365a3255875eb75923903c8b3d47066aa679c3b Change-Id: Idad4d6e818e322f30389a9279666166256842185 Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-05-31fix horizontal rule width in .doc documents (bnc#757118)Luboš Luňák
MSO uses undocumented properties that seem to map to o:hr and o:hrpct from .docx (including differences between .docx spec and implementation), so treat horizontal rule width the same way in .doc too. Also remove the guesswork for #i17200# that is not quite correct and no longer needed. Change-Id: Ibec543fa1679ca0b20e86ef6b4f77147b18dff7e (cherry picked from commit 5845298e615a599d5edc7c42275b52ae954250e8) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-05-31column break without columns seems to be a page break (bnc#750255)Luboš Luňák
That at least seems to be my conclusion after testing the doc and bnc#652364 in MSO2k7. Change-Id: Iec172dad32ba47c1f843df49a4eaff688c094373 (cherry picked from commit 5935a6db64830ac5b932803cdcac5813aa033594) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-05-29fdo#44174 RTF_TITLEPG when title page has no headerMiklos Vajna
Change-Id: Ida6566b38ceaca30441a029c73bd1f52d93bbb3b
2012-05-18more -Wnon-virtual-dtor fixesMichael Stahl
basically a small subset of 6e67c03dc0225fc66343546b14e902b9d238b1a3, mangled so it applies Change-Id: I6aadf6d80b3748229141bf1f723404947fc5021e
2012-05-18WaE: deleting object of abstract class type with non-virtual destructorDavid Tardon
(cherry picked from commit 986388e76b35ea7bea9e767155f87db68fc74c7f) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-05-15similar to fdo#45592 type for property UNO_NAME_SAVE_FILTER_DATA is wrongNoel Power
(cherry picked from commit 3234c2a7864501243fdd9a1fdd5eb044bf317383) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-05-15fix property type for printoptions fdo#45592Noel Power
Change-Id: Ie78e3a5fffb73c212dcb60e4ad0dbe2f7db8fea2 (cherry picked from commit db6dd09720c7e457bb46da4e80a786cae1ee0fc7) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-05-15sw: avoid over-using over-complicated SfxUndoManager::IsUndoEnabledMichael Meeks
(cherry picked from commit 51270f84bbeed46b3253ecfa1f8ddd408106b746) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-05-14Revert "sw: avoid over-using over-complicated SfxUndoManager::IsUndoEnabled"Michael Meeks
This reverts commit 1a83b7f884a96e61d631ed2f92b99a5493b3384c. Committed to wrong branch
2012-05-14sw: avoid over-using over-complicated SfxUndoManager::IsUndoEnabledMichael Meeks
2012-05-14Resolves: fdo#49897 add+use SwDoc::containsUpdatableFieldsCaolán McNamara
Change-Id: I03ab6367a40ddc5748a499c4e2c7f108a3ef8a08 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-05-14fdo#49692 fix RTF export of empty paragraph numbering rulesMiklos Vajna
When there is a numbering rule, the fallback text is constructed so that whitespace separates the numbering and the paragraph text. When the numbering is empty, we don't need that separator. Change-Id: I17a11ddd73addc8c95a0c2b54402e6dd2705d094 Signed-off-by: Andras Timar <atimar@suse.com>
2012-05-14fdo#44010: fix vertical text frame borders:Michael Stahl
Frames with text direction Vertical RTL have their borders mangled while painting, everything is rotated 90 degrees and so the model "left" border ends up being painted as top border etc. Clearly the new drawing layer based painting code is very surprised by this and ends up painting only points instead of lines. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) (cherry picked from commit 3f6d3a4045507d1496709c5cff8f359a0d0e8b29) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-05-10Resolves: fdo#37044 two different TransliterationChgData structsCaolán McNamara
There are two structs called TransliterationChgData with different layout. The crashes on MacOSX must be due to this. Rename them so they've different names. Change-Id: I887a33bed26b339e229b7fb1ef8dddd192f6fae3 (cherry picked from commit 7080d629c82422a419d38051536c7711f8abe53e) Conflicts: editeng/source/editeng/impedit4.cxx Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-05-08Revert conversion to std::mapCaolán McNamara
3af0c948254751eade9bff772b849720747c5494 868bd3b778b6c7b970c67d1dacc469967f69e551 b2e84f9a40fda7821d4e658f9102bcbc783a1ba3 7264d2767095150944ff1e6999c71be1dbdc6f83 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f The problem is that a paragraph gets added to the document after the TableBox selection is created, which changes the node ids of the following paragraphs in the TableBox but the map has used cached SttNd value as its index, so it can't recognize nodes using the new index. This worked in the old implementation because that was effectively a sorted-vector. Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-05-04remove pointless forward moving of a table (bnc#706138)Luboš Luňák
This appears to be broken. Why should a table where all rows want to be kept together be moved one page forward just because there is something before it on the page where it is? It either fits its curent page, in which case it's wrong, or it does not fit, in which case it may not fit the following page either and something else needs to take care of it anyway. (cherry picked from commit 254ba40392b17c2cb2fa1ef35a835d19a5f4a5e1) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-05-02Resolves: fdo#49208 performance problems with very long paragraphsCaolán McNamara
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-05-02fdo#38176 fix RTF export of non-breaking space/hyphen/optional hyphenMiklos Vajna
(cherry-picked from commits ef7cc64 and dfc7c67) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-05-01fdo#47670: sw: HTML: fix table border export:Michael Stahl
SwHTMLWrtTable::Write no longer writes BORDER and BORDERCOLOR attributes on TABLE elements, but instead various CSS "border" properties into STYLE attributes of the TD elements. However, it was forgotten to also remove the ROWS and FRAMES attributes, which (as the comments helpfully explain) only make sense in case BORDER is actually written, and cause Mozilla to not render some of the borders in cases RULES=ROWS or RULES=COLS. (regression from d18feffd49f4481626417daac7984b2a7e70c3bf) (cherry picked from commit e1424390d45deb75a75a167e7eba36c012f32d74) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-30fdo#41796: sw: HTML: spurious semicolons in STYLE:Michael Stahl
The STYLE attributes on TD elements (except for the first) start with a spurious semicolon, because the bFirstCSS1Prop variable is not reset. Apparently the semicolon is a separator in STYLE attributes, so it is probably invalid to write a spurious one, but Mozilla can still render the borders right, so add a workaround to CSS1Parser::ParseStyleOption to skip initial semicolons. Fix the export by using the SwCSS1OutMode to set the mode (also turning on encoding while at it), which is the only way to reset bFirstCSS1Prop. (regression from d18feffd49f4481626417daac7984b2a7e70c3bf) (cherry picked from commit 284b421f40078275e5e647a4f7e82e4ef7fec6a7) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-30fdo#41796: sw: HTML: import CSS STYLE border on TD:Michael Stahl
For TD elements, the SYLE attribute containing "border" properties is read, but the borders end up not at the table cell, but on some span or paragraph inside the cell. So insert a special case that re-routes the SvxBoxItems containing the borders to FixFrameFmt, where the properties set at the TD element directly now override the SvxBoxItem that is derived from BORDER etc. attributes of the table. (regression from d18feffd49f4481626417daac7984b2a7e70c3bf, which changed the way the border attributes are written) (cherry picked from commit 9a482b4ea49c3ce964de4c0f81d8d3206ac75dc8) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-23fdo#43424: Comparing empty document with attached one crashes LOSzabolcs Dezsi
Signed-off-by: Andras Timar <atimar@suse.com>
2012-04-20fdo#38215: merge consecutive border lines:Michael Stahl
This re-implements the merging that was done by SwLineRects::AddLineRect, SwLineRect::MakeUnion with the drawing layer border lines. This is used to merge borders of paragraphs and of tables that have the "separating" border-model, which fixes both the tiny dividing gaps between successive borders in the second bugdoc and the weird subtly differently rendered successive borders in the first bugdoc. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) (cherry-picked from 0868a0155a2b57daf7b862d120aead0458372b17 and 44092833d3a0f0d6074c64bd0e64bbdf11109afe) Conflicts: sw/source/core/layout/paintfrm.cxx Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-20fdo#45562: paint borders in SwFlyFrm::Paint:Michael Stahl
Painting borders of Flys in the heaven layer cannot be done correctly in SwRootFrm::Paint, because delaying until then paints over other drawing objects that are on top of the frame, so do it in SwFlyFrm::Paint, like the old border painting code used to. (regression from 804d0a896731629397c5328c13c04a45bc55f459) (cherry picked from commit 5913506b2193e93ca2767ab7365ab2e76ed7848f) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-20fdo#42750 fdo#45562 fdo#47717: border paint ordering:Michael Stahl
Paint borders after subsidiary lines and hell layer, but before heaven layer. (cherry picked from commit 1024c172a5bfb3d85a86fcf7a046aa2b03950edd) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-18optimize: traverse children with WINDOW_FIRSTCHILD/WINDOW_NEXTCaolán McNamara
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-04-18fdo#38635: sw: fix border corner gaps:Michael Stahl
The start and end points of the vertical and adjacent horizontal borders were apart by 1.5 to 3 twips, leading to small visible gaps in the corners. This is fixed by using lcl_AlignWidth/lcl_AlignHeight on the border widths, and by always computing the start/end positions from the outer edge, which makes the horizontal and vertical start/end points match. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) (cherry picked from commit b08e9f3023e9ea1ca0926334becac939ca8fdfac) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-04-18sw: create horizontal border lines with start left and end rightMichael Stahl
(cherry picked from commit 1d5e263a129c56e561ce145bad9749027c583a75) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-04-17ClrContourCache for SwAnchoredDrawObjects (fdo#45376)Andreas Schierl
call it only for contour wrapped drawing objects Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-04-17fdo#38635: fix border printing:Michael Stahl
Apparently this special case in lcl_PaintLeftRightLine for printer output devices is no longer necessary with the new drawing layer borders and causes the vertical border lines to be far too short, leading to visible gaps in the PDF. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) (cherry picked from commit 502c93143ef29989692ca3e63e3e6abc255fd53f) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-04-14Resolves: fdo#48640 handle various busted rtf docs without hangingCaolán McNamara
(cherry picked from commit 234f150f30d881b2691288c5f5581306bd4d3d18) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-04-05fdo#40948: TOC dialog, Entries tab: the right arrow button does not workIvan Timofeev
regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cd. (cherry picked from commit b49f69aee6f48fb9367a2a9548182dcd84eb5296) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-04-03Introduced SystemShellExecuteFlags::URIS_ONLYStephan Bergmann
(cherry-picked from commit d4b67611c421ebe9b75284106fe389b434419961) Conflicts: extensions/source/update/check/updatecheck.cxx filter/source/xsltdialog/xmlfiltertestdialog.cxx sfx2/source/view/viewsh.cxx shell/source/unix/exec/shellexec.cxx Replaced master's new MSG_ERR_NO_ABS_URI_REF with re-using RID_SECURITY_WARNING_NO_HYPERLINKS, to avoid introducing new resources into the LO 3.5 series that require localization. New css.system.SystemShellExecuteFlags.URIS_ONLY remains @since LibreOffice 3.6. Officially, new features are only added when bumping the minor revision number, not the micro one (but backporting does not hurt here). Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-03-26fdo#39003: fix autoformat Undo cursors:Michael Stahl
SwEditShell::Undo: Because the Undo actions nowadays create new shell cursors directly (while previously they worked on a SwUndoIter), it is necessary to remove the shell cursor ring before Pop() because Pop(false) only restores the current cursor from the stack, not the rest of the ring. (regression from CWS undoapi, 1ba0c1878116ada5dc4ebdecdb1e0a3da9758547) (cherry picked from commit f24153cded54954da7f0d80941707715c78e4627) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
2012-03-24rhbz#789022: SwNodes: fix inconsistent outline check:Michael Stahl
SwNodes::UpdateOutlineNode will add/remove the node from SwNodes::pOutlineNds depending on IsOutline(), while various SwNodes methods that move and delete nodes check GetAttrOutlineLevel() != 0, which may be false even if IsOutline() is true. (cherry picked from commit 082906e1f4cf58fdfab1a4064e2b7955fcdaeb8a) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-03-22fdo#44516: Improved label/BC wizard - set paper sizeWinfried Donkers
Signed-off-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-03-22n#750258: removed strange non-wrapping conditionCédric Bosdonnat
In the bug file, some text wrapping was badly computed when showing the document (but not at the first rendering) due to that weird NotToWrap mecahnism in SwLayouter. Checked the original issue i#40155 that removing this does hurt. (cherry picked from commit 8a233f17ae589b33e3b54ef9ebb1fcff41ef6cd7) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-03-22Revert "make text wrapping work in headers/footers too (fdo#39155)"Cédric Bosdonnat
This reverts commit e2a8fb0427e6b33a0fd3873bb7e077a6e5da8ebb. This is a feature, not a bug and would cause loads of documents to be badly rendered. Link to the spec that brough that feature: http://www.openoffice.org/specs/writer/compatibility/adjust-text-wrapping.sxw Conflicts: sw/source/core/text/txtfly.cxx (cherry picked from commit 2a4e77a6f94d35919237b9db9de184e70943fc13) Conflicts: sw/source/core/text/txtfly.cxx
2012-03-21fdo#45522: WW8TableInfo::processSwTable: check that table has layoutCaolán McNamara
(cherry picked from commit 5c3dd5af41bc801ee6023513399c01c632dc7779) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-03-20fdo#42750: delay painting borders until after subsidiary linesMichael Stahl
With commit 0f0896c26fb260d1bbf31d7a886df3f61837f0f2, borders are drawn immediately, but then the subsidiary lines are drawn over the borders, hiding 1 twip wide borders completely. Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
generated by cgit (git 2.34.1) at 2024-07-01 14:07:16 +0000