summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2014-05-27fix build-break on windowsChristian Lohmaier1-1/+2
ae95cdd2a1708a8e9e114dd9bcf577f57f1f5af3 introduced a check, and did put it outside of a #if !defined(WNT) block... Change-Id: Id200c6f3161d0c6c611e0b1c293adbd060579cd7
2014-05-27various situations where graphic go missing on saveOliver-Rainer Wittmann4-13/+25
Resolves: #i114361# provide and accept changed URL... of embedded graphic file during save (ODF export) (cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/core/unocore/unoframe.cxx sw/source/filter/xml/xmltexte.cxx xmloff/source/draw/shapeexport2.cxx (cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d) Conflicts: sw/inc/ndgrf.hxx Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986 Resolves: #i124946# only apply new embedded stream name... for a graphic, if is already has one. - needed correction for the fix made for issue #i114361# (cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/xml/xmltexte.cxx (cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8 Resolves: #i124966# keep picture format information - <GfxLink> instance - also for the reading of preview picture data in order to avoid trouble on save in case that the preview data equals the picture data (cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366) Conflicts: svx/source/svdraw/svdograf.cxx (cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d Reviewed-on: https://gerrit.libreoffice.org/9456 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-26bnc#863018 WW8 import: fix upper margin of multi-page floating tableMiklos Vajna6-9/+46
A vert orient position was already handled in case a floating table was imported as a TextFrame, but in case we didn't do that, the vert orient position was simply lost. Fix this by importing it as the upper margin of the table (assuming that the position is relative from the anchor position). (cherry picked from commit 3755c87d0426a499d4755e82d8fbc77caa240764) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I3e96f3068605fd6313dfb3e55483e1bce6c063a5 Reviewed-on: https://gerrit.libreoffice.org/9487 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-05-26fdo#78900 RTF import: allow \dpxsize inside \dptxbxtextMiklos Vajna1-0/+11
Previously we assumed that they always appear under \do directly. Change-Id: Ie3a978da856986f604a3815d6127abb4191323c0 (cherry picked from commit 21c11ffe254612ac46aa891addacb0024d5b93f0) Reviewed-on: https://gerrit.libreoffice.org/9488 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-26fdo#79008 Crash: File getting crash while saving in LODinesh Patil3-2/+11
File is getting crashed while saving in LO, as it tries to access the value of vector after erasing that value. Code changed to access the vector value first and then erase that value from vector. Change-Id: I29369b7582fdbd7363d0e6fdae091a30c79a747d Reviewed-on: https://gerrit.libreoffice.org/9433 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ed3fd76b65b2a281effea55b8a55101a8b740aec) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx
2014-05-26Resolves: fdo#79139 Crash in SwDropCapCache::CalcFontSizeJulien Nabet1-1/+1
Minimum of nMaxFontHeight must be at least 1 Cherry-picked from 06afd4067f7bc321d7dd0a4e8c235b0b21e3d49a Change-Id: I35462fc069c7026958e597c2e0605345ed009c91 Reviewed-on: https://gerrit.libreoffice.org/9458 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-25fdo#77454: fix WW8 import/export of negative image cropMichael Stahl4-16/+57
The negative crop values were imported as large positive values, which caused the image to be rendered with 1 pixel width after commit 2e5167528f7566dd9b000e50fc1610b7bf99132a. (cherry picked from commit 6d431ffb682d0e64b75b6267f369822ff0b0617e) Conflicts: sw/qa/extras/ww8export/ww8export.cxx Change-Id: I0e01b9d9a05d90e868699832085a06ba5aab7e54 Reviewed-on: https://gerrit.libreoffice.org/9470 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-23MSWord uses \xb for linebreaks in DB fields (bnc#878854)Luboš Luňák1-0/+2
Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441 (cherry picked from commit d4a19c4098f4556f05666ed92a85c6138b4f769a) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-05-22fdo#68983: basic: if the library is not loaded fully, copy source storageMichael Stahl3-30/+80
Also fixes fdo#42899 and fdo#67685 in a different way; the previous fix for fdo#42899 caused the problem with password-protected libraries for which the password is not known: only the binary representation of the BAISC module was stored, not the source code; by simply copying from the source storage the problem can be avoided. It would be possible to ask for the password when storing, but that would not work when non-interactive (called via API). An alternative fix would be to pass in the SfxObjectShell::IsSetModifyEnabled() flag and actually reset the BASIC library's modify flag correctly, but that requires adding a parameter to XStorageBasedLibraryContainer::storeLibrariesToStorage(). (regression from af34774d260a68fc02cd78ba90dd8d4afaf1a2a4 ) (cherry picked from commit 5246fa262450f686674850c53df666422f441c86) Conflicts: basic/source/inc/namecont.hxx basic/source/inc/scriptcont.hxx basic/source/uno/namecont.cxx sw/CppunitTest_sw_macros_test.mk sw: use xsec_xmlsec.windows on WNT (cherry picked from commit 3e69b7bcd3e4a9cb1a29360c905e7fba96365999) Change-Id: I4701401f35171139fc2fe8d225d13d4e533091a0 Reviewed-on: https://gerrit.libreoffice.org/9437 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-20-Werror,-Wunused-resultStephan Bergmann1-1/+1
Change-Id: Iaa06237d3e554d3a3d9c87f6c5dba715343afa25 (cherry picked from commit 9cf5e4c2500fc5d579896ea08802aba5ca671c96)
2014-05-20resolved fdo#66620 keywords occur in unquoted context onlyEike Rathke1-12/+92
Change-Id: I4de41e5b66f1a856a786c521ca4ef2eec14c7499 (cherry picked from commit 0d361388060741fe8e2f1ba059fba95707bdc233) Reviewed-on: https://gerrit.libreoffice.org/9405 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-15fdo#78313 RTF import: retain font colorsMiklos Vajna2-0/+34
This is a cherry-pick of two master commits: RTFValue::equals: consider the number of attributes/sprms as well (cherry picked from commit 4452fa9a2e741834a19c9b322fc8d9c8b06450de) Related: fdo#77600 RTF import: RTFValue::equals: compare attribute content Previously only the number of nested sprms / attributes was compared. With this, the font of the bugdoc is correctly Arial, not Times. (cherry picked from commit 8e8f9388c323ad3c32cef3f91609ad19386b7d56) Conflicts: writerfilter/source/rtftok/rtfsprm.hxx Change-Id: I351de414b6734336b31c1334dbd2349072f16002 Reviewed-on: https://gerrit.libreoffice.org/9316 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-14fdo#78384: Fix for corruption if file contains symbols.Rohit Deshmukh2-0/+7
* In case of symbol, symbol character get imported first and then font of symbols. * So we are storing symbol character and when we parse symbol font then create UNO object for text. Reviewed-on: https://gerrit.libreoffice.org/9281 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f51640c5f40d5132b396a9fb6589420383df1610) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: If5b79521c6a59aec02b165e8120dafdd472cdaeb
2014-05-09fdo#77720: Mail Merge: reset cursors after clearing documentMichael Stahl2-0/+4
The root cause for the crash is that the shell has an invalid cursor that does not point at a paragraph; this is because first the document is filled and the cursor is pointed at the content of a frame, then the document is cleared from SwFrmCtrlWindow::Resize() [not sure why?] and at that point the cursor remains on an SwEndNode (which is invalid). Change-Id: I47c1e2a34d5579953c1896ff0895568978e72bc7 (cherry picked from commit abb0549dd1744a35b0464faac55999b0d5968212) Reviewed-on: https://gerrit.libreoffice.org/9288 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-09SwDoc::ConvertFieldsToText(): don't insert empty stringsMichael Stahl1-1/+2
Prevents an assert on accessing sText[0] in InsertString(). Manually cherry-picked from 85a8c1361dccb2c3b98458c2c1c377d5de275d0e to resolve fdo#77720, see bt here https://bugs.freedesktop.org/attachment.cgi?id=97684 Change-Id: I1828694a4c1e46f8b48cf3571ec2bf4dd615bf2c Reviewed-on: https://gerrit.libreoffice.org/9113 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-08Handle bad SwWW8ImplReader::GetCol inputStephan Bergmann1-2/+4
With previously found offenders out of the way, looks like sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc is the only case that triggers this, and that is likely deliberately malformed input. As the whole ww8 parser appears not to be build around robust eager input validation and error signalling, there is little more we can do here than throw up our hands in despair. Change-Id: Idf61fcf14a784cef1539654f2825c013c218987f (cherry picked from commit 9beda5ab8feaeb6d5e1c64e094065b02551532a4)
2014-05-08sw: CheckBookmarks: can't store OOo XML any moreMichael Stahl1-1/+1
Change-Id: Ib9e92043d8483feb47f024ee067f2103625dd031 (cherry picked from commit 00a63ba1c7e89563ea1aeeca46873e3e205e8632) Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-05-08sw: call SwEditShell::CalcLayout to avoid crashesMichael Stahl1-1/+2
(i.e. similar to 83c0018dba00ae0c0cf5b179cfc7a47ce08ff2b7 on master) Change-Id: Ia24c7cadd382b89d43bc2e1081ef85751cb6eca6 Reviewed-on: https://gerrit.libreoffice.org/9262 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-08fdo#75519: fix chapter cross referencesMichael Stahl1-31/+0
It would be possible to modify the condition in SwChapterField::ChangeExpansion() to check for rTxtNd.GetNumRule() as well and make the bugdoc work again, but do we really want to use "chapter reference" to refer to plain numbering? Perhaps it would be better to add a "numbering reference" field type; without investigating what Word actually does here and what the actual problem is that was supposedly fixed here (which is not possible given there's no reproducer document) it's best for now to just revert it. (regression from commit 6319803762d051c4aa645692cde7245a1bbcf7ee) Change-Id: I7eb9ea46e42729c53c350ff450d49a1eb84ee8eb (cherry picked from commit cc0a7699bb79efad488094e33464d4793758ee3f) Reviewed-on: https://gerrit.libreoffice.org/9271 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-08fdo#74790: sw: Compare Document: fix assertions about RSID-only hintsMichael Stahl3-3/+24
For ordinary documents the SwTxtNode::MakeFrm() would set the m_bFormatIgnoreStart/End flags of the RSID-only hints, but the document loaded by Compare Document (and Merge Document) is special because it is loaded, there are editing operations on it, but it has no layout, so the assertions about these flags trigger. (regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291) Change-Id: I8a6e02b68f22e609640adbe93ff194e4081d9856 (cherry picked from commit 80b131038d2375c9855ee5fbe225e75bdad2645e) Reviewed-on: https://gerrit.libreoffice.org/9274 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-03fix crash found when exploring fdo#50697Caolán McNamara1-3/+4
(cherry picked from commit b25871da62facc20387ebfa2b908422578ca8ce9) Conflicts: sw/source/core/frmedt/fefly1.cxx Change-Id: Ie781c2534cb41104dd3d91d4370639e98baa8112 Reviewed-on: https://gerrit.libreoffice.org/9202 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-04-30allow accepting/rejecting changes in a selection (bnc#874790)Luboš Luňák6-48/+115
More convenient than handling them one by one. (cherry picked from commit 160e93607f6c2c3981823b30ee981ca23d4e1a0d) (cherry picked from commit 4a60f9387ddd832f7c164102b76351e5e520d920) (cherry picked from commit 94fc0b4752599601ddf9ff3c9b49da15cffb4882) (cherry picked from commit d46e7dabd3090697c46e24a350cc75f35c28a8f7) Change-Id: Iee02d12d595ee41cff7a31e2bda61425c9f53d6d Reviewed-on: https://gerrit.libreoffice.org/9198 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-30fdo#60967: fix deletion of paragraph following tableMichael Stahl1-1/+4
Surprisingly MovePara(fnParaCurr, fnParaEnd) actually moves to the end of the next paragraph if the current one is empty. Change-Id: I780bf663b19044252f1d4532d5467c3a599c8a49 (cherry picked from commit f5fb361df94449850a83be3b412f68e1f9b949c5) Reviewed-on: https://gerrit.libreoffice.org/9195 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-24crash in selecting text in comments midway in paraCaolán McNamara1-1/+2
(cherry picked from commit 7dca5341d799d59a81e6dac84586fa2daa02a550) Conflicts: sw/source/core/uibase/shells/langhelper.cxx Change-Id: Iaab71e201fae6a03936ccc6aac040027a183209c Reviewed-on: https://gerrit.libreoffice.org/9148 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-04-22fdo#71785: File hangs LibreOffice on SaveYogeshBharate3-2/+24
Problem Description: While saving the file LO shows the error "This file could not be save". The root cause was memory leak. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/6850 (cherry picked from commit 0f6240fa92c443f66441545438821c02b3412486) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Iacc185780c14760056a7d690eb113d4dde1de034
2014-04-22fdo#77600 RTF export: always close URL's before the end of runMiklos Vajna4-0/+42
In case the URL text has multiple portions, then MSWordExportBase generates multiple URL's anyway, and this helps to avoid loosing some direct formatting of the remaining portions of the paragraph. (cherry picked from commit 55c832d86e6cb06e9d6423ce5e6245189bc80da1) Conflicts: sw/source/filter/ww8/rtfattributeoutput.cxx sw/source/filter/ww8/rtfattributeoutput.hxx Change-Id: Ifd72741de610ce69b9ae0978aa8f9a532a3aeed2 Reviewed-on: https://gerrit.libreoffice.org/9124 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-22handle properly page breaks even if a page contains only a frame (fdo#55381)Luboš Luňák2-0/+9
The test document has 4 pages which only contain frames, first 3 pages (sections) have <p> block with <framePr> and another <p> with just <sectPr>, and the second paragraph would be removed, thus there would be no nodes on which to actually set the page style and they would be set on nodes for the previous page, overwriting its page style. The last page does not have its own <p> at all, so it needs to be faked. The changes in finishParagraph() are because of e.g. the comments-nested.odt sw test, which there causes exception because of unknown property ParaStyleName (comments do not use those it seems) and the code is skipped over (which is probably a bug on its own, but it's unrelated to this change otherwise). Change-Id: I9d37f992407a9b649c710d2a031ec4447fb11771 Reviewed-on: https://gerrit.libreoffice.org/9115 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-21Revert "handle properly page breaks even if a page contains only a frame ↵Luboš Luňák2-9/+0
(fdo#55381)" I didn't mean to push without review. This reverts commit a859ff2db69457cc98c257d377f68c8786c50fa2.
2014-04-21handle properly page breaks even if a page contains only a frame (fdo#55381)Luboš Luňák2-0/+9
The test document has 4 pages which only contain frames, first 3 pages (sections) have <p> block with <framePr> and another <p> with just <sectPr>, and the second paragraph would be removed, thus there would be no nodes on which to actually set the page style and they would be set on nodes for the previous page, overwriting its page style. The last page does not have its own <p> at all, so it needs to be faked. The changes in finishParagraph() are because of e.g. the comments-nested.odt sw test, which there causes exception because of unknown property ParaStyleName (comments do not use those it seems) and the code is skipped over (which is probably a bug on its own, but it's unrelated to this change otherwise). Change-Id: I9d37f992407a9b649c710d2a031ec4447fb11771
2014-04-19fdo#75735 RTF import: fix COW when writing a nested structureMiklos Vajna2-0/+15
Regression from a48e2fd9049797110b3b2505c363557284987ca8 (fdo#44736 - convert RTFSprms to a copy-on-write structure., 2012-12-07) (cherry picked from commit 6b6e4d471c2954d34d280398ed1c986d7fb27ae1) Conflicts: writerfilter/source/rtftok/rtfsprm.hxx Change-Id: I2538f440e29cef6d40db2ea914e4afcbfe411890 Reviewed-on: https://gerrit.libreoffice.org/9100 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-04-17fdo#77342: sw: fix copy/paste of footnote cross referencesMichael Stahl1-38/+34
The fix for sequence fields broke the footnote references some more; simplify it by handling the footnotes in the same way as the sequence fields, and not remapping GetExp fields for which the corresponding SetExp field / footnote is missing. Also, don't do any remapping when the target is a clipboard document, to prevent modifying the source document. (regression from bb665affbd8870652ade3951d626d76e99143f67) (cherry picked from commit cbfcb837fb06a14daf5281ae13fc1886328cee6f) Conflicts: sw/source/core/fields/reffld.cxx Change-Id: If1be1e1d9742182a4085bbbff53e26a8fa8665b8 Reviewed-on: https://gerrit.libreoffice.org/9085 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-15fdo#77267 RTF import: pard should reset current paragraph styleMiklos Vajna2-0/+18
Change-Id: I8d78ce262a4e57161325231a78e48750909b1bad (cherry picked from commit 904630a2272ac4dd540939f8a462bff5d636f066) Reviewed-on: https://gerrit.libreoffice.org/9055 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-15fdo#74599 RTF import: enable StylesNoDefault compat settingMiklos Vajna2-0/+15
The Writer 'Heading 3' paragraph style is gray by default, but (just like in case of DOCX) that shouldn't have any influence on the RTF import result. Fix this by moving the compat setting from the DOCX filter implementation to the common dmapper. Change-Id: I86c7cf1a66f82b438ce8379467773a88c9e229af (cherry picked from commit 2df53ef5002270bfe788e383e95002f636a242d9) Reviewed-on: https://gerrit.libreoffice.org/8945 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-09fdo#69157 Apply object-in front selection on mouseUpLennard Wasserthal1-8/+11
Before, all selection was recklessly replaced when you clicked something else than a scaling handle (or the like). It caused bug 69157. But now, you can still drag the frame by gripping the interior one. Btw, that the timer did not correctly start was because of the return statement in the prior state. Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6 Signed-off-by: Lennard Wasserthal <Wasserthal@nefkom.net> Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-04-09Resolves: fdo#77174 crash with "New style from selection" with ListCaolán McNamara1-9/+13
was coverity#1130423 Dereference null return value (cherry picked from commit a434a8bfdd8b9323c8262edcd591641fe9ea8b19) Change-Id: If6981a9654a114e34dad931381ea071d5169adc2 Reviewed-on: https://gerrit.libreoffice.org/8905 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-07fdo#75772 Correct name of Outline Numbering dialogLaurent Balland-Poirier1-1/+1
Change-Id: I14ffe5a9135f0fc37f839a386f4dc63c5831b9d4 Reviewed-on: https://gerrit.libreoffice.org/8875 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-07fdo#74823 RTF import: work around wrong table column width on invalid inputMiklos Vajna2-0/+42
This scenario is not a valid one, Word doesn't handle it, either -- but the old LO 3.4 parser did. So add minimal support for it to avoid the regression. (cherry picked from commit 0a215b9a980e68f899ad548f780bbe5a1fec8732) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Icc2e8d3bf314e9cadda57956668033aa6d092457 Reviewed-on: https://gerrit.libreoffice.org/8871 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-07fdo#76298: sw: do not start up every OLE object on deletionMichael Stahl1-8/+9
First check if it's actually a Chart embedded object; starting up external processes on Windows for arbitrary OLEs is likely expensive. (regression from 1ba29be90f7141077f2d079d40dffc2efd4f1a2c) (cherry picked from commit 206848294f686a0ccf4c741d7e92a2314a88ea48) Conflicts: sw/source/core/ole/ndole.cxx Change-Id: I3c64444b6cf4d4f791cafc77ec1f9b2b0150ad1b Reviewed-on: https://gerrit.libreoffice.org/8881 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-04bnc#821208 DOC import: fix unwanted char background in numbering char styleMiklos Vajna3-1/+4
Word supports formatting the paragraph parker itself, and we import that as a formatting at a position after the last character (e.g. "foo" will have that formatting at char pos 3, which is ignored by the layout). In addition to this hack, commit 1c22545edf9085b9f2656ca92781158b6b123db3 (Fix issue #i119405: Numbering text style changed after importing the *.doc, 2012-08-24) added a SwTxtNode::TryCharSetExpandToNum() hack to Writer core, where in case such a paragraph marker attribute is set, and the SwTxtNode has a numbering, then also modify the associated character style as well. As that commit already noticed, there are attributes which should not be propagated to that character style. Extend this blacklist to ignore RES_CHRATR_BACKGROUND as well, as Word does. Change-Id: Idcb40d37d8688c76fbd61f28428f6e3bc995f799 (cherry picked from commit 5a5d948e230dfea61108452579b68da75706cad4) Reviewed-on: https://gerrit.libreoffice.org/8827 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-03Resolves: fdo#73936 make FormFieldDropDowns a real fieldportionCaolán McNamara7-80/+87
split the checkbox and list and use a field portion for the list. That way it knows how to line break correctly wrt hardspaces and doesn't hang when the situation arises. (cherry picked from commit a52ee51269a47e52d68405caf8507e1abaa6fd8f) Conflicts: sw/source/core/text/itrform2.cxx sw/source/core/text/portxt.cxx sw/source/core/text/portxt.hxx Change-Id: I46d73f19ef8e51e7c21c8783ce70bb80d98a784c Reviewed-on: https://gerrit.libreoffice.org/8776 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-31Resolves: #i124085# disabled CF_DIBV5...Armin Le Grand2-1/+4
(no advantages but some problems), increased png support (cherry picked from commit c991f7cae8dcb306cb0d1f32bc5fcd8ea0a1ea81) Change-Id: I52bef1295b32eb3692a0428c96edd0c55287f34a Reviewed-on: https://gerrit.libreoffice.org/8784 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-28cp#1000044 DOC import: fProtEnabled means document is not totally read-onlyMiklos Vajna3-1/+10
Reading the spec, it seems that we have two cases here: - if lKeyProtDoc is set and fProtEnabled is 1, then editing forms is allowed - if lKeyProtDoc is set, but fProtEnabled is 0, then the document is totally read-only So in the first case avoid the SetModifyPasswordHash() call to allow form field editing. Change-Id: Id0c48e8eb4bde75c5520a7b108fcfada51148faf (cherry picked from commit 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e) Reviewed-on: https://gerrit.libreoffice.org/8762 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-27Revert "rhbz#1075124: writerfilter: fix tables with negative left margin"Luboš Luňák2-16/+0
It appears that this was just a workaround that incidentally worked. Making the negative value even larger (in abs value) doesn't seem to make a difference for MSO, but LO fails again. A proper fix (better workaround?) will follow. This reverts commit 2e558f32ef79948858723b9781fbd388850b462b. Change-Id: I56fd5e9d7ce9aa178f7e508f8e7ac3bc0ff2b971 Reviewed-on: https://gerrit.libreoffice.org/8763 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-25fdo#74981: cutting nothing should do nothing, should fix field dupesBjoern Michaelsen1-0/+2
Change-Id: I8a8c9bfcd0943904384bb12b510a050ef8df9adf Reviewed-on: https://gerrit.libreoffice.org/8730 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-25add parameter to supress dialogMathias Supp1-1/+6
With the new parameter you can now supress the dialog for document compare in writer. Change-Id: I984ee75552e5c006332331510df5d437b687903f Reviewed-on: https://gerrit.libreoffice.org/8739 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-24fdo#74155 mailmerge output path fixAndras Timar1-1/+1
regression from dd7acb3d76cd89b3f05dbdafe88eb50e60fd9d10 Change-Id: Ia79ed67df1f0e2803bd3e729951dee3a7438096d Reviewed-on: https://gerrit.libreoffice.org/8729 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-22fdo#76235 #i124039# assure correct line break for multi-lined Input FieldsOliver-Rainer Wittmann2-1/+10
(cherry picked from commit 14e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0) (cherry picked from commit 6789e6de929c7685cf1573170534891aeffe5fa1) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: If5664a5260e683cd5a80885b3f39b04f85de8db9
2014-03-22fdo#73466 SwTxtSizeInfo / SwTxtInputFldPortion: invalid string accessMiklos Vajna2-2/+2
Change-Id: Ibd74e3b0cd45fa3bf6fd4135866b22acd16e372e (cherry picked from commit fc0bd38051c7c8f4c68a1407aed32a96b2564510) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-03-21Resolves: fdo#75728 #i124474# on change of User Field via UNO-API...Oliver-Rainer Wittmann1-5/+16
trigger update to get dependent Input Fields updated. (cherry picked from commit 40c8121fbeb89403418a90c77b88d13ad268d347) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I0ead765729c93992103baca53924b7a127936b38
2014-03-20fdo#75260: Apply the same fix from writer table to character bordering.Kohei Yoshida1-12/+20
And mirror the right and bottom borders while I'm at it. I guess it was originally meant to. Change-Id: I408b077c1524d19bbadd6f0b284ce204064eb735 (cherry picked from commit 2cd1673f41cb5bd8502a9a48a5721244660fe3a0) Reviewed-on: https://gerrit.libreoffice.org/8650 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 23:10:10 +0000