summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-05-31fdo#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-31Bin uninteresting (?) OSL_FAIL()Tor Lillqvist
2013-05-31fdo#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
2013-05-23bnc#819882 DOCX import: backport table-related fixes from libreoffice-4-1Miklos Vajna
6718482c072defe5d885030826fef5ef833732e9 2013-03-28 fixed table width, supporting rel table width, fixed grid handling 84f1fa190fc2b91d21b685f4d0ea99aaeea26fe0 2013-03-28 WaE: -Wsign-compare 584322cbbd063e0a8d2c18a5e6a12f213af56057 2013-03-28 fix failing testcases
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a (cherry picked from commit b40fe8e5a5037d2745cc7b1c9cc408ce6c79b9d9) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx
2013-05-13bnc#816603, i#101884: Fix crash on load.Jan Holesovsky
This was originally fixed in commit 792cbc03aef3873ba89c61db708898d96d6a52f8 due to fix of i#99564. But later we reworked the handling of empty paragraphs in tables in commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c, which caused the fix from i#99564 to regress. Change-Id: Ief063181cee87c7cd43404469247d85eb96bcfe1 (cherry picked from commit 9fb856ce844f2a4e794687c00ad6f0f75ef223c1)
2013-05-13bnc#816603, fdo#61594 SwWW8ImplReader::StartApo: don't always start a frameMiklos Vajna
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 Conflicts: sw/source/filter/ww8/ww8par6.cxx
2013-05-13bnc#816603 SwWW8ImplReader::ParseTabPos: make this non-staticMiklos Vajna
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 Vajna
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-07fdo#42144 WW8 export: avoid writing pointless empty footersMiklos Vajna
Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I guess), when header was enabled, actually empty footer was exported, even in case footer was disabled. (cherry picked from commit 4144cd5a851466778004af9de98dbcfb019067bb) Conflicts: sw/qa/extras/ww8export/ww8export.cxx Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a Reviewed-on: https://gerrit.libreoffice.org/3797 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-07SwPostItMgr::Delete: fix crash when layout is not yet readyMiklos Vajna
pPostIt is 0 when we have a large document, and the layout is not yet ready for a later part of the document, having a comment. Just don't try to delete such comments, better than a crash. (cherry picked from commit 9a7641451dad5c73a936de5361aa3c3f148132d0) Change-Id: I5fd5c908bc7b1feba926214863e84391b9037484 Reviewed-on: https://gerrit.libreoffice.org/3757 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-07fdo#62336 - fix horribly coupled table rendering code to not crash.Michael Meeks
Change-Id: Ie0c5f39f6265e38534a6d0c9743877eef79e5954 Reviewed-on: https://gerrit.libreoffice.org/3687 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-07Belts and braces for crash in null pointer dereferenceFridrich Štrba
Change-Id: I17fa205f16929b913084c8eee320a73416b1eda0 (cherry picked from commit d34a159010fc24e13613058d25a9d6b56f7855bd) Reviewed-on: https://gerrit.libreoffice.org/3605 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-05-07fdo#62643 sw: fix autocomplate wrt. adding to a partially finished wordMiklos Vajna
This partially reverts commits 1eee77f2c2b4fa5f693708218c74a8f3909649a6 and 51f9e894f46e718200a14bcd61e9e44c64bc5396. (cherry picked from commit d92932744fdbaa78cec8dd8b991d5f442f6eef4b) Conflicts: sw/source/core/doc/acmplwrd.cxx sw/source/ui/docvw/edtwin.cxx Change-Id: Ie6a1202e139a0eb30cac482a2bb528ef70c7797f Reviewed-on: https://gerrit.libreoffice.org/3580 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-07fdo#62147: sw: ODF import: apply styles in cells with string-valueMichael Stahl
Apply the table-cell-style to paragraphs inside the table cell for cells with value-type="string" and office:string-value attribute. This should complete commit 1b5839f49c07beb6fbde6c7370a5636d22f9ab77. Change-Id: Ief34de1e7c5087906ea597ce3ca96e020f6eebe6 (cherry picked from commit 84217e299724b8ee80dff63cb561b4bae0f44835) Reviewed-on: https://gerrit.libreoffice.org/3575 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-05-06fdo#63023 incorrect RTF background color in headerMiklos Vajna
(cherry picked from commits 3d4fef85d05269e613316a7af6245f05d207d76e and 08dc5de900b2e5cca9d9443fc5d4ea7756842af9) Change-Id: I33f5c8a856206860ac9cdb23dd6b5222cb785bf7 Reviewed-on: https://gerrit.libreoffice.org/3461 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-02make parent style for 'frame contents' be 'standard' rather than 'text'Luboš Luňák
The actual reason for this change is a .docx document, which has a textframe and a modified 'text' style. The textframe in MSO has 'normal' style (which is like our 'standard') and so the style is not written to the docx. LO however uses 'frame contents' for the textframe, and since it was based on 'text', it used the modified style, unlike in MSO. But even on its own, this change seems to make sense. It's similar to 4014d40c96b9d70796a154f0ac48cf5b685cf187, and I see no particular reason why contents of textframes should be the same style like the main text of the document, while footnotes, footers, headers, tables, etc. are different. Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0 Reviewed-on: https://gerrit.libreoffice.org/3697 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-02bnc#779630 initial DOCX import of w:sdt's w:dateMiklos Vajna
Also factor out the w:sdt-related methods to a helper class to avoid DomainMapper_Impl become a God object. Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c (cherry picked from commit 3ec2d26dc2017ac4a27483febfc63328632f352d) Conflicts: sw/CppunitTest_sw_ooxmlimport.mk writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx
2013-05-01Merge tag 'libreoffice-4.0.3.2' into suse-4.0Petr Mladek
Tag libreoffice-4.0.3.2 Conflicts: basic/qa/cppunit/test_vba.cxx basic/source/runtime/step2.cxx dictionaries helpcontent2 instsetoo_native/util/openoffice.lst libvisio/UnpackedTarball_visio.mk sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbavalidation.cxx solenv/inc/minor.mk sw/qa/extras/ooxmlimport/ooxmlimport.cxx translations Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed
2013-04-30bnc#816516: Implement easy access to the recent documents.Jan Holesovsky
This adds a dropdown to the 'Open' toolbar tool. Change-Id: I5b4aa99476e721c1479152b46bbc79cc0b095318
2013-04-29n#592908: docx import, fixed handling of w10:wrapCédric Bosdonnat
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of w10:wrap tag in oox, but thus no wrapping was imported any more. The fix consists in letting the w10:wrap element be handled by writerfilter's dmapper if the shape has already been retrieved from oox (which is the case for textboxes). In other cases, make sure that we don't set the Surround property once again in writerfilter as that would override what has been done in oox. Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
2013-04-25fdo#60280: sw: restore anti-aliasing for all OLE objectsMichael Stahl
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the anti-aliasing always but reset it only for Charts. (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e (cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c)
2013-04-25fdo#60280: sw: restore anti-aliasing for all OLE objectsMichael Stahl
The OLE case in SwNoTxtFrm::PaintPicture() was mis-merged to modify the anti-aliasing always but reset it only for Charts. (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) Change-Id: I0d740e621c3fd71f308d980581edb3c16308c06e (cherry picked from commit 954d695827431a5badd1a993d8f364c669ca9c9c) Reviewed-on: https://gerrit.libreoffice.org/3589 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit f3e8a9649ac653eafaf8c5fa57e20d3dbe90d82c) Reviewed-on: https://gerrit.libreoffice.org/3594 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-04-16fdo#61193 fix crash on RTF paste of footnoteMiklos Vajna
Regression from 232ad2f2588beff50cb5c1f3b689c581ba317583. (cherry picked from commit e7664052d6693598e773f4c9dd6b819213d80d60) Change-Id: Ia0873851979df5bba0a4693f044aab2aeff2b8e4 Reviewed-on: https://gerrit.libreoffice.org/3404 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-04-13Resolves: fdo#48039 use same algorithm for assigning get/set replacement idsCaolán McNamara
i.e. use the same algorithm for assigning replacement ids for both get and set exp fields. Otherwise, consider for ex. 1. fields exists with ids of 1 and 2 in master document 2. a field exists with id of 1 in subdocument and must be reassigned a new id to not collide with the pre existing master ids In get orig algorithm assigned first unused slot of master to subdocument field i.e. 0 unused in master, so subdocument:1 converted to master:0 In set orig algorithm sorted all used master slots and assigned largest used id plus 1 (therefore unused) to subdocument field i.e. largest id used in master is 2, so subdocument:1 converted to master:3 so get can't find set and error's out with: Error: Reference source not found Change-Id: Ie8758dc22cf8deeeeff079532284e57eeaf4a9bd (cherry picked from commit 74d942fb2396a268adfcc915e75b8b32fae851dc) Reviewed-on: https://gerrit.libreoffice.org/3346 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-04fdo#51916 don't try to support nested tables having table styles for nowMiklos Vajna
Also fix an out of bounds substring access, triggered by the same bugdoc. (cherry picked from commits 7a7d77f97b61ae7f602ed403ecfbbcdb03a06c00, 7006ef460bb68d27a74381fab7b8826b786b31c6 and 008275d56f9ac5248f0e94f606671b4c1993ca20) Change-Id: I7db46ef17b8aed443faa7eb0c13b6ba109242cc1 Reviewed-on: https://gerrit.libreoffice.org/3199 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-04-04fdo#32082: Do not reset number format in table cells on edit.Jan Holesovsky
When we changed the default to _not_ to recognize the number formats in table cells (commit 334c34e4ec803c65e43abf20edbc6faf7fa95e76), it caused that any edit of a number formatted cell had reset it to text on edit. This was quite unexpected, because when eg. there was a number that contributed to a sum, and it changed to text, the sum changed as if there was a '0' there. To solve this, try hard to retain the number format regardless of the 'Recognize Number Formats' setting when there was a number formatting assigned to the cell. Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7 Reviewed-on: https://gerrit.libreoffice.org/3187 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-03Keep semantics, but improve readibility.Jan Holesovsky
Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308 Reviewed-on: https://gerrit.libreoffice.org/3186 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-04-02SwFrmFmts: MSVC does stupid things with dllexporting templatesMichael Stahl
... so work around that. Was triggered by new use of std::vector<SwFrmFmt*> in 1c22545edf9085b9f2656ca92781158b6b123db3 Change-Id: Ibf2aa521c7561d3973c8293aacdf71353e6d65aa (cherry picked from commit abccbae3d8376d7f8b79d517a758daeac08af003) Reviewed-on: https://gerrit.libreoffice.org/3177 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-02Output typeid().name( ) in layout dump for easier debuggingCédric Bosdonnat
Change-Id: I12c0583b73200fa9fa4d4d56be464b1467149630 (cherry picked from commit ba71c346d6ac60b2c49caed81673d4ca498a6f1e)
2013-04-02bnc#793998 SwTxtFormatter::FormatLine: fix missing repaintsMiklos Vajna
The incorrect SwLineLayout width caused a missing repaint when a character is inserted after the tab in the bugdoc, see the already existing sw/qa/extras/ooxmlimport/data/n793998.docx. Change-Id: I685203eeb2ed4236758d65132069cd894ece488c (cherry picked from commit 5dc729cae00e6ea35f5dde13eba89434be2d7dc5)
2013-04-02n#793998 SwTxtCursor::GetCharRect: respect TabOverMargin compat modeMiklos Vajna
Change-Id: I47280399bd9e0757365db8f4f1930efd0a340424 (cherry picked from commit 5e992f88d9f78a062bd78ea8907fa247f1f49b5f)
2013-04-02n#802888 SwEditWin: let fields have priority over header/footer flysMiklos Vajna
http://people.freedesktop.org/~vmiklos/2013/watermark-field-click.odt is a reproducer, double-click was catched by the fly frame from the header, so the field edit dialog didn't appear. Change-Id: Ibd3ea382085fa4cbdc1af73d4be1e5c053a81eaa (cherry picked from commit 61f467c8974d6b6face41e7027d75ae4ddb6fdb2) Conflicts: sw/source/ui/docvw/edtwin.cxx
2013-04-02bnc#802888 SwPageFrm: let macro fields have priority over background objectsMiklos Vajna
The intention is to get similar behavior as 61f467c8974d6b6face41e7027d75ae4ddb6fdb2, except this applies to single clicks, while that one affected only double-click. Change-Id: Idddc26aa8cd064f89fb4f99b3ad7a5430ac455bc (cherry picked from commits a996678ed30804e16103e1cfdc439c8546e5d3b0 and e76e2c4ce76457e518b007b970e1b0c2742f8d6e)
2013-03-29fdo#30983 RTF filter: fix handling of RTF_PVPG and RTF_PHPGMiklos Vajna
There were two issues here: 1) The export filter never exported these keywords. 2) The "flymaincnt" RTF extension we inherited from OOo actually never worked (i.e. it's like this since 7b0b5cdf, the initial import...), as RTFVertOrient / RTFHoriOrient's second parameter was stored in 1 bit, so text::RelOrientation::PAGE_FRAME (7) was read back as 1 instead. Note that I want to get rid of this flymaincnt extension in the exporter anyway soon, so killing the RTFVertOrient / RTFHoriOrient duplication is pointless: the sw version will go away. (cherry picked from commit b4845db4260db70cb3aaf03758cb4a1ca5fa88ed) Change-Id: I5335567833ecf87e6b0ba7c73150a7b95c57f237 Reviewed-on: https://gerrit.libreoffice.org/3081 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-03-28fdo#62360: fix word breaking in Writer for spell checkingLászló Németh
Change-Id: I0f23e9f7f076f3a82d1d5df92d9d4d3919fc816d Signed-off-by: Andras Timar <atimar@suse.com>
2013-03-28fdo#37716 implement import of RTF_NOWRAPMiklos Vajna
(cherry picked from commit 9c06d2bd253ad6a50141a5b51409dbdffcfd9e6d) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ic2c0f4c1924811a6ee1c40221db447babdd74a3a Reviewed-on: https://gerrit.libreoffice.org/3113 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-03-28fdo#60513: SwCrsrShell::Push(): take position from table cursorMichael Stahl
If there is a table cursor, store its point/mark position on the cursor stack instead of pCurCrsr, which in this case is just one cell in a ring that contains a SwShellCrsr for every selected cell. SwCrsrShell::Pop() is surprisingly able to restore the prior state, because it calls UpdateCrsr(), which detects that the pCurCrsr spans multiple table cells and re-creates pTblCrsr, and then later on the first GetCrsr() call SwTableCursor::MakeBoxSels() will restore the ring of SwShellCrsrs from the pTblCrsr selection. Change-Id: Ibe9a7f379ece61c7dab1a6f69abaebf42a4c85ec (cherry picked from commit b227a8e4d65e4bbfe991aed9342fe3e30eca8639) Reviewed-on: https://gerrit.libreoffice.org/3100 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-27fdo#53442 SwTxtPaintInfo::_DrawBackBrush: color multi-para comment rangesMiklos Vajna
(cherry picked from commits 82b29b9d384211061653f35695287be60dbc99b8 and 5ddcaa86003c6a28c4a9b307cdf3b37deabaa5a4) Change-Id: Ieb9a33cda8297b432e1d0ea8224ba9231b6ac2c1 Reviewed-on: https://gerrit.libreoffice.org/3094 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-26fdo#59273 import w:tblLayout of DOCX tablesMiklos Vajna
Also add missing <w:tblLayout w:type=fixed/> to the bnc#780645 testcase to avoid breaking the build. (cherry picked from commits 7329df74df134a77d078f47d5c8b70d54c5d1edb and 4821d894f849a4939bbe6fb0a9a5ddd9e10b0467) Conflicts: writerfilter/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/DomainMapperTableManager.hxx Change-Id: I9af50a4c176168e2794eaa9b0e8eaeb6b9d06b13 Reviewed-on: https://gerrit.libreoffice.org/3058 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-03-26fix fdo#62670 - TABLE: Splitting a table options are mixedJoren De Cuyper
Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Reviewed-on: https://gerrit.libreoffice.org/3043 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-03-26fix fdo#62670 - TABLE: Splitting a table options are mixedJoren De Cuyper
Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Reviewed-on: https://gerrit.libreoffice.org/3042 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-03-25fix fdo#62050 : Initially disable RTL for comment window.navin patidar
In RTL UI, comment window is RTL and editbox’s (editeng) default writing direction is LTR. and i suspect, the bug is result of this RTL & LTR mix-up. Change-Id: If3af4ae428b67151d66661907b9e60a97049e0e6 Reviewed-on: https://gerrit.libreoffice.org/2831 Reviewed-by: abdulmajeed ahmed <aalabdulrazzaq@kacst.edu.sa> Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa> Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa> (cherry picked from commit 79dd315e9b19ec3bc6601c359a0ecb6d576d4aa8) Signed-off-by: Lior Kaplan <kaplanlior@gmail.com> fix fdo#62050: for impress Impress is also affected by fdo#62050. In RTL UI, comment window is RTL and editbox’s (editeng) default writing direction is LTR. I suspect, bug is result of this RTL & LTR mix-up. Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf Reviewed-on: https://gerrit.libreoffice.org/2922 Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa> Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa> (cherry picked from commit 092bf2fb0052ca73855127dc03ff1ae3f9321506) Signed-off-by: Lior Kaplan <kaplanlior@gmail.com>
2013-03-25fdo#60922 ignore DOCX import of w:position w:val="0"Miklos Vajna
(cherry picked from commit cadb3433b395b53a9eda584ed5fee79ca74e7483) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I10e9c0f1078e36710335a9a48f7f02292c764795 Reviewed-on: https://gerrit.libreoffice.org/2981 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-22fdo#60769 implement odf export of multi-paragraph comment rangesMiklos Vajna
(cherry picked from commits 287c254d5ebf9b58ca63a8c271e523adf0d34b82 and 1fba17854b2be4fdbe436f44da3ae57a1f75a27c) Conflicts: sw/qa/extras/odfexport/odfexport.cxx Reviewed-on: https://gerrit.libreoffice.org/2873 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com> (cherry picked from commit 473cd59a71706ada01f8be68c7dfd008ca9bb716) Change-Id: Ic4a5a1bc685917f2b26be4ab645203f706719c80 Reviewed-on: https://gerrit.libreoffice.org/2908 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-03-22fdo#62288 fix RTF import of table paragraph marginsMiklos Vajna
Regression from 4a507f732d82c188ad81b022cbe3037951e58ac3. The problem was that in some cases \pard can't reset all paragraph properties. The original commit just made this keyword a noop when it occurred between \cell and \row, but this is too much. At least margins do need resetting. Change-Id: I5cbb1df72bf1211f85ef69ab64d5b46cbce5c742 (cherry picked from commit 24d5261f5a122e22675210445056cdf67663237b) Reviewed-on: https://gerrit.libreoffice.org/2906 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-20fdo#60769 implement odf export of multi-paragraph comment rangesMiklos Vajna
(cherry picked from commits 287c254d5ebf9b58ca63a8c271e523adf0d34b82 and 1fba17854b2be4fdbe436f44da3ae57a1f75a27c) Conflicts: sw/qa/extras/odfexport/odfexport.cxx Change-Id: Ifb850438586eb6589fde79d10ed9eef727368f42 Reviewed-on: https://gerrit.libreoffice.org/2873 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-03-20fdo#55814 SwDoc::UpdateExpFlds: hiding the last section may be safeMiklos Vajna
In case we know there is a non-section paragraph at the end of the document. Intentionally not adding a unit test as David Ostrovsky is working on one already. (cherry picked from commit 62344016de056965a58ea2016d912a68eac0d6b0) Change-Id: Ia6026846981b5af014246a8a604c5f762d34c891 Reviewed-on: https://gerrit.libreoffice.org/2876 Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-03-18fdo#61909 fix import of RTF_HIGHLIGHT and of default font without RTF_PLAINMiklos Vajna
(cherry picked from commits 60c17b2873506ed8b068b34840aecda0c1d9bd65 and c412cba28ebc00783041bcec74978fc959cc1351) Change-Id: Ifa7b14e88231e5053c84dfbdd9b453715df1aaa6 Reviewed-on: https://gerrit.libreoffice.org/2817 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>