AgeCommit message (Collapse)AuthorFilesLines
2013-07-04Bump for 3.6-31suse-3.6-31Andras Timar2-6/+6
Change-Id: I3669a6cf3dc9b6b4328cc0b6791c55803cb3ecb6
2013-06-26bnc#823675 RTF import: fix import of numbering bullet associated fontMiklos Vajna2-4/+14
There were multiple problems here: - \f had a special handler for the listlevel destination, \af had not - in case of multiple \f or \af, the first one is used for the bullet font - in case only \af is used for the bullet font, its value should be used for \f as well (cherry picked from commit 55162d7422a3b175c7fe9c175e0dec91b1932b6a) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6631504c1aa9f2e0792a3469a5fdce5b7bd49518
2013-06-26bnc#823675 fdo#59638 handle RTF_F inside RTF_LISTLEVELMiklos Vajna1-0/+8
Word typically uses the Symbol font to describe bullet characters instead of using a sane Unicode value, the previous can only be handled if we parse the custom font set for the list. (cherry picked from commit 58c30a3545a5725d704eabd79071db02f1f2cb23) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I1491f07c40953949e381a035c1596c207cdc4c35
2013-06-26Bump for 3.6-30suse-3.6-30Andras Timar2-6/+6
Change-Id: I082f8174eaa50b2991aeb8ac805f71f6fad34367
2013-06-26bnc#823655 writerfilter: try to make clang tinderbox happyMiklos Vajna1-1/+2
(cherry picked from commit 591e23d03c27e2658889d913626fdcb2837d9064) Change-Id: If24e8e3e48f8d043fdb48a0637e874743f9247f0
2013-06-24bnc#823655 fix RTF import of freeform shape coordinatesMiklos Vajna1-7/+8
E.g. 0,1 was imported as 1,0, as we did not differentiate between not having the coordinate yet and having it as zero. (cherry picked from commit ddddfe8d6ffa05c467bddb3480e43d7043a3d3c9) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
2013-06-24bnc#823655 Import RTF shape wrap property.Eilidh McAdam3-2/+23
Property \shpwrN, where N can be 1: Wrap at top and bottom (no wrap at sides) 2: Wrap around shape 3: None (wrap as though shape isn't there) 4: Wrap tightly around shape 5: Wrap text through shape Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <> (cherry picked from commit d56e7c9011e662b39f0e9775e654f62cea8765c2) Change-Id: Ic700e06bf9ef894a6efa7e8d033888ed80a7082f Signed-off-by: Miklos Vajna <>
2013-06-19Bump for 3.6-29suse-3.6-29Andras Timar2-7/+7
Change-Id: I551bce4ae38687fc7decd96b0466e951808c2768
2013-06-19n#816593: Floating table width import fix: adjust the frame widthCédric Bosdonnat1-3/+17
(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b) Conflicts: sw/qa/extras/ooxmlimport/data/table_width.docx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152 (cherry picked from commit 33e392e7d4fbfc61480751311e7187a5730acc78)
2013-06-19n#779642: 0 width or height in //v:shape[@style] produces weird resultsCédric Bosdonnat1-2/+9
(cherry picked from commit b7144acb2bfa369fb89146d060dbd8ddd547f4c1) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b (cherry picked from commit 3ad1d411f658b0c2bc8e318aebb999ab75675327)
2013-06-19n#820800: docx import of wrap polyon was based on dest size of pictureCédric Bosdonnat3-7/+6
... instead of the original size of it. Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09 (cherry picked from commit ae6981601b0e9175efaf9849b1279290ea3380f6)
2013-06-19n#820836: dmapper, fixed typos in first page style creationCédric Bosdonnat1-2/+2
Change-Id: I80031cab7c0304311bd5acbb3a2ead48e15594bb (cherry picked from commit ab653ae64d782e5bd54bd169ab11755dab310553)
2013-06-19n#820504: default color hidden by Default style in writerfilterCédric Bosdonnat1-2/+1
Setting the font color of the default paragraph style to Auto makes the color set in the Writer defaults (from rPrDefault) ignored. Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c (cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)
2013-06-17Bump for 3.6-28suse-3.6-28Andras Timar2-6/+6
Change-Id: I01a47f51a7bfb64284f5a57d784b176dae60b03f
2013-06-13ugly workaround for external leading with symbol fonts (bnc#823626)Luboš Luňák1-0/+25
I'd much rather find the code using external leading in Writer's layout, but this font rendering and layout stuff is so complicated. Change-Id: Iaf58af387a6727eb18f5a9d1613de3ae30d7c35e
2013-06-12bnc#820819 docx import: don't apply complex font size to non-complex fontPierre-Eric Pelloux-Prayer1-2/+0
OOXML spec says: "[szCs] specifies the font size which shall be applied to all complex script characters in the contents of this run when displayed" Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <> (cherry picked from commit 73731b01cd65defdf9b42a9754bede3ba84221d7) Change-Id: I0faf599e38ef5a2e2005bb6f98874639be7d8287
2013-06-11Bump for 3.6-27suse-3.6-27Andras Timar2-6/+6
Change-Id: I6da35dda4d5e569ce9d6155248d1656b931b3850
2013-06-10bnc#802888 SwPageFrm: one more clickable field fixMiklos Vajna1-16/+16
This is similar to a996678ed30804e16103e1cfdc439c8546e5d3b0. If we have both a background object and some clickable field to select, we should always prefer the clickable field. This time, the problem was to click on a clickable field, when the cursor was in normal text and we had a full-page background object. (cherry picked from commit 721baad94ee81d9d6281edb93ee45936f6e0e496) Conflicts: sw/source/core/layout/trvlfrm.cxx Change-Id: Id25036d8cb2ddf62011c22bfc50844b793b942bd
2013-06-07bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style propertyMiklos Vajna1-0/+4
(cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a
2013-06-06add some checks against NULL derefsCaolán McNamara2-0/+6
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1 (cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa) Signed-off-by: Miklos Vajna <>
2013-06-06valgrind: uninit variableCaolán McNamara1-2/+3
Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e (cherry picked from commit b5d93a58a7f4e23432f18da0946bac04027c23a8) Signed-off-by: Miklos Vajna <>
2013-06-05bnc#820509 DOCX import: handle M.d.yyyy date format in w:sdtMiklos Vajna1-2/+3
Change-Id: Iae233c24a9580ffc8ea4680276161a543171f63c (cherry picked from commit 58197c3692df0d0fccb5bc7abddaf6d9667565f6)
2013-06-05bnc#820509 DOCX import: try harder to disable form design modeMiklos Vajna5-5/+24
Previously this only worked if we had indexes in the document as well, but actually these are independent. Change-Id: I28afa60d2606230c901948d4c1da8f5a7c50a9f7 (cherry picked from commit 3d6a7cf3eb7aa966601cbc019d1ad5fafdddd21f)
2013-06-03Bump for 3.6-26suse-3.6-26Andras Timar2-6/+6
Change-Id: I96ec2e7e79ada9bcbb352c15b34cda12ea815e35
2013-05-30bnc#817956 DOCX import of page border shadowMiklos Vajna9-6/+42
See the comment in SectionPropertyMap::ApplyBorderToPageStyles() on what and how is mapped. The control flow is like this: BorderHandler::lcl_attribute() notices w:shadow, then PageBordersHandler::lcl_sprm() gets it, passes it to SectionPropertyMap::SetBorder(), finally SectionPropertyMap::ApplyBorderToPageStyles() uses the UNO API. (cherry picked from commit f0aa209390aea68f4c23cf16df9d1577aaea91b5) Change-Id: Ib0aef3245f58c62655769357f1f4dd07eef77f62
2013-05-30bnc#817956 VML import of mso-position-vertical-relative:marginMiklos Vajna1-0/+5
(cherry picked from commit f2720b87093968670e3fb47d24d4952f1631a654) Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I86464c44022ef8c8a8037d4228bb2a6409fc77af
2013-05-30bnc#817956 fix VML import of rotationMiklos Vajna1-30/+39
In VML, positive rotation angles are clockwise, we have them as counter-clockwise. This wasn't noticed earlier, as the n751117.docx testcase also had flip:x. (For example, rotation with angle 90 + flip:x is presented as 270 by the UI.) Fix this, and also mirror the angle when flip:x is present. (cherry picked from commit b2c16f6c1b8bd3c96e0549eb3036c820094a795f Conflicts: oox/source/vml/vmlshape.cxx Change-Id: I591ec3369a5bdca53f9684006a459d11e37fbc33
2013-05-30bnc#817956 VML import of v:textpathMiklos Vajna5-0/+78
Word exposes this as Watermark in its UI. (cherry picked from commit 290695c785ef831abb6e78cd3675bc071f05f643) Conflicts: oox/inc/oox/vml/vmlformatting.hxx oox/inc/oox/vml/vmlshape.hxx oox/source/vml/vmlformatting.cxx oox/source/vml/vmlshapecontext.cxx Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81
2013-05-30bnc#817956 DOCX import: missing last character of shape textMiklos Vajna1-1/+4
Make sure writerfilter only removes the last character of the text if it's a newline. Change-Id: I96980e2d148ced93363b3147545afdd0dd070e5d (cherry picked from commit 4eaabc45f76aefe82558b283975ab9df3aea7fce)
2013-05-30bnc#817956 DOCX import of document background colorMiklos Vajna4-1/+10
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. (cherry picked from commit 992da0d5cf04497bad55637f6a6ebfcdaec03e16) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237
2013-05-30Support added for fine dashing on table borders.Eilidh McAdam5-2/+27
When reading in docx documents, fine dashing provides a better visual match for some border types. Added in this patch: - FINE_DASHED in BorderLineStyle UNO enum and in internals - Import of docx table borders using this border style Change-Id: I39cfa18c915ec94d8e4ecfc6a2ca637076d1e468 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> (cherry picked from commit 7d632ff29e601c2e680c4a689997fbf552592a4b)
2013-05-30Bump for 3.6-25suse-3.6-25Andras Timar2-6/+6
Change-Id: I0c31c90c575ed2d9e5adeed58eb1ccea3a5ee139
2013-05-28docx import, fixed croppingSJacobi1-0/+8
Change-Id: I910c2f769e88c5d9d17fc5bf072909b4b7f28ef0 Reviewed-on: Tested-by: Luboš Luňák <> Reviewed-by: Joren De Cuyper <> Tested-by: Caolán McNamara <> Reviewed-by: Caolán McNamara <>
2013-05-27fix for bnc#819865 itemstate in parent style incorrectly reported as setNoel Power2-14/+12
Problem occurs because attrs set with default values are reported as set when queried Change-Id: Ic49e5e9908a6f11105cd255b8a70a95c83a512a8
2013-05-27Bump for 3.6-24suse-3.6-24Andras Timar2-6/+6
Change-Id: Ie86956ae5b6187b08a264f15e190df74c887aa3f
2013-05-23improve exporting of picture alignment to docxLuboš Luňák1-19/+97
Basing this on anchoring is wrong, as SwFmt{Hori/Vert}Orient seems to provide everything. Also try avoid hardcoding position if possible. Change-Id: I880bc5c3eeabdde9e52c0c16d1033e44e203a8a3
2013-05-23map docx line alignment properly to writer's line-of-text align (bnc#820792)Luboš Luňák3-11/+35
Apparently the top/bottom line of text alignment in writer is backwards compared to all others, while alignment to the top of a page puts an object's top edge at the top of the page, top of line of text puts the object on top of the line (i.e. bottom edge of the object at the line). The handling of NS_rtf::LN_YAlign suggests that swapping bottom and top in the input filter is the right way of handling this. Change-Id: I916c8ea0f2fd00de3e17b16b31433c9b6ba92e64
2013-05-23bnc#819882 DOCX import: backport table-related fixes from libreoffice-4-1Miklos Vajna8-48/+50
7705a50ba330cd3fa08f5edfe6617d9acde8e8a5 2012-11-06 docx import: round float value to int when computing cells width b261177e5d81a662c76d523e447d80c108ebdf5b 2012-11-08 round() is not portable d276d3f3ae112a11c8cb5768650d147cbb94275e 2013-01-14 fdo#44053 fix this again and this time add a testcase as well 6718482c072defe5d885030826fef5ef833732e9 2013-03-28 fixed table width, supporting rel table width, fixed grid handling 84f1fa190fc2b91d21b685f4d0ea99aaeea26fe0 2013-03-28 WaE: -Wsign-compare Change-Id: I419636a4d115ef97033b6b2ac0424c66318f0009
2013-05-23bnc#820786: Best effort mapping of the OOXML patterns to our hatches.Jan Holesovsky4-8/+91
Change-Id: I0138c2186741acf0964f0166953b69872a822907
2013-05-22bnc#819614: Fix runaway lines.Jan Holesovsky1-2/+3
Change-Id: I360ec44872dbb555870d7d3fc8a9ed81c95e8c07
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna5-7/+45
(cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a
2013-05-16bnc#779630 DOCX import: improve w:sdt size guessingMiklos Vajna1-1/+6
The problem was that when border was enabled (and the importer leaves it unchanged, and it's on by default), there was not enough space for the text. Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d (cherry picked from commit d0edc4e4c3709a3d0300e0b2b035e10493f583f9)
2013-05-16Bump for 3.6-23suse-3.6-23Andras Timar2-6/+6
Change-Id: I71fa49beb2c29a5bbeda9ae47f51f1d562f8b505
2013-05-15fdo#64586: Fix incorrect import non-empty placeholders.Jan Holesovsky2-3/+2
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
2013-05-13Bump for 3.6-22suse-3.6-22Andras Timar2-7/+7
Change-Id: Ibaaef1de48043136ce10b2572cd757d02b07ad92
2013-05-13bnc#816603, fdo#61594 SwWW8ImplReader::StartApo: don't always start a frameMiklos Vajna2-8/+30
Word supports floating tables, Writer does not. We can map floating tables to fly frames, containing just a table, but then those can't span over multiple pages. We could avoid creating frames in case the table is of multiple pages, but that's hard to determine. One easy case is when the table width is >= the text area with, in that case we can be sure that no wrapping would be performed anyway, so we can avoid putting the table to a frame. Two more related problems: 1) When we need to decide if a frame should be created or not, we typically don't know yet the table width. That's why TestApo() has to always succeed (in case the paragraphs are wrapped), and then we always enter StartApo(), where we can avoid creating the frame, if necessary. 2) Even if we decide that we don't create a frame, floating and non-floating table rows are different, so a separate table should be created for such rows. By doing all the StartApo() / StopApo(), we are safe here. (cherry picked from commit c2cf03e02b1c942645aea6988112028e13dd0c89) Change-Id: Ifc0e0e2f7320c3784698d0ff278031b46864e2e5
2013-05-13bnc#816603 SwWW8ImplReader::ParseTabPos: make this non-staticMiklos Vajna2-2/+2
I'll need to access the non-static maSectionManager in this method soon. (cherry picked from commit 1fd1ecd3451a39c837b42dd100aa5f154e01816b) Change-Id: Ia056ec9c812020c4ac0f4a0f1460a0c9506b12fa
2013-05-13bnc#816603 sw: move WW8TabBandDesc to ww8par.hxxMiklos Vajna2-56/+56
I'll need this struct in ww8par6.cxx soon. (cherry picked from commit 7d0dd9bd5b9fcd3b575c77e22c909bff15519a84) Change-Id: I4cf546ff585c89c076e4fdad93dbbb9b8ea72eca Conflicts: sw/source/filter/ww8/ww8par2.cxx
2013-05-13bnc#758621: Set the attribs for the entire para if a placeholder.Jan Holesovsky1-0/+8
Setting attributes for empty paragraphs does nothing, we have to apply it to the style directly. Change-Id: Id2a63c961e408906fa7c6457091405692262c6b7
2013-05-13bnc#758621: Set presentation object as non-empty only if not a placeholder.Jan Holesovsky1-3/+3
Based on work of Felix Zhang <>, thank you! Change-Id: I26c7cef17b9a5f3d73107b5c974983e58c347d52