summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2015-12-18tdf#96113 sw: don't overwrite fo:background-color on ODT frame importMiklos Vajna3-1/+7
The situation is similar to commit 79fb61efb847405fa47235002b52ee8efad5e339 (tdf#92379: svx: don't overwrite fo:background-color on ODF import, 2015-08-21), except that here text frames had the problem of loosing colors when transparency is set. Fix the problem by informing getSvxBrushItemFromSourceSet() about if we're in XML import or not. (cherry picked from commit 3a0c0af7309e1f5ba3811bbe8a73e506cf5cd069) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: Id1adf60b14a3762f0a2a43c49caeed9f6ea039be Reviewed-on: https://gerrit.libreoffice.org/20744 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-12-17fix missing BaseURL when loading embedded objectsMichael Stahl2-4/+27
When the object is edited in the UI, the m_xClient is set to a SfxInPlaceClient and the DocumentBaseURL is retrieved from it. But if the object is not edited, it will be loaded during export via the API and without a m_xClient; in this case the DocumentBaseURL must have been set previously to be available during import. There appears to be no way to get the URL of the document via the API while it is being imported; SfxBaseModel's m_sURL is unfortunately only initialized from SfxObjectShell::FinishedLoading(). During ODF import, the SvXMLEmbeddedObjectHelper creates the embedded object, so let's make it pass in the parent's BaseURL. The "DefaultParentBaseURL" parameter already exists but was unused previously. (cherry picked from commit b0fc09daf1086423a9bd457d9a2c043e7ff41451) (cherry picked from commit 4118f8f4c20ae711b95ab3052656bde673aa8852) sw: loading embedded ODF objects requires unordf component (cherry picked from commit b3b7982f4690f4ac0f0e9680970ba544157c36dc) Change-Id: I3d1ed29b3a2c0e77ec606a1d09f7bc07e7860733 Reviewed-on: https://gerrit.libreoffice.org/20761 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-17sw: extend various OOXML export test to check embedded objectsMichael Stahl4-1/+217
(cherry picked from commit 1af4dbd827b615a10e4686486fa9034e7adf1289) (cherry picked from commit e2bb242eb20f8bd24e3f1033c09dd1d379877084) sw: extend some more OOXML export test to check embedded objects (cherry picked from commit 988f1c71214870cb0a3df7d156eefd64e096bf0b) (cherry picked from commit b676e97dd30272171dc07c8e5ddc3e562f5ebb1a) Change-Id: Ie1047a2a213632f05b0ae091a3a7e4118a271082 Reviewed-on: https://gerrit.libreoffice.org/20760 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-17sw: DOCX export: convert ODF embedded objects to OOXMLMichael Stahl3-13/+134
If the user edits an embedded object it is converted to ODF, so we really need to be able to store such objects. Ensure that the proper MediaType is set in [Content_Types].xml, the package relationship type in document.xml.rels and the proper ProgID attribute in document.xml. (cherry picked from commit 2a9f1dd27a5df97013f73e61eecf53b2348d055a) (cherry picked from commit 456d0315bf3bf3644d309038e266465e21130035) sw: replace OUStringBuffer (cherry picked from commit ea50cb70efed40d1ed2ca6806c626ed5fdb71351) (cherry picked from commit a0cad01e83b92c61a3e06078f8cb497effb5eb7e) sw: fix MSVC build, stupid thing can't initialize const members (cherry picked from commit 159e78791ba40d76ba0d8af6abbd7d629eb6dd85) (cherry picked from commit 0050019b54a266db92aa71069668ee58e12a7876) Change-Id: I3c78c5ab5b4d534213af5e773fe0c6c2c92d9104 Reviewed-on: https://gerrit.libreoffice.org/20759 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-17sw: fix DOCX export of embedded OOXML objectsMichael Stahl3-14/+33
OOXML embedded objects are converted to ODF during export, which prevents the export from working, as it expects a stream, and ODF uses a storage. There is already a unit test in testEmbeddedXlsx, but it wrongly succeeds because the components necessary to convert from OOXML to ODF are missing in the test environment. (cherry picked from commit 1dac99e7ea45f90bf39eb95eb7bc01f7d79093ef) (cherry picked from commit 290cac714b09cd0eccb02caa03452e35b87ebaae) sw: un-break DOCX formula export (regression from 1dac99e7ea45f90bf39eb95eb7bc01f7d79093ef) (cherry picked from commit 3b63d2b9371baa5f526d0fcd41043ec76abb0d50) Change-Id: Ib4df346e04ecfb54ec1a728535be876db921b884 Reviewed-on: https://gerrit.libreoffice.org/20469 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-17sw: move ProgId parsing to DocxExport::WriteOLEObjectMichael Stahl3-89/+105
(cherry picked from commit a7762b56c0f0605d090ed95069db16c6641f769e) (cherry picked from commit 6768b669bafa62fe94a81971285e12823c3716e6) sw: docx export: write something more specific for embedded PDF Doesn't really change anything, but looks nicer. (cherry picked from commit 6c569a2ed797aa7ad52f8a7dc6be3bfb3b4b452a) (cherry picked from commit f8e628ab3993024e5e5885f99b5e9ebb2c30d467) Change-Id: Ieb308d717aa661fa51bd1b9dd3d0a12ca61337c1 Reviewed-on: https://gerrit.libreoffice.org/20758 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-17sw: DOCX export: eliminate chart numbering non-determinismMichael Stahl2-3/+5
... that was causing test failures on some but not all platforms. (cherry picked from commit c56e0858b081b4dfe78745cf80c829f6c3c2e7b8) (cherry picked from commit 2263a59aaf6bc1548046fdda422518a6365ffd17) Change-Id: I0d04cd6e540ea2693a3ec8511d615a9b0fecf456 Reviewed-on: https://gerrit.libreoffice.org/20757 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-16tdf#92754: Excel Chart content type is not exported properly.yogesh.bharate0013-0/+18
Problem Description : - Excel chart contenttype is not exported properly, it exported the .xls file as .bin file. - Due to this when we open the roundtrip file back in MS Office, the embedded excel chart is not open and gives ERROR. Solution : Added support for embedded .xls for docx file. Change-Id: I16e18ffa4f6c72526665ff9d34d6c6053278c2c5 Reviewed-on: https://gerrit.libreoffice.org/17066 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 0f64e580ff08a6f76327f0b77f79abbbb044d009) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2015-12-16Resolves: tdf#94701 allow fully deleting illustration category in comboboxCaolán McNamara1-2/+2
Change-Id: Iaaefbe2311e61be3b9689c693481d149aa1355f5 (cherry picked from commit 0261be7f92930952a470bc7f5e1d543b8907b1f0) (cherry picked from commit 2365ff9f02370d63aae3d5b04b90b3c1a58d1094) Reviewed-on: https://gerrit.libreoffice.org/20372 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-15tdf#96125 Fix broken Writer paragraph text-to-text alignment feature.Mark Hung1-1/+1
Revert "Fix tdf#77514 CJK ruby text in RTL( vertical ) base line issue." This reverts commit f0a149fe1c3224cef17f15e574b0a818923b57f6. Change-Id: I0a5b9ec2ea0225bf2ef587549e97c9c7b0541253 Reviewed-on: https://gerrit.libreoffice.org/20356 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-12-11fix a set of race conditions in the writer uno wrappersBjoern Michaelsen9-2/+41
- whenever SwClients are added or removed, the SolarMutex should be locked - locking the mutex there would be a performance killer - thus only DBG_TESTSOLARMUTEX() and fixing the fallout on DBG_UTL builds - also fix SwXFlatParagraphIterator - another missing SolarMutex in Writer UNO - yet another member of SwXTextPortion needs to be guarded in the dtor - another missing SolarMutex in Writer UNO: SwXCell (cherry-picked from: ffdc5db260b7c17c47109f707b3664a3f3caafaa, c20930bfec4ce4953ffdaff1971216290fab0e4d, e61465d25f5e52bf439db65ed7a641722637034a, 453cf8a4c44b7935c3029524bfd40fa9c1d87753, f019f5d6fe05b15a83a7fea40d9448de2fabb00d) Change-Id: I1c8413cd0b9baa7f38e452e94f33e29bc4cf6717 Reviewed-on: https://gerrit.libreoffice.org/19856 Reviewed-on: https://gerrit.libreoffice.org/20089 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-12-01tdf#95614 fix freezing with linked graphicLászló Németh3-7/+18
When an unloaded linked picture comes into the visible view (including repainting a page), SwNoTextFrm::PaintPicture() starts a thread to load it in the background using the TriggerAsyncRetrieveInputStream() method of the graphic node. To avoid to start a second thread on the same graphic node, TriggerAsyncRetrieveInputStream() checks mpThreadConsumer, the graphic node member variable for the possible thread object. The problem is that when the thread finished and SwGrfNode::UpdateLinkWithInputStream() reset mpThreadConsumer, the graphic object of the graphic node is still in unloaded state (its type is GRAPHIC_DEFAULT or GRAPHIC_NONE instead of GRAPHIC_BITMAP or GRAPHIC_GDIMETAFILE) for a while, because its modification is solved asynchronously after several SvFileObject::GetData() calls. In the intermediate state of the graphic object, with the high priority repaints of the new scheduler, PaintPicture() could start new thread to load the image again. Using the new member variable SwGrfNode::mbUpdateLinkInProgress, this patch will prevent the graphic node to start newer thread unnecessarily. Change-Id: I9433f0fa4613294103a00a3955fc2f35d8863b59 Reviewed-on: https://gerrit.libreoffice.org/19974 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-11-27tdf#78902 VML import: workaround for extreme top marginMiklos Vajna2-0/+6
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516: DOCX import: fix context stack when importing header/footer, 2014-03-05), though that just made an existing Writer layout problem visible. RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those import pictures as sw graphics, not draw ones. <w10:wrap type="through"/> is normally mapped to our page wrap (as it uses "through" in the "not only wrap around, but also in the holes of the shape, if it has any" context, not in our "text should go through it, so no wrapping" one), but for some reason in this case (most probably due to the extreme large negative margins) Word handles the situation as our through, i.e. the text should not go to the second page, as it would normally happen with a "Word through" wrapping. Work around the strange situation by ignoring the wrapping request for extreme top margin values. (cherry picked from commit 37b5f1ed3139b8569bfec0fcb5077f6b66b79acd) Conflicts: oox/source/vml/vmlshape.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937 Reviewed-on: https://gerrit.libreoffice.org/20212 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-26tdf#61228: Wrong function names in Formula Writer are considered as SUMJulien Nabet1-9/+14
Unknown names make the formula fail PythonTest_sw_python, especially set_expression is ok Variables are taken into account Thanks to Mike Kaganski for his help on this patch. Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2 Reviewed-on: https://gerrit.libreoffice.org/20122 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit d667e3210b12c7ce3b3727e2a0e369a520fbaaa4) Reviewed-on: https://gerrit.libreoffice.org/20159 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-23tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by defaultMiklos Vajna2-0/+6
On one hand, neither our binary DOC import, nor Word maps the "TOC Heading" style to something special, and that's how the DOCX import added that property to some paragraphs in the document, moving the as-char picture from the first to the second page. OTOH, the DOCX export filter has a lcl_guessQFormat() function that explicitly assumes that such a style name exists in Writer document models, so again it doesn't make sense to handle this style name with special care. Change-Id: I3af548930f9683695fc3ad56b486e013f107d61a (cherry picked from commit 70f3c595cae858e97616bf1f23adea8a75e42d4b) Reviewed-on: https://gerrit.libreoffice.org/20037 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-23Make number recognition work in writer tables againNiklas Johansson2-1/+71
It seems that number recognition in tables are not working properly enter 10-10-10 and it should be converted to a date but it is not. I tracked it down to the fix of bug fdo#32082. It looks like bSetNumFmt was changed to false by mistake. Since then it has changed name to bSetNumFormat. From what I can tell fdo#32082 still works after this patch, but I might have missed some nuance of that bug report. Added two tests, one for the bug mentioned above and one to check that number recognition is working. At least with a simple date. Reviewed-on: https://gerrit.libreoffice.org/19563 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit aa334d55ee34c125f6f4fdfaadbc1ed8fa33f5bc) Change-Id: Id58849a223eb602054c66c7379cd56a68a93dea2 Reviewed-on: https://gerrit.libreoffice.org/20082 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-13Resolves: tdf#95321 tables in headers/footers with wrong contentCaolán McNamara3-1/+11
Change-Id: I937ed893dfd9919bf48b8fd38a1b83c524200532 (cherry picked from commit 6128c10f550924c2b75f18b6c6220cc1770adba4) Reviewed-on: https://gerrit.libreoffice.org/19911 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-11-13tdf#85232 WPG import: fix handling of line shapesMiklos Vajna2-0/+11
The missing convertMm100ToTwip() calls mispositioned the line shapes inside the groupshape in case of using drawingML inside DOCX files. (cherry picked from commit 11129d89b152db54c86bb2bda58c24b8abb6c5a8) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I0c9d652de43d779f9073a8bfe22866ce4f31d0fa Reviewed-on: https://gerrit.libreoffice.org/19946 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-12tdf#95071: fix spacing calculations for border with page offsetMike Kaganski2-1/+1
With commit ebf767eeb2a169ba533e1b2ffccf16f41d95df35, some previously hidden bugs manifested themselves, this is one of them. The margin size calculated incorrectly when border offset was from page. The border is drawn from the margin inwards, so the margin should be equal to OOXML w:space attribute, and border distance should be OOXML page margin - border distance - border width. Incorrect calculation gave negative margin, with IllegalArgumentException thrown in SfxItemPropertySet::setPropertyValue. Reviewed-on: https://gerrit.libreoffice.org/19586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Cherry-picked from 061d98ccc7fc95234514d5dee3d9e80e49b10dc7 Change-Id: Ifcf4a348e975df53410933aab3684d17f68b688c Reviewed-on: https://gerrit.libreoffice.org/19940 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-11-11tdf#89088 DOCX import: fix missing text due to throwing ShapeContextHandlerMiklos Vajna1-0/+0
Regression from commit 866a4436d3cfac1ff42d7996250bf96fb703aeaa (oox: handle textboxes in ShapeContextHandler::endFastElement(), 2014-06-04), the problem was that code in ShapeContextHandler::endFastElement() assumed that all the XShape implementation it may see provides a TextBox UNO property (which is specific to Writer) of type bool, but this is not true. Fix the problem by assuming false in case it has an other type. Testcase can be a simple "does it load" one, as in the meantime exceptions such as trying to read a bool from an uno::Any make the DOCX XFilter::filter() implementation return false, unlike in the originally reported LibreOffice 4.4 version that just silently discarded the remaining content of the document. Change-Id: I81781a7ec28d085ceee50d386b8eda023f83c29f (cherry picked from commit 4cae3689d4d78fabe6529c9df03c438b1e9d1611) Reviewed-on: https://gerrit.libreoffice.org/19905 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-11-10tdf#81144 Chinese full-width punctuation does not align properlyMark Hung3-12/+27
Ideographic fullstop and comma in most Chinese fonts are centered, while those in Japanese fonts align closer to the left. Original compression algorithm trimed right side of the punctuation, making fullwidth fullstop or comma in Chinese font visually unbalanced. In worst case, it crowds together with the followed compressed punctuation. This patch fix the situation in the folowing way 1) make compression less stronger. 2) Trim space according to glyph bearing to font height ratio. 3) fix a memory access violation issue Reviewed-on: https://gerrit.libreoffice.org/19517 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Conflicts: sw/source/core/txtnode/fntcache.cxx Change-Id: Icff215064e6c442fd36eac8e01b01fb6acb27594 Reviewed-on: https://gerrit.libreoffice.org/19764 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-10tdf#59454 RTF import: handle section break right before a tableMiklos Vajna2-0/+14
DOCX import could handle this situation, as commit 2e8aad6d45c53d554ccaf26de998ede708cfc289 (fdo#39056 fdo#75431 Section Properties if section starts with table, 2014-04-18) added support for this situation, in case NS_ooxml::LN_tblStart/End is emitted by the tokenizer. Fix the problem by sending these tokens in the RTF tokenizer as well, at least for non-nested tables. Change-Id: Ifedb121754634529c27820dd5175e7f9e24019e1 (cherry picked from commit e57752170e604c85a6fe8aeaa38784796e00bab1) Reviewed-on: https://gerrit.libreoffice.org/19878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-10tdf#92648 fix DOCX import regression (textbox shrinking in footers)László Németh1-2/+4
caused by the fix for tdf#91260 (cherry picked from commit 16331514fd10d444bec89f892a106cbbba9e16c0) Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d Reviewed-on: https://gerrit.libreoffice.org/19877 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-09tdf#94624 calculation of power operator fixedOliver Specht1-0/+2
cell values are added in parentheses to make sure negative values are handled correctly Change-Id: I7366493e3cd6c25607e311d4b610ef8aa704a8bb Reviewed-on: https://gerrit.libreoffice.org/19821 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit 0bd2a5eedd91466f97806e198b125546d256d1f8) Reviewed-on: https://gerrit.libreoffice.org/19826 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-11-06Resolves: tdf#76964 fall back to primary language via getLanguageCaolán McNamara2-5/+12
instead of bittwiddling which ends up trying to resolve the system language (cherry picked from commit a1ff0745cc4f78777e8dba1e7bb52d18386d7394) more tdf#76964 fall back to primary language via getLanguage (cherry picked from commit 97893e56e61a466e56d12ee46d11f6e4c32a737b) sw: fix SwUiWriterTest pointlessly loading an "empty.odt" ... ... instead of just creating a new document. (cherry picked from commit 98ddd7a32fd0d5fa080fac368b9dc53a06659285) Change-Id: I545bd5e39f99003ddedf3c90031e8b818edc1de2 Reviewed-on: https://gerrit.libreoffice.org/19545 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-03tdf#94374 DOCX import: allow insert -> object -> documentMiklos Vajna3-0/+30
(cherry picked from commit 50d48709af3406eb270e5357f5d2cc6a218337a9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I977930d59ef1ae9ae8bd2dfa9a7f3816c46d982c Reviewed-on: https://gerrit.libreoffice.org/19758 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-02tdf#64027 sw: Make the text background color button workMaxim Monastirsky5-0/+20
Change-Id: I305163b691a8fa51ef5da0c940c59c3a3440a2dc (cherry picked from commit 96d03636a5f932151c7842ae34631258891fe807) Reviewed-on: https://gerrit.libreoffice.org/19738 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-11-02tdf#89165 sw: looping layout in SwHeadFootFrm::FormatSize()Miklos Vajna3-3/+14
FormatObjsAtFrm() returns false, indicating that the result is not perfect, and the caller hopes that formatting all children of the frame again will help. Make sure that in case that assumption turns out to be false, we at least do not loop. The loop limit is enough to make the original i#43771 bugdoc still laid out properly. (cherry picked from commit 51438e87d0e17a4cc3c991165d22c740b3ac1fc2) Change-Id: Ife9bd99a628a72edb922d04e05081971b6adf340 Reviewed-on: https://gerrit.libreoffice.org/19407 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-10-30tdf#93720: Interactive frame insertion is disabled if table is selectedOliver Specht1-0/+1
Current implementation does not support interactive frame insertion that moves the table into the frame Change-Id: I57a69f680f1218bd3014da494d41542ad0b72dd1 Reviewed-on: https://gerrit.libreoffice.org/19157 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> Reviewed-on: https://gerrit.libreoffice.org/19675 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-30tdf#93509: Commit at the right timeStephan Bergmann1-0/+1
when the change is made, not during exit (as did 4aab13f77e5dc218d067ca7efe3622f4ea780bf9 "tdf#93509: crash on storing auto correction config fixed," which caused PythonTest_sw_python to crash during exit) (cherry picked from commit fc7df6f9a6caf975867f4fcb87b5b0c86ed1ee84) Conflicts: sw/source/uibase/app/swdll.cxx Change-Id: I0e9c264ae3fee7fdb732d36f42ebbb477557a644 Reviewed-on: https://gerrit.libreoffice.org/19673 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2015-10-30tdf#94871: sw: fix a frame formatting regression that affects helpMichael Stahl1-6/+8
The early return must also be taken if the anchor is neither AT_CHAR nor AT_PARA. (regression from a219bbb62f974020fac0799143fbc51c385bb460) Change-Id: I4eccb1f80401ba620ef87342f40c1a896918f3d3 (cherry picked from commit 9092f96c63c05833ee5319935da1078afe216b55) Reviewed-on: https://gerrit.libreoffice.org/19649 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-28tdf#91270 fix crash on exit (Windows)Andras Timar2-8/+15
dynamic atexit destructor and const static variables reportedly cause crash, let's avoid this. Change-Id: I24234084f810854606dde9914bee1c98ebc2e3dd Reviewed-on: https://gerrit.libreoffice.org/19657 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-10-20fix SwIndex assert on fdo66692-2.docCaolán McNamara2-0/+15
Change-Id: Ic3330817809727bfa2293ba74dcd7f5a25683dae (cherry picked from commit 2d2d5d1a704aa6827657a73b395620009b04b3ea) Reviewed-on: https://gerrit.libreoffice.org/19378 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-10-20tdf#95091: enable delete and backspace in editable elements within protectionsOliver Specht1-2/+2
when editing is enabled also delete and backspace should be possible this applies e.g. to input fields within protected sections Change-Id: Iee5ef133971a3f2967e6c92e685a16afa003cfe8 Reviewed-on: https://gerrit.libreoffice.org/19399 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit ac427caf1069ff66b4893bb2e937c2408d7c37b3) Reviewed-on: https://gerrit.libreoffice.org/19453 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-10-15tdf#94049 RTF import: add missing check for empty shape when popping stateMiklos Vajna1-0/+12
Change-Id: I3c9a5f89df721618bb60b8932b69a371bb6f3ff1 (cherry picked from commit 0d79e4c07a7a7328cc0bed1d7998317b634543d8) Reviewed-on: https://gerrit.libreoffice.org/19366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-14tdf#77014 fix input field breaking of words at new lineTomaž Vajngerl1-51/+2
SwTextInputFieldPortion::Format has previously tried to erase the input field special chars, which caused the words not breaking as expected or in the same way as normal text. It appears that it is actually not necessary to do this at all so just calling the super class method SwTextPortion::Format does the job and fixes the problem. After testing I could not find anything that is obviously wrong. Change-Id: Ie763f55ad55863dd224425dc481b7100deb639fa (cherry picked from commit 5e1714fd7fcb45fa5f1220d892dba597da40b500) Reviewed-on: https://gerrit.libreoffice.org/19349 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-14fix tdf#94818 while retaining the tdf#90504 fixCaolán McNamara1-5/+18
Change-Id: Ia1c904b16d040714c8d5a0b4946bc42e6b8ac3bb (cherry picked from commit 959ac511dbebeb3983da92052ced837b39b74ed9) Reviewed-on: https://gerrit.libreoffice.org/19342 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-14tdf#94804 sw: allow duplicate heading cross reference bookmarksMichael Stahl6-5/+164
... in ODF import, so that reference fields do not break that reference numbering cross reference bookmarks that were corrupted by commit 679faffc68bb854af0f55d0f218698e2f372f00b. This used to work by accident before commit 9d0c51daea67104349cac26de9839afa8baeb099 fixed it to actually check for duplicates properly. (cherry picked from commit 7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c) Change-Id: I5ed58eda7f3f2ce470a778852f6dda7a14356860 Reviewed-on: https://gerrit.libreoffice.org/19337 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-14tdf#91097 Substitute rectangle and ellipse uno commandsYousuf Philips2-4/+2
(cherry picked from commit 3080e4c09b7c4894d4f0f52c9beed4298f3fd23f) (cherry picked from commit fedf965c51a9f57e5cde203a3d15a6c244558002) (cherry picked from commit 4c2339d8177d610cc23619e787c1517ce8e8afd7) (cherry picked from commit 1bc911eca173131fdc6e7e3889d128fa03adbf72) Conflicts: framework/source/uielement/menubarmanager.cxx sc/uiconfig/scalc/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6 Reviewed-on: https://gerrit.libreoffice.org/19345 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-12tdf#94804: prefix to save cross reference bookmark fixedOliver Specht1-1/+1
bookmarks as references to numbered paragraphs are now saved using the prefix '__RefNumPara__' as the import already expects Change-Id: I6f7c41e95fa9f936a7eb21d4cb7461d4575c492a Reviewed-on: https://gerrit.libreoffice.org/19229 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 85eb4d9514858c71fb22c5ed93d651ea24bc6c05) Reviewed-on: https://gerrit.libreoffice.org/19336 Tested-by: Michael Stahl <mstahl@redhat.com>
2015-10-12valgrind: memory leaksCaolán McNamara1-0/+5
Change-Id: If47170b323cb0b48b7cf2182ecbecfac575a6118 (cherry picked from commit 2445de28ad8cc1aed1302e14a2da3372a9f23c10) Reviewed-on: https://gerrit.libreoffice.org/19319 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-10-09tdf#94679 Writer: fix lost selection with Shift-PageDownJustin Luth1-3/+7
Push/Pop-ing the cursor led to selection loss. SelectHiddenRange() immediately returns false if the current cursor hasMark(), so avoid all of the bugs and expensive push/pop routines when there is a mark already. Change-Id: I4624a3e0b2267942812d0429d527ad97962ec7fc Reviewed-on: https://gerrit.libreoffice.org/19108 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fb62052d5ac069d700a5410db35d6949a4c4008b) Reviewed-on: https://gerrit.libreoffice.org/19277 Tested-by: Jenkins <ci@libreoffice.org>
2015-10-09tdf#94435 RTF import: \ltrpar should not override \qcMiklos Vajna2-0/+13
Change-Id: I342191cd8cf8b3998089236aea5743ea7cdd26f1 (cherry picked from commit 92fd894ea18672cba4cf961bdc4c0bc98f168102) Reviewed-on: https://gerrit.libreoffice.org/19274 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-09tdf#94456 RTF import: fix list vs paragraph style interaction wrt para indentsMiklos Vajna2-0/+33
In case we set the paragraph left/right/first margin just to mimic the list vs paragraph style interaction as Word wants it, never overwrite properties, as they are always meant to be just callbacks in case there is no real hard formatting. Change-Id: Ibdb2834c693d43cf4114453e42628e8f64c0a856 (cherry picked from commit b669d85de9c933553ae57a9f51902bce7f9da9b5) Reviewed-on: https://gerrit.libreoffice.org/19250 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-08Related: tdf#93461 relax loop detection some moreCaolán McNamara1-1/+1
original tdf#66141 continues to not fail with this modification, but original reporter of the follow up problem has verified that relaxing this more fixes the continued misplacement of caption text in a private RH document (cherry picked from commit a6e6eb8b37ba431df575be4799114bb821f54b0d) Change-Id: Ic1a339619912127009e760aa2ade9f29a545f7ec Reviewed-on: https://gerrit.libreoffice.org/19173 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-08tdf#90153 DOCX import: fix default sw TextFrame roundtripMiklos Vajna2-0/+6
The AnchorType of the shape was at-paragraph, which does not allow line-level VertOrientRelation (which is correct, it would be undefined, what line of the paragraph should be the used). Fix this by changing the AnchorType to at-character in the line-level case, which brings the filter in sync with the DOC one. With this, import of a DOCX file that was created by inserting a TextFrame into an empty document is roundtripped without shifting the shape up considerably. (cherry-picked from commit 358666e4204364ce915ee95372dc6f2fca545253) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I6d85c38be859d6e730584f2349c857b87496a1d4 Reviewed-on: https://gerrit.libreoffice.org/19099 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-10-08sw: fix copying of bookmarks in CopyRangeMichael Stahl3-8/+94
If the copied range starts with a not fully selected paragraph, the bookmarks that are copied will be created on the wrong paragraphs, on the node after the correct one. This also happens when hinding the redlines, and causes asserts from attempting to create CrossRefBookmarks on table nodes on WW8 export of fdo66302-1.odt and fdo66312-1.odt. Change-Id: Id576be3e38a89527d967f02b39d9aabbf6368354 (cherry picked from commit c95ba3ef2613e9d5abd2f19ab2432c7bc1a40fe7) Reviewed-on: https://gerrit.libreoffice.org/19104 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-05Resolves: tdf#93187 gtk3 spin box element in navigator cut-offCaolán McNamara1-0/+2
Change-Id: Ifc1f226a38328e6ce02d3181917dd0530f320914 (cherry picked from commit 1e468ed58994f4eb75519cb52111ed942fbc7377) Reviewed-on: https://gerrit.libreoffice.org/19021 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-05Resolves: tdf#93461 captions laid out behind imagesCaolán McNamara1-4/+12
regression from... commit 8a08f68669f9acfe98dadcca4af6519164a17000 Author: Mike <mikekaganski@hotmail.com> Date: Mon Apr 27 01:27:05 2015 +1000 tdf#66141: SwTxtFrm::FormatQuick(bool) endless loop If a line happens to be invisible (e.g. in too thin cell of a table) then aLine.FormatLine(nStart) returns nStart, and aLine.Insert( new SwLineLayout() ) is executed until OOM. keep the zero advance loop detection attempt, but allow the first insertion and disallow subsequent inserts Change-Id: I16380588220149cfd0ed0f835f08d2849180fece (cherry picked from commit f06508e2cfa7e833862b7e9ff3b2f79181672275) Reviewed-on: https://gerrit.libreoffice.org/18908 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-10-01Fix tdf#82176 CJK: Cursor position, line selection and non-printingMark Hung3-4/+3
characters do not take account of hanging punctuation. Note that placing a cursor next to the hanging puncuation is still not possible, but the selection and the non-printing characters works fine now. Change-Id: I22c8c2c5044b46c325236caffec67d9f68c23eed Reviewed-on: https://gerrit.libreoffice.org/17591 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/19031 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 09:05:17 +0000