summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
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-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#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/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#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>
2013-03-18fdo#34800 Comments added to footer are placed at the right top of the page.Joren De Cuyper
I also merged (manually) the changes of the cleanup commit of Michael Stahl ( commit id 859e94294bdfd8595c88dd7f14da09ead8b32a45 ) Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5 Reviewed-on: https://gerrit.libreoffice.org/2572 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2777 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-18fdo#61952: sw: fix left/right-only page styles and first-pageMichael Stahl
- remove PD_FIRST and GetFirstFmt: This flag makes no sense at all, since there are no "first-only" page styles (while there are left-only/right-only). - instead add a parameter to GetLeftFmt/GetRightFmt to request a first page format, if such exists and is not shared (regression from 02a934d03b101ce463a232f9cbb7b43e684de37e and fa0f42bafbf24e9141ddee728b160b5ab47077f2) Change-Id: I4d50c2c0cc4f3cf231eacba891df22d0bcf6c4df (cherry picked from commit 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a) Reviewed-on: https://gerrit.libreoffice.org/2764 Tested-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-18let LibreOffice find html.stw (regression from 1b0f7ee1)Andras Timar
Change-Id: I6ae07e61b67fa321e80605e6e3a6fcdd56012b95 Reviewed-on: https://gerrit.libreoffice.org/2790 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-15fdo#62360: fix word breaking in Writer for spell checkingLászló Németh
Change-Id: I0f23e9f7f076f3a82d1d5df92d9d4d3919fc816d Reviewed-on: https://gerrit.libreoffice.org/2737 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-14WaE: various warngs, e.g. unused argument, variables, orderingCaolán McNamara
Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3 (cherry picked from commit ed740489ed39e0fc3ec43e3f3a1e6e9e366a2c5e) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-03-14hackaround for assertCaolán McNamara
regression since 1c22545edf9085b9f2656ca92781158b6b123db3 Change-Id: Ia9aa06ed7fd0f31499226521fc5d6052b6d21704 (cherry picked from commit f42679fe7010284513cff3560d9aa47a49744ba8) Reviewed-on: https://gerrit.libreoffice.org/2722 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-14Fix #i120928: Import Graphic Bullets of MS Word DocumentJian Hong Cheng
* sw/inc/numrule.hxx * sw/source/core/doc/number.cxx * sw/source/filter/ww8/attributeoutputbase.hxx * sw/source/filter/ww8/escher.hxx * sw/source/filter/ww8/rtfattributeoutput.cxx * sw/source/filter/ww8/rtfattributeoutput.hxx * sw/source/filter/ww8/rtfexport.hxx * sw/source/filter/ww8/rtfexport.cxx * sw/source/filter/ww8/writerhelper.cxx * sw/source/filter/ww8/writerhelper.hxx * sw/source/filter/ww8/wrtw8esh.cxx * sw/source/filter/ww8/wrtw8nds.cxx * sw/source/filter/ww8/wrtw8num.cxx * sw/source/filter/ww8/wrtww8.cxx * sw/source/filter/ww8/wrtww8.hxx * sw/source/filter/ww8/wrtww8gr.cxx * sw/source/filter/ww8/ww8attributeoutput.hxx * sw/source/filter/ww8/ww8par.cxx * sw/source/filter/ww8/ww8par.hxx * sw/source/filter/ww8/ww8par3.cxx * sw/source/ui/wrtsh/wrtsh1.cxx Graphic Bullets Fidelity Patch by: chengjh,<chengjh@apache.org> Found by: chengjh,<chengjh@apache.org> Review by: Fan Zheng,<zheng.easyfan@gmail.com> Conflicts: sw/inc/numrule.hxx sw/source/filter/ww8/writerhelper.cxx sw/source/filter/ww8/wrtw8nds.cxx Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197 Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2013-03-14Fix issue #i119405: Numbering text style changed after importing the *.docJian Hong Cheng
* main/sw/inc/doc.hxx * main/sw/inc/IDocumentContentOperations.hxx * main/sw/inc/ndtxt.hxx * main/sw/source/core/doc/docfmt.cxx * main/sw/source/core/txtnode/thints.cxx * main/sw/source/filter/inc/fltshell.hxx * main/sw/source/filter/ww1/fltshell.cxx * main/sw/source/filter/ww8/ww8par.cxx * main/sw/source/filter/ww8/ww8par.hxx * main/sw/source/filter/ww8/ww8par3.cxx MS Word Binary compatibility Patch by: Fan Zheng,<zheng.easyfan@gmail.com> Found by: Jian Hong Cheng,<chengjh@apache.org> Review by: Jian Hong Cheng,<chengjh@apache.org> Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> Conflicts: sw/source/filter/inc/fltshell.hxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx (cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474) Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c (cherry picked from commit 1c22545edf9085b9f2656ca92781158b6b123db3) Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2013-03-12more regex fixes, fdo#60259 relatedEike Rathke
fdo#60259 prevent crash when searching backward for $ anchor regex Old code wasn't prepared that searching for $ may actually return a result set pointing behind the search string which it does with the ICU regex engine. (cherry picked from commit c00601dab0f5533b152cd63cec0a89bfec1ba95f) Conflicts: i18npool/source/search/textsearch.cxx regex: handle zero-length matches, fdo#60259 related Also in backward search ignore all zero-length matches except the text end single $ anchor search. The anchor search is a valid match, treat it as such in Writer. This still doesn't solve the backward $ backward search, the convoluted Writer code in that place apparently never worked, someone more familiar with those internals should straighten out the mess. (cherry picked from commit 3bc5cb3c485d67f1ce0541d349d11637f52ebda5) regex: don't loop 10000 identical matches to find a single $ anchor (cherry picked from commit ccc349d3abb70ef38cd2b7706da51b060a385908) make forward replacement of $ work again, fdo#60259 related broken with 3bc5cb3c485d67f1ce0541d349d11637f52ebda5 (cherry picked from commit d8dcfa0e5dbecf77c4d6a8d49caf61b339cf9b43) Change-Id: I6b5eb28d0a54ceecb6873a3c05f18f70312ab1a2 Reviewed-on: https://gerrit.libreoffice.org/2679 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-12various regex fixes squashed into oneHerbert Dürr
i#118925# enhance textsearch's match-group references to work for look-ahead/look-behind (cherry picked from commit 3b83c404c56e5db5bab29ffee41f02822410d625) Conflicts: sw/source/core/crsr/findtxt.cxx (cherry picked from commit 9a93475d6eba53b2e1fba1585dbd11c94ea4b4a3) Conflicts: sw/source/core/crsr/findtxt.cxx i#120598 better emulation of regexp word-start and word-end operators The emulation of the word-start and word-end operators provided the previous regexp engine can be approximated much better by using the ICU-regexp exngines powerful look-around feature. Patch-by: Herbert Duerr Found-by: ldgolds33@yahoo.com (cherry picked from commit ec7ef30693f10315ce80a8f5d7325a0e40855e66) (cherry picked from commit 8c26876fea085a1bc847abba63dffa97a9499c1d) i#121482# fix attributed text search for regular expression patterns (cherry picked from commit e7fc662799e7e936753e24db8d6d3849c12b3ff4) (cherry picked from commit e6288a5d889da7db5bf23174f85c29ccfcaa44d5) i#121482# fix backwards regexp search for matches overlapping search start (cherry picked from commit 854f4ad6c57be62bd922df08f603d8bfb7b918a5) Additionally fixed unit test, searching backward shall not produce a different result from searching forward. (erAck) (cherry picked from commit b514f0ce86e85d9be269ddf2e797befbbf3423f1) i#121633# fix search for upper-case character classes in ignore-case regular expressions (cherry picked from commit b7ee1803453d3a766ce3a833892e1c208aacf8ff) (cherry picked from commit 531538892795bec909bb8baff6bbf9e19baf809e) i#121633# fix ignore-case problem caused by i18nsearch API mess (cherry picked from commit 7644ec176049937b588fe171a553c9a07b375792) (cherry picked from commit f932a3f1195290f9aa37b593190bd4c6ac5fe2f6) Change-Id: I44d6216b12f17d0560c4e8cf355937797ddeee2a Reviewed-on: https://gerrit.libreoffice.org/2678 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-08SwTableBox::IsValidNumTxtNd: Allow trivial formattingMiklos Vajna
Not allowing flys or footnotes during string -> number conversion is fine, but I don't see what's the reason for rejecting simple formatting (like bold) completely. (cherry picked from commit 332fa1344aaaf8ff190c594fe5829cf1551c5211) Change-Id: I8f54aebeb6ea35d099a88570d3f7d365c7325dc0 Reviewed-on: https://gerrit.libreoffice.org/2606 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-08fdo#61343 fix DOCX import of OLE object after groupshapeMiklos Vajna
Change-Id: I88d5e49cc3fb915d25c1b2576cdda1fffc9e2f23 (cherry picked from commit 344e4a25eac6505678f4ce8a6c1c8cef83c68276) Reviewed-on: https://gerrit.libreoffice.org/2587 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-07fdo#56272 SwAnchoredDrawObject::_SetPositioningAttr: fix positionMiklos Vajna
This reverts a part of 51cfbf0cfaec395a99a00f2c20fcba96de9a4427, that is no longer needed, but causes incorrect drawing objects position. The problem was that a non-zero position doesn't mean the layout in a later iteration doesn't change the position, but the referred commit didn't allow later iterations to fine-tune the position. (cherry picked from commit 4ae71885ec61f87c46285150ef4ca84192627b7a) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: Id91a4c6952d1b58e0c5bc0b1a60991a284c29ddc Reviewed-on: https://gerrit.libreoffice.org/2547 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-07fdo#60722 RTF filter: shape import fixesMiklos Vajna
- fix line color default - fix line width default - fix z-order of shapes (cherry picked from commits 9c7dbd9e1d2a131402a80e377630fe1ab5381a47, cf2a1277acd4a29492f056a626b13e903d391027, 1eaab77c718ffa254068ae6032862dfb5a03db67 and ea66024d4da38a619f44c941b65e6a28b74214b9) Change-Id: Ib6097c844b2bc929c6ece31bcec62f27bfbf386c Reviewed-on: https://gerrit.libreoffice.org/2569 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-07fdo#59638 import of DOCX w:lvlOverride / RTF_LFOLEVELMiklos Vajna
Also handle RTF_F inside RTF_LISTLEVEL. 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 commits 521586b328305c4466603438a9931993b92873c6, 2f82a08d3565239c2bfe8d21fbebd89bd4657708 and 58c30a3545a5725d704eabd79071db02f1f2cb23) Change-Id: I1491f07c40953949e381a035c1596c207cdc4c35 Reviewed-on: https://gerrit.libreoffice.org/2503 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-04fdo#60886: _SetGetExpFlds: use the custom operator<Michael Stahl
The calls to upper_bound in SwDoc::FldsToExpand and SwDoc::FldsToCalc unfortunately compare the pointers and not the values pointed to, which causes all sorts of trouble around non-updated fields. (regression from 2815396a1813cb3956c5aba066de49a7f34bc657) Conflicts: sw/source/core/doc/docfld.cxx Change-Id: I48817247719671a16821fcb851b17b628c960a66 (cherry picked from commit 9ca5383abfb7f2f785e9f2e2d5b2565b9a60bbab) Reviewed-on: https://gerrit.libreoffice.org/2504 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-01sw: remove CH_TXT_ATR_FORMELEMENT when CheckboxFieldmark is deletedMichael Stahl
Change-Id: I5f58b558b15f7d11b75554195e10a258d027bcfc (cherry picked from commit 75b2f6b241046d4467a7c0c9cbf49b4533b46045) Reviewed-on: https://gerrit.libreoffice.org/2467 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-03-01fdo#61016: sw::marks::MarkManager: delay deletion of text fieldmarksMichael Stahl
There is a STL assertion in deleteMarks because the ReleaseDoc call will recursively call into deleteMark again and delete marks that are in the vector vMarksToDelete up the stack. Change-Id: I9139b174f8a518a551a3ca8520396202c306abcf (cherry picked from commit 5bf6797e81d54177508d3eb370e8242e3b58a3f8) Reviewed-on: https://gerrit.libreoffice.org/2466 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-28fdo#61507 import/export RTF_UPR and RTF_UDMiklos Vajna
In short, these commits make the RTF filter import and export unicode characters in document title properly. Previously we failed to import such files from Word, and the export result caused problems in Wordpad (Word handled it fine). (cherry picked from commits 0805b222f87bf99ec0c53ca678d1c670eb5293a2, 3a934d928e455eca38f124072c20a624a64aa225 and 5de52551a963b932cc23c2ea75f709fa1924520b) Change-Id: Ic9417d0f23d44149acb3ae3dc9d4c281058a1b36 Reviewed-on: https://gerrit.libreoffice.org/2436 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-02-28#c708928# avoid double free errorHerbert Dürr
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-28fdo#53985 DOCX import: don't try to set empty PageDescNameMiklos Vajna
Regression from 50cb1667020494906afaacb68d4163d1eda527cf. Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2013-02-25fdo#61428: SwTxtNode::ReplaceText: brown paperbag fixMichael Stahl
Fix the optimization to return only if both replacement and replaced strings are empty. (regression from b6d45f26ea5bcc848737921b59a16253eb1d8587) Change-Id: I984fb151a5ac3e6eb8d03f854ad6a3df88f96000 (cherry picked from commit 3e6a0b6d04722d43a1fc8d3745b5e79b7ced90eb) Reviewed-on: https://gerrit.libreoffice.org/2407 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-02-25Resolves: fdo#56031 RSID attr changes drop content change eventsCaolán McNamara
So if we have an INVALID_ATTR event in the queue and receive INVALID_CONTENT, drop the attr and replace it with invalid-content And anyway filter out the RSID change event from hitting the a11y queue, humans don't care that this changed, it's just noise Change-Id: I4842f217153fc90aa1dce75c3445053004c74536 (cherry picked from commit 8d08ccd5b84c121867d7b3102f9d10b26005c682) Reviewed-on: https://gerrit.libreoffice.org/2401 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-25n#779642: Fixed floating tables import in writerfilterCédric Bosdonnat
(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b) Change-Id: Id60a08811f238db505d51b0e1381427a8f5df9cf Reviewed-on: https://gerrit.libreoffice.org/2307 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-25n#779642: ignore framePr inside table or the table import won't workCédric Bosdonnat
(cherry picked from commit 874f0a1be443b8027d5aba2285866f31cf4169e5) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I72996da79ca22a09fb490d06bcd34f741d7093ac Reviewed-on: https://gerrit.libreoffice.org/2306 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-21Related: fdo#60920 various efforts to consistently apply HIG rulesCaolán McNamara
(cherry picked from commit 76bc43823a53d76e49260a601e893bc1a791fb03) Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88 Reviewed-on: https://gerrit.libreoffice.org/2301 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-20fdo#59928: sw: fix mouse selection of fields differentlyMichael Stahl
Unfortunately selecting the field in SwEditWin::MouseButtonDown() prevents the click field handling code in SwEditWin::MouseButtonUp() from running. Instead select the field in MouseButtonUp and SwWrtShell::ClickToField(), which seems to work better. (regression from 94721b2aec614e0d99504138d484b2ad6cd550c7) Conflicts: sw/source/ui/wrtsh/wrtsh2.cxx Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5 (cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671) Reviewed-on: https://gerrit.libreoffice.org/2286 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-02-19apparently there's no ssize_t on windowsLuboš Luňák
Change-Id: Ic9aef7fe5295b7dae6f5b7ee7f28378d393cbfe4
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextOnlyMichael Stahl
Change-Id: I1ca2075ab99fe1b09df700f55645b44f38cf5bcc (cherry picked from commit 0e49d87d92a3f1aeeeda547f1a7e710dcd4fee95) Reviewed-on: https://gerrit.libreoffice.org/2182 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: check max size in SwTxtNode::ReplaceTextMichael Stahl
Also adjust SwUndoReplace to not assume that everything was inserted and use the stored indexes instead in Undo. Change-Id: I52f3aaf063c2b1bd52381bdc19e29a41a12c3847 (cherry picked from commit b6d45f26ea5bcc848737921b59a16253eb1d8587) Reviewed-on: https://gerrit.libreoffice.org/2181 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: make callers of SwTxtNode::InsertText more robust:Michael Stahl
Return the actually inserted string from InsertText(), so callers can check if the insertion was actually successful. Especially InsertHint() will likely cause problems if it cannot insert its CH_TXTATR; also Undo objects should not Undo more than was actually inserted. Change-Id: I87c9ea8b226ae4a2a6c20c112da76db07051a1bf (cherry picked from commit d47218d79a2440e71efb66b2224063801ba6623b) Reviewed-on: https://gerrit.libreoffice.org/2180 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19fdo#60732: SwTxtNode: limit to less than STRING_LEN charsMichael Stahl
It's not a good idea to have STRING_LEN characters in a SwTxtNode because then there is no valid SwPosition at the end of the paragraph. Also it turns out that LO 3.6 and 4.0 do rather stupid things with a full SwTxtNode. So enforce a limit, at first in the usual places that are used during file import, SwTxtNode::InsertText() and SwCntntNode::CanJoinPrev()/CanJoinNext(). Change-Id: Icb0f44acd20aa81635d42b84d4ae0f9b693a661c (cherry picked from commit 549c0f785d4b6d4bc1b39b22827d77d66f48430a) Reviewed-on: https://gerrit.libreoffice.org/2179 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
generated by cgit (git 2.34.1) at 2024-06-26 12:24:51 +0000