summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2015-11-05tdf#39080 Added HideWhitespaceMode ViewOption flagcp-5.0-8Ashod Nakashian3-2/+11
Change-Id: I94ac57881dc3a3628413b9198ea750fdc282accb Reviewed-on: https://gerrit.libreoffice.org/17278 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3e3c5369e87066a4bfdead5fc9dbfe128f84df52)
2015-11-05tdf#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> (cherry picked from commit 36fa2b8cf538baee272bf91da3d6cda2da6a392c)
2015-11-05tdf#93719: handle 'HideWhitespace' in SwXViewSettingsOliver Specht1-0/+4
Added missing part from tdf#39080 to SwXViewSettings to handle 'HideWhitespace' property Change-Id: I8d8098810ba36b6ade6e4476464a72348ef4db8d Reviewed-on: https://gerrit.libreoffice.org/18291 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a1fd97308d7fc7a35a5def1e15a05099dba90f91)
2015-11-03tdf#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> (cherry picked from commit f4b8ebbd7838921cce837acb353f81df1a6d2996)
2015-11-03tdf#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> (cherry picked from commit 47e8bcd703aa74deafd2e5571205f2dc565e6cf2)
2015-11-03tdf#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> (cherry picked from commit 278287256f560a21105998164e7ee055a7fa36c0)
2015-11-03tdf#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> (cherry picked from commit 61693775969fb7c8bfadfae72405225411ce79ea)
2015-11-03tdf#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> (cherry picked from commit ae846d08b1a18d4cd8f7d59774b3f6686e383280)
2015-11-03vcl: getWindow() -> setClipboard() in ITiledRenderableMiklos Vajna2-4/+4
It's cleaner to let the apps do this themselves than exposing their underlying vcl::Window. (cherry picked from commit bfd79be417358822023691cf7b7b2946906100ca) Conflicts: sc/inc/docuno.hxx sd/source/ui/inc/unomodel.hxx sw/inc/unotxdoc.hxx Change-Id: Iff2442dd325fa65a0cf3ad4aa7f918542dab1e4c
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
2015-10-28guard boost/property_tree/json_parser.hpp on WNTAndras Timar2-0/+12
Change-Id: Ie6de4342b0e6f76076717f1fbdb18adf453ce963
2015-10-27sw tiled rendering: don't offer HTML paste for shape textMiklos Vajna1-0/+7
Change-Id: Icd6df15347c48a5e42860092f4ee664e3a3d5699 (cherry picked from commit c791bef561dcf38a4b47dd06534914f7c28ae67e)
2015-10-27sc: implement vcl::ITiledRenderable::isMimeTypeSupported()Miklos Vajna1-0/+2
(cherry picked from commit 5b4c29b1b15dcebfe4e76aaa8bdb2dd45e2b67f3) Conflicts: sc/inc/docuno.hxx Change-Id: I0b9de068ddf0f4ff92d8fbf003b7529516f1f80a
2015-10-27lok::Document::paste: check if the given mime type is supportedMiklos Vajna2-0/+12
(cherry picked from commit 7efbbe98d7fe951909234dcacd37f67975f00da2) Conflicts: sw/inc/unotxdoc.hxx Change-Id: Ib59ea43700815c53cdd4be819e2e9cf35c6f89e9
2015-10-27vcl: add ITiledRenderable::getWindow() and implement in swMiklos Vajna2-0/+9
(cherry picked from commit 981a974824642a81f86c526dea682cd27cd437db) Conflicts: sw/inc/unotxdoc.hxx Change-Id: I9d0fad3904e74b44b0b126974ace4025f7a4fc5b
2015-10-26fix 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> (cherry picked from commit 343595ff97e4ae50613c1e479315e16f3bcd54be)
2015-10-26tdf#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> (cherry picked from commit 2b766197bdf195789ac126899e1b117bc759b72a)
2015-10-21tdf#81219: Sanitize the thumbnail of web view.Jan Holesovsky1-1/+10
So that we don't render the entire document in the thumbnail ;-) Change-Id: Ic19f403b68bd2e2e748138a861d55e41742250e0
2015-10-19Hide open remote button in standard toolbarYousuf Philips1-1/+1
Reviewed-on: https://gerrit.libreoffice.org/17476 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> (cherry picked from commit 525b1c2c86898b4f7b53d887d4b6ab4c843f22ae) Conflicts: sc/uiconfig/scalc/toolbar/standardbar.xml sd/uiconfig/sdraw/toolbar/standardbar.xml sd/uiconfig/simpress/toolbar/standardbar.xml sw/uiconfig/swriter/toolbar/standardbar.xml Change-Id: I175d27311fa166d3d33f2d88184b1fcd01f5df6a
2015-10-18RemoteFilesDialogSzymon Kłos3-1/+5
Change-Id: I296ce6233287dac5447462faa4b7404c25297f8b (cherry picked from commit 87297284782adbf1fcb73663ad2d2a38b5ae1872)
2015-10-17tdf#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> (cherry picked from commit 4bfde7402dee4f3639bd23c1dc987ceafea87cfc)
2015-10-17tdf#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> (cherry picked from commit 9c9e9e153792081a5c91516b96b3bad54c929ddc)
2015-10-17fix 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> (cherry picked from commit 00316aa39b558869544bdb08d2f5d9d63eb6718e)
2015-10-17tdf#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> (cherry picked from commit c5f55acd89ebc57d43e4b92f29800ea4cf12ae31)
2015-10-17tdf#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> (cherry picked from commit be6440f4624be4da84ac8b71e66297d3e43ca249)
2015-10-17tdf#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> (cherry picked from commit 6e0638338d5c587d6bbb9c349d1b25382fbdbfce)
2015-10-17valgrind: 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> (cherry picked from commit d7e0cb228545f0b2570276e12dbe21ccf1a1621a)
2015-10-17tdf#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> (cherry picked from commit f6c542f88aaae45873ba0258df16a05a12bf5968)
2015-10-17tdf#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> (cherry picked from commit d5db91d310de658631f4cb85d1335fbe55c82453)
2015-10-17tdf#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> (cherry picked from commit 8add771c71900d38ec0faee4fd89d946f95f0cd0)
2015-10-17Related: 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> (cherry picked from commit e450bd6ebde3892850c5fcf5590122a2f10ac8ae)
2015-10-17tdf#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> (cherry picked from commit f98d09c8325c642f0463f2e65ff57be0498e9c23)
2015-10-17sw: 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> (cherry picked from commit 06a66af0b754b62f18783c77410c7929f8134941)
2015-10-17Resolves: 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> (cherry picked from commit 935c1294c21db82a6b96836057cd3a2e66351e89)
2015-10-17Resolves: 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> (cherry picked from commit dabd6add51783f7b9fed502873dfa71beb936e96)
2015-10-17Fix 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> (cherry picked from commit b63dcee30b7b7138f135fffd5abb6d9fa16d4f28)
2015-10-17tdf#92124 DOCX import: don't add a dummy Suffix for an empty LabelFollowedByMiklos Vajna2-0/+12
(cherry picked from commit 3e27df1035677c7cca5200858d5d8e8283bf7aa9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/NumberingManager.cxx Change-Id: I0c4366ad0a2f81a198860869f670767343a392be Reviewed-on: https://gerrit.libreoffice.org/19032 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c33af041298fc4897ee1215efda488654955ebf7)
2015-10-17tdf#92454 DOCX import: allow overriding para prop from num style in para styleMiklos Vajna2-0/+10
Word has a feature like this: a paragraph style can refer to a numbering style, and both can specify paragraph margins. If that's the case, then the ones from the paragraph style has priority. In Writer, the numbering style has priority, so the only chance for correct import result is to set the margin directly on the paragraph in this case. (cherry picked from commit f4badd9a485f32f787d78431ed673e2932973887) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Iff3b03bcc56e0db3a48452c293acf41c91b8f159 Reviewed-on: https://gerrit.libreoffice.org/18794 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit d14c7b034d75730a85b5f6f843e39ff79840c272)
2015-10-17bnc#939996 tdf#93919 DOCX import: fix left-from-style and first-from-directMiklos Vajna2-0/+6
With this, <w:ind w:hanging="..."/> as direct paragraph formatting and <w:ind w:left="..." w:hanging="..."/> as a numbering level formatting is properly merged, i.e. w:left is not lost, defaulting to 0. (cherry picked from commit 56341e5d496f576dc45fe8e6c44831d780fecb73) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: If5534fbd9ee6d41139b0ed3a3df9d0cc5aad3239 Reviewed-on: https://gerrit.libreoffice.org/18906 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 8e911fe7e14d20ea5abe2991ed93ced62385462d)
2015-10-17Fix tdf#87500 - Freeze with English/Japanese mixture undo.Mark Hung1-18/+25
Language poolitem will be inserted after user completes editing with IME, making it refer to valid range when undo. Change-Id: Id2876aa74dba6f7d134b8e2df4d9b36a8f429bb1 Reviewed-on: https://gerrit.libreoffice.org/18392 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/18877 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 2b136504538a0b32e6ca9ae8fae8c41c084f4394)
2015-10-17tdf#86397 Bookmark: no consecutive name numbering applied when copiedCor Nouws2-3/+11
this partially changes behaviour introduced with commit bb00a0097900ae054401f7758a915047cfde4065 but without the performace problems from the old code thanks to kendy for helping (cherry picked from commit 2fcf8923d2c520a5a16b1b3a45877adaadd7eab4) Change-Id: I5dab81b58262f67db1c70223c612636a8b8c90ee Reviewed-on: https://gerrit.libreoffice.org/18816 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit a9670e0735b77ecc40aa8af4106af7d32ec548a0)
2015-10-17tdf#92521 DOCX export: handle section break right after a tableMiklos Vajna9-34/+62
DocxAttributeOutput::SectionBreaks() previously only handled the text-text and text-table node transitions; implement support for table-text to avoid loosing a page break on export for the bugdoc. (View this commit with whitespace ignored to filter out the noise about SectionBreaks() now accepting non-text nodes, too.) Change-Id: Ie8a1575374a207399351635bda8c0c076ce7268d (cherry picked from commit c916152d8562cab868d4c522748ac30029fad179) Reviewed-on: https://gerrit.libreoffice.org/18759 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3660e3c87d7aebb3bcec75268f8be0742680c4f6)
2015-10-17don't hang on busted subdocument offsetsCaolán McNamara2-4/+8
Change-Id: I5d1d18f864496ec98894703f0a22e211a9dd14a5 (cherry picked from commit a2b90cd04733c2ec3b9cb3bb56d95f3298571ecc) Reviewed-on: https://gerrit.libreoffice.org/18747 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 5a47be272727d3d300b4dcdc707375f24fb919eb)
2015-10-15java: 'final static' to 'static final'Noel Grandin1-1/+1
this is the canonical order, and it makes the code easier to read Reviewed-on: https://gerrit.libreoffice.org/16242 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 0c18bedb7328493040c1a20822b345e624d6041f) Change-Id: I272e7f1e140296e582702b6dbf77a03eefb65470
2015-10-14LOK: include part numbers in CALLBACK_SEARCH_RESULT_SELECTION payloadMiklos Vajna2-2/+9
Without that, the result in Calc/Impress is ambiguous. Change-Id: I8dfd8dafc996102ed583688fddd721c7600dc48c (cherry picked from commit ad280b67f8fda8f832a6a83bc5665df448c6ad00)
2015-10-09LOK: CALLBACK_SEARCH_RESULT_COUNT is redundantMiklos Vajna2-20/+6
1) The size of the searchResultSelection array in LOK_CALLBACK_SEARCH_RESULT_SELECTION provides the same information. 2) None of the clients except lokdocview used it. 3) Only sw provided this callback, not sc/sd. (cherry picked from commit f0e3fe840b6f103c589f044bbde18b2faa345279) Conflicts: libreofficekit/source/gtk/lokdocview.cxx Change-Id: I9da639b6693f24634f298f9bc4773f705e944359
2015-10-08editeng, sw, sc: use comphelper::string::join()Miklos Vajna3-26/+22
Change-Id: I9b0a32271a965bc4089720ccb61b26b67ceab7b2 (cherry picked from commit 1cb13d87b5d887718f6d81a842444b7251dc64cf)
2015-10-07sw tiled rendering: emit LOK_CALLBACK_SEARCH_RESULT* for normal searchMiklos Vajna2-0/+11
We used to emit these for find-all only, for no good reason. Change-Id: Id07dc7649f9a8528b9d4ec16d5f7c651fd607111 (cherry picked from commit 58c38e7ea5debc5440f1d81acf38d8d6ad0883d8)
2015-10-07sw: extract lcl_emitSearchResultCallbacks() from SwView::ExecSearch()Miklos Vajna1-42/+46
Change-Id: I9c6b7540bcae85d6529e5cc195a7e86f58ee5713 (cherry picked from commit ca8016c3a317a7ba1f03e117d575fb78a572b4b3)
2015-10-07Disable spellcheck when LOK is activeMiklos Vajna1-0/+3
It's not useful when viewing, and for editing probably a dedicated overlay would be better (like the one we have for cursor/selections already). Disable for sw/sd explicitly, sc had it disabled implicitly already. Change-Id: I7134f5d1a1546787c22019e6b1abdc0dd887f888 (cherry picked from commit c92ebc850345924619a12327f36cc6ac9c0b09d1)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 19:21:40 +0000