summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-06-25build fixsuse-4.0-25Andras Timar
Change-Id: I52399b2f47deefb6212f2f376c8ec3cf98ea2340
2014-06-25MSWord uses \xb for linebreaks in DB fields, take 2 (bnc#878854)Luboš Luňák
This commit also does the conversion when reading the data from a data source using the mail merge wizard. (cherry picked from commit 076e4afc61b216e34959bd4e3701f1fa19972d5c) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ia14417507b6ddce955fec26142a42ce51f77de4e
2014-05-28build fixsuse-4.0-23Andras Timar
Change-Id: If249946cb33d984dbe9eeec3889ea80246df3a52
2014-05-28MSWord uses \xb for linebreaks in DB fields (bnc#878854)Luboš Luňák
Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441
2013-11-29Related bnc#837302: Don't introduce a redlined delete and the end of doc.Jan Holesovsky
Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec
2013-11-29bnc#837302: Allow insertion of redlines with an empty author.Jan Holesovsky
No idea why that was not allowed (since the initial import in 2000), we need it for interoperability. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/source/core/doc/docredln.cxx Change-Id: I475fa63f9a4a3219a2b898b6f7d81e0603d32c18
2013-11-12bnc#830205: Stop-gap solution to avoid crash.Jan Holesovsky
This improves the situation, because previously, the document would just crash due to infinite recursion. Deeper checking why do we end up with an invalid range would be good; but it was impossible to check with the bugdoc, as it was too complex, and trying to cut it down was crashing MSO :-) Hopefully we'll get a better document at some stage. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I4cd639e02aebe9027f06e8468c14969c506327b2
2013-10-28bnc#825891 fdo#69893 fix SwWrtShell::SelAll() to work with empty table at ↵Miklos Vajna
doc start In theory, it was a problem to have the table cursor around when having the selection outside the table; but it didn't cause a problem so far. However, when the table has one or more empty cells, we really need to leave table mode, otherwise only the table gets selected. Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41 (cherry picked from commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx
2013-10-28bnc#825891 fdo#69979 SwCrsrShell::ExtendedSelectAll: exclude headers, tooMiklos Vajna
It turns out, normal Ctrl-A doesn't select headers, footers and fly content, either (just like not selecting footnotes). So do the same when in the "doc starts with table" special mode. Change-Id: Ib9bc397944a4d07ea03bc326f1536733c57f42e6 (cherry picked from commit 232df42b8dc0b4f7a335d2931fc0f29e73b8bca0) Conflicts: sw/qa/extras/odfimport/odfimport.cxx sw/source/core/crsr/crsrsh.cxx
2013-10-28bnc#825891 fdo#69862 SwCrsrShell::ExtendedSelectAll: don't always select ↵Miklos Vajna
footnotes ExtendedSelectAll() was originally invented to e.g. select the whole document, change the language of the selection and then inmediately (before the layout is updated) undo the selection. When using it for "select all and doc starts with a table" purposes, then footnotes shouldn't be selected, just like those are not selected either, when the doc starts with a normal paragraph. Their anchor is still selected, and that's enough to have correct delete and copy&paste. Change-Id: I4fc49db628054a4b8a46effc2d0328eaabcaa9f8 (cherry picked from commit 959711f1276106b0aaee69ab660f1b0d3ece5bbc) Conflicts: sw/source/core/crsr/crsrsh.cxx sw/source/core/edit/eddel.cxx
2013-10-02bnc#779620 DOCX import: try harder to convert floating tables to text framesMiklos Vajna
Since 78d1f1c2835b9fae0f91ed771fc1d594c7817502, we convert floating tables to text frames only in case it's possible that there will be wrapping, to give better results for multi-page tables, which are multi-page, and technically floating ones, but that has no effect on the layout. The problem was that we try to do this decision too early, effectively the page width and margins were counted from the default letter size, instead of the actual values, which did not arrive at the time of the decision. Fix this by moving this logic at the section end. Change-Id: Ic1fbceb54c8ec223ed01836fafe6220bb3b2410a (cherry picked from commit bbef85c157169efa958ea1014d91d467cb243e6f) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx
2013-09-20bnc#825891 fdo#37606 SwWrtShell::SelAll(): fix for doc starting with tableMiklos Vajna
SwWrtShell::SelAll() can now detect if the body text starts with a table, and if so, it explicitly selects the whole document, not just the first cell of the starting table. Also, SwCrsrShell::EndAction() now checks for this "select all and doc starts with table" situation, and if that's the case, it activates a special select all mode, so layout can act accordingly. (cherry picked from commit 3b11e66ab89c201591d8be8f1ab1af1aba11a821) Conflicts: sw/source/core/crsr/crsrsh.cxx sw/source/core/layout/trvlfrm.cxx fdo#37606 SwWrtShell: fix select all when doc starts with table and cursor ... ... is outside that table (cherry picked from commit 4b6445dba6bb5b2aed3edb4878ecb327446286e9) fdo#37606 SwEditShell::DeleteSel(): handle document starting with a table If the whole document is selected and the document starts with a table, then we used to delete the contents of the document, except the starting table, which was just cleared. Change this and do what is expected: remove the table as well, so the document will have a single empty paragraph only. (cherry picked from commit 0fb4adcff534e3841cf6df0e2363fb0797af7022) Conflicts: sw/source/core/edit/eddel.cxx fdo#37606 SwEditShell: fix copying when doc starts with a table ... ... and the whole document was selected The problem is that the cursor starts at the first cell of the starting table, but when copying, we want to copy the preceding startnode and tablenode as well. (cherry picked from commit 49505336a629a75f4fb48bbe0c532b402e857ed4) fdo#37606 testcase (cherry picked from commit f5fa78d75abac3dbe0f9edf9e9106f63ca5dca53) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: I60d34906a90a5143163e516f618648cf7178430e Conflicts: sw/CppunitTest_sw_odfimport.mk sw/inc/viewsh.hxx sw/qa/extras/odfimport/odfimport.cxx sw/source/core/crsr/crsrsh.cxx sw/source/core/view/vnew.cxx
2013-09-06bnc#779642 VML import: handle drawinglayer rectangle char spacingMiklos Vajna
Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a (cherry picked from commit 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7)
2013-09-06bnc#779642 fdo#46361 oox: handle multiple w:p for groupshape textboxesMiklos Vajna
One testcase had to be adjusted, as it seems previously we stripped all newlines at the end (I consider that as a bug), and now we only strip the last one (so the resulting number of paragraphs on the shape and in the source document equal). Change-Id: Ic22b96c2992b53c72e2609e2286622173b86065c (cherry picked from commit f24e4c74d7d6a7d95090c6fa6a584fed7787706c)
2013-09-06bnc#779642 VML import: fix TextHorizontalAdjust when layout-flow is verticalMiklos Vajna
The shape had no special properties about hori/vert text adjustment, so it should be hori left / vert top. Then it has vertical layout-flow, so vert should be top and hori should be right (vert was center). Change-Id: Ia89d8587b6a822ead45198dc5d1ba23907cc3567 (cherry picked from commit b10afb26296e33c77e94a6eda3f2c36c4d34c2aa)
2013-09-03fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frameMiklos Vajna
This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de "Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame" from the WW8 filter to the DOCX one. (regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad) (cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502) Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51
2013-09-03bnc#816593 DOCX import: ignore page breaks in tablesMiklos Vajna
(cherry picked from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: Ibb250148d41d1929fa17dd993bb71c93c0e09dcf Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx
2013-09-03bnc#816593 DOCX filter: import paragraph spacing from table styleMiklos Vajna
(cherry picked from commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52) Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774
2013-09-03bnc#816593 DOCX import: fix auto table width wrt nested tablesMiklos Vajna
This is a backport of the fix + 3 other commits from master, which were needed to make the testcase pass on -4-1 as well. (cherry picked from commits 74c5ed19f430327988194cdcd6bdff09591a93fa, 824cc4bf4ae9035d4108e8da8e81eb57284f0b54, 53d27a30ce5f2c9f7d37a4089286116854c16215 and 76d1ca523ddcf89cc269fe51c70e66066943ef5a) Change-Id: I62a1f526cf1d4e4056daa1495d61f1b9f5c0b1b2 Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapperTableManager.cxx
2013-08-26bnc#834035 DOCX export: fix hyperlinks of illustration indexMiklos Vajna
We used to export raw Writer bookmarks, but that's not valid in OOXML. Instead, it has normal bookmarks around the sequence fields, so use them if they are available. Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265 (cherry picked from commit e9275c08acc2f4f1c925f78b56a1089515cd9a37) Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx
2013-08-14w:spacing in a paragraph should also apply to as-char objects (bnc#780044)Luboš Luňák
Otherwise global w:spacing will be used even if overriden locally. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I01f0a3a323566f6e29faf73bf9d2ba874565eb42
2013-08-09n#816593: docx consecutive tables with different tblpPr needs to be splitCédric Bosdonnat
When importing docx with 2 <w:tbl> following each other, we have 2 possible behaviors: either merge them as one table as we did before or split them into two tables. The tables need to be split if they have different floating position properties. This required the ooxml tokenizer to repeat the table properties for each row of the table: or how would we know we don't need to split the table? The basic idea behind this hack is to temporarily store the table position and table properties before saving them. Thus we can compare them at the end of the row and decide to split the table or not. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
2013-08-08bnc#823651 WW8 import: fix paragraph style in empty first page headerMiklos Vajna
The problem was that the first page SwFmtHeader / SwFmtFooter wasn't created in case the header/footer text was empty, even if fTitlePage was set. (cherry picked from commit 4bc063090c06f0c34980a3852f684b42ab25c501) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I5e58419161bcc663e2beb0338b95877469e0fd3c
2013-08-07fdo#67498 RTF import: fix missing margins vs continuous section breaksMiklos Vajna
The document had 3 sections, separated by continuous section breaks. Previously only margins from the last section were imported, this way the first page had default margins. Now margins are also applied when we hit continuous section breaks. This way margin values from the last section break affecting the page wins. A later commit could improve this further by setting the minimum of these and setting a section margin for each non-minimal sections. Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71 Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2013-08-07compatibility setting for MS Word wrapping text in less space (bnc#822908)Luboš Luňák
The document itself is stupid and uses a SURROUND_THROUGH object with a number of empty lines that make it act is if it in fact was SURROUND_NONE, rather than actually disabling wrapping for the object and be done with it. But the difference was that Word still managed to fit those empty lines next to the object into the little space that was there, while LO already considered the space too small. So keep a compatibility setting for Word documents in order to avoid problems with such lame documents and hopefully that's enough. Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
2013-08-05fdo#66474 DOCX import: fix handling of mixed fixed/auto cell widthsMiklos Vajna
Instead of checking if any cells have fixed width, check if all calls have fixed with. Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7
2013-08-01DOCX import fix for table with auto sizeAdam Co
Reviewed-on: https://gerrit.libreoffice.org/4496 Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739
2013-07-18n#825976: Fixed missing part of conditionCédric Bosdonnat
Change-Id: Icc41828e3c2bd088fb5f7dd876f62c077ddf65ce
2013-07-18n#825976: Table of Illustration has hyperlinks by default like TOCCédric Bosdonnat
...and that fixes the formatting of hyperlinks in docx Tableoof Illustrations. Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d
2013-07-17fdo#39904, n#825976: implement hyperlinks for Illustrations indexCédric Bosdonnat
Change-Id: I6f682c382e7ab0e06259b335247fdcebd7412942
2013-07-12bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributesMiklos Vajna
Paragraph attributes were set directly on the SwTxtNodes, instead of going through SwWrtShell::SetAttr(), which handles undo/redo. Regression from 357fac9713875302d30185feabaf5c165e040ca4. Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6 (cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)
2013-06-26bnc#823675 RTF import: fix import of numbering bullet associated fontMiklos Vajna
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 Change-Id: I6631504c1aa9f2e0792a3469a5fdce5b7bd49518 (cherry picked from commit 55162d7422a3b175c7fe9c175e0dec91b1932b6a) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx
2013-06-24bnc#823655 fix RTF import of freeform shape coordinatesMiklos Vajna
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. Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4 (cherry picked from commit ddddfe8d6ffa05c467bddb3480e43d7043a3d3c9)
2013-06-24bnc#823655 RTF import: ignore styles without a typeMiklos Vajna
Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9. Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28 (cherry picked from commit c6a941b51b68eb097d4d43323b39ff1aba4c753e)
2013-06-20import different first page header/footer from docLuke Deller
When a Word section has a different first page header/footer, this used to be imported into LO as a chain of two page styles. Now that LO supports a single page style with different first page header/footer we can import to that. This change also incidentally fixes fdo#57908. bnc#654230 had the same underlying problem, so the workaround committed for that (which includes comments expressing lack of understanding) has been removed. Reviewed-on: https://gerrit.libreoffice.org/2065 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi> Signed-off-by: Luboš Luňák <l.lunak@suse.cz> Conflicts: sw/source/filter/ww8/wrtw8sty.cxx Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605
2013-06-19bnc#825305 RTF import of fFilled shape propertyMiklos Vajna
Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0 (cherry picked from commit 2af60e2eff4e952fff8cac0228b89f16ce3a436e) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfsdrimport.cxx
2013-06-12fdo#61923: sw: word completion: do not add trailing '.'Michael Stahl
SwAutoCompleteWord::InsertWord(): use the computed nWrdLen to cut off trailing periods. (regression from d602a3b280fcc1cf16660d8719cd8eb8797dd2ad) Change-Id: I9f4ace62f8d9e7d233e7e210f476856d7841d869 (cherry picked from commit 246d7e280ea8b7d1e27e14a6568d2a65cc8c9e7b) Reviewed-on: https://gerrit.libreoffice.org/4159 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-06-10bnc#802888 SwPageFrm: one more clickable field fixMiklos Vajna
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. Change-Id: Id25036d8cb2ddf62011c22bfc50844b793b942bd (cherry picked from commit 721baad94ee81d9d6281edb93ee45936f6e0e496) Conflicts: sw/source/core/layout/trvlfrm.cxx
2013-06-07bnc#820788 VML import of v:textbox's mso-fit-shape-to-text style propertyMiklos Vajna
Change-Id: I74a0ecd50ca61a4f5bf7ebdbf12743dc1fd9368a (cherry picked from commit a22ef599bd3fdcf0bd5c3616aa566a5922624ff3)
2013-06-07Make use of IsStarSymbol()Thomas Arnhold
Reviewed-on: https://gerrit.libreoffice.org/4077 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz> Signed-off-by: Luboš Luňák <l.lunak@suse.cz> Conflicts: include/unotools/fontdefs.hxx oox/source/export/drawingml.cxx sw/source/filter/ww8/writerhelper.cxx sw/source/filter/ww8/writerhelper.hxx vcl/generic/fontmanager/fontsubst.cxx vcl/generic/glyphs/gcach_ftyp.cxx vcl/source/gdi/outdev3.cxx Change-Id: I7a2e3a6f11bbaaaff50e8163e4ce3e2583b1d03c
2013-06-07ugly workaround for external leading with symbol fonts (bnc#823626)Luboš Luňák
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-06bnc#382137 DocxAttributeOutput: don't store address of local variableMiklos Vajna
AttributeOutputBase::TextField() passes the address of its local variable to WriteExpand(), and DocxAttributeOutput::WriteField_Impl() stored this. When it was to be used, the variable already went out of scope, resulting in a crash. Given that SwField is an abstract base class, the easiest way is to just copy the field and manually delete it when it's no longer needed. Change-Id: I9d1fe2485277f1ac21a576d7ff0d05003f0ac8a1 (cherry picked from commit 248a63f5d0d09b6e8388192a0fe7332a624e8829)
2013-06-05bnc#820509 testcaseMiklos Vajna
Change-Id: Iee9909e9c42014ab10ceaa2f8f8e554c25e89157 (cherry picked from commit a9e0ec2b87a99c93b77a210a916b4df44ece454a) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2013-05-30fdo#64671 Some special RTF characters were not skipped correctlyUrmas
Some special characters, like { and }, were not skipped when they occured as a replacement character for \uN keyword. (cherry picked from commits bfb93ffc6d72d22a833acf9d8c9d166153dad7c0 and ec8e012e980c88c8f24a7de44e44d0319bae2801) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-05-30bnc#817956 page border shadow testcaseMiklos Vajna
Change-Id: I1ded79d89dcceb3bae5926a2f217cde8bf6aa830 (cherry picked from commit 300ba1a171a37da08d72e278cf38988f1225cc83)
2013-05-30bnc#817956 v:textpath VML import testcaseMiklos Vajna
Change-Id: I4c4c3a84e8d9d048262e6570a8bed0106e8d184f (cherry picked from commit 8931c8f3c58afe35b5b7c98e136825aff04291e3)
2013-05-30bnc#817956 DOCX import of document background colorMiklos Vajna
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237 (cherry picked from commit 992da0d5cf04497bad55637f6a6ebfcdaec03e16) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx
2013-05-30Bin uninteresting (?) OSL_FAIL()Tor Lillqvist
2013-05-24fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diffBjoern Michaelsen
- replaced the really ugly goto hack though (cherry picked from commit ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e Reviewed-on: https://gerrit.libreoffice.org/2133 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-05-23improve exporting of picture alignment to docxLuboš Luňák
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
generated by cgit (git 2.34.1) at 2024-06-27 22:29:25 +0000