summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-07-31build fixcp-5.3-21Andras Timar1-1/+1
Change-Id: I8cc1b9fc7120249fc3a1287f70e7b4327eab62a6
2017-07-31tdf#109537: treat Temporary Internet Files as temp directoryMike Kaganski1-1/+28
... on Windows. Also, when testing against ordinary temp directory, use system path, not LibreOffice temp directory (thanks to Aron Budea). Change-Id: I52ecddc65097d6d64ec45e882cce8f1e7006794d Reviewed-on: https://gerrit.libreoffice.org/40594 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 22334f8a003d26c71d772a8e00fc80b7e6d2bef1) Reviewed-on: https://gerrit.libreoffice.org/40601 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-07-31Bump version to 5.3-21Andras Timar1-1/+1
Change-Id: I207c94c06740d95197ba305b9648fb95783ce01f
2017-07-31tdf#80807 guisaveas: never recommend system's tempdirJustin Luth1-0/+4
Various download-and-open mechanisms save to the system's $TEMP dir. If so, don't recomment saving in that same location in the GUI dialog! That's just silly. Change-Id: Ifa20fdfd81d768bbd893f92a50355f08c3aab356 Reviewed-on: https://gerrit.libreoffice.org/33353 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit eb9f90186ae52efa7ff884b3e64f5dd59ddc0329)
2017-07-31update creditsChristian Lohmaier1-1608/+1614
Change-Id: I13b07b0a60fdb9fdf736431c6af87d2c2d123182 (cherry picked from commit b1fd54a408602126003ffd5032fb86e95b2744cb) (cherry picked from commit 8cfb5788cc602e0a81ae47832c65cf2402471034)
2017-07-31Resolves: tdf#106872 only request selected shapesCaolán McNamara3-43/+45
that way we can avoid the super slow code path for filtered rows when we only care about selected shapes Reviewed-on: https://gerrit.libreoffice.org/40496 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 192d97cdf091af08a492416824918ea447bfb16f) Related: tdf#106872 factor out getting selected shapes (cherry picked from commit 221dae68df80298e81e6e6549636f3528f5c8bc3) Reviewed-on: https://gerrit.libreoffice.org/40519 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5e2ffa0b2eb7623d0c9ed37c30caea1452810646) Change-Id: I175fa841e406dbbe7075296f2e0a0e79fa115fb7 765c482a41e9681a1eb145c1833cc94f35a27db3
2017-07-31ofz: survive missing macro supportCaolán McNamara1-0/+3
Change-Id: Ica9c66fe09f7340f76f62e536527dc63b3735d90 (cherry picked from commit aa529a1957fce324c500753039ae7766b8dcf6a6) Reviewed-on: https://gerrit.libreoffice.org/40523 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a9a1306266e2fc67e8ac3029584d7a264fe37ff0)
2017-07-31don't jump back to selected slide on right click context menuCaolán McNamara2-3/+12
i.e. two many slides to fit in slide sorter panel, so scroll bar, select slide one, scroll to the end and right click between slides (or anywhere that isn't a slide) and without this fix the sorter jumps back to make the selected slide 1 visible. The right click menu will offer "new slide", choosing that will insert a slide at the point that was originally clicked, not at the point it was scrolled back to losing focus trigger a (dubious looking) callback to jump to the selected slide, so disable it while context menu is up Change-Id: Ie42bf158258cc38c9b7cfda7672f24d2ac8bfa11 Reviewed-on: https://gerrit.libreoffice.org/40383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5e0b0be9b34343070b422c8a1cef1671c51f5773)
2017-07-31ofz#2759 null dereferenceCaolán McNamara1-4/+6
(cherry picked from commit 6f5841e60ed29ae2577e63623edacc9fe1467ba5) Change-Id: I23671f0cea592c92a05b34b3cf284a47a73962b1 Reviewed-on: https://gerrit.libreoffice.org/40506 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 26222c3baca76eaed5f45dde4592a059e0e4a85d)
2017-07-31gtk3: Resolves: tdf#109277 take modifier key into account for dndCaolán McNamara1-2/+26
Change-Id: Id0aa4ced8644ddbee9e1a0453887f07907547aae (cherry picked from commit 0c840d9bf308464d58a2df8aaa1e61481b5e4f52) Reviewed-on: https://gerrit.libreoffice.org/40477 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3cb369463e4e9d0a00baee3adf10957d1ed7ed83)
2017-07-31tdf#108867 sw: fix dangling text box frame format pointers in UndoMichael Stahl2-0/+19
If the text box is removed, the SwFrameFormat of the drawing shape still retains a pointer to the frame SwFrameFormat, and the latter is owned by the SwUndoFlyBase. This is pretty bad, so try to clear & reset the connection between them in SwUndoFlyBase::InsFly() and DelFly(). Hopefully nothing will actually delete the drawing shape SwFrameFormat while the Undo object is alive. Note that when the SwUndoInsLayFormat is created when the text box is added, the GetOtherTextBoxFormat() returns null as it's set later, that's why the constructor can't do anything. Change-Id: Iae562b6f8f272e47b2b5cf8ee80778db15d29ce0 (cherry picked from commit 2e486daff35ab16e810bfdafb24b19bcbf2fe8cd) Reviewed-on: https://gerrit.libreoffice.org/40283 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 b39cb50c6afb47f39b21c3fb3ea913b902632924)
2017-07-31Resolves: tdf#109289 add SvxColorListBox::IsValueChangedFromSavedCaolán McNamara6-32/+27
and remove PushButton::IsValueChangedFromSaved (cherry picked from commit 39fd7e97c253153a10161ef3694b64e90e65e80a) Related: tdf#109289 move PushButton::IsValueChangedFromSaved to consumer inheriting the IsValueChangedFromSaved from PushButton has allowed undesirable behaviour to be selected (cherry picked from commit 247607727986df0fd0fef198459eb6646e056ea3) Change-Id: Ib1c51e27fd708c5d4811c90ef5659b4d55dd8860 fccb1657d2565005e6f9e239c6118f2e5ae7970c Reviewed-on: https://gerrit.libreoffice.org/40486 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d747a00f550cc8556e29b29b08c57f84afb4078f)
2017-07-31Related: tdf#106872 amount of a11y selection listeners constantly growsCaolán McNamara1-0/+2
so it gets progressively slower Change-Id: Ib53c69231c902d064b939be096e0dbeab2f0fc71 Reviewed-on: https://gerrit.libreoffice.org/40493 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 09716380e12ac2b7119afff20033ce2e7929ebd8)
2017-07-31tdf#99692 sw: fix bookmark positions in tables at start of redlinesMichael Stahl1-3/+10
The code assumes that if it can move the cursor backward in line 2038, that move can be "inverted" by moving the cursor forward after the content has been moved - but if the cursor moved back a node, and the moved content does not start with a SwTextNode, the cursor will move forward skipping over the non-text nodes, so offsets in the aSaveBkmks (and aSaveRedl, presumably) are going to be wrong. Just don't use Move() if it leaves the current node. Change-Id: I95278a10c14aeba9f76558486bb2712f6726dbcb (cherry picked from commit 850795942b3e168cab8ce88b4f2b421945ff29ca) Reviewed-on: https://gerrit.libreoffice.org/40419 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 be2a7025e5b62e9dab73886436ee52d5330ae381)
2017-07-31fix image map item idsCaolán McNamara1-6/+6
broken since... commit 4bbf35572d94efe8b321e3159e9810f52bc3f9f8 Date: Mon Jul 7 11:24:48 2014 +0200 RID_SVXDLG_IMAP conversion to .ui Change-Id: Ic08b82af0b8890fb910153c87fb170618d95f34f Reviewed-on: https://gerrit.libreoffice.org/40407 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a8f791ec013d9b703d12eb9f045e42d9b0e8bd1f)
2017-07-31tdf#97743: mediawiki accountJulien Nabet1-6/+9
To find main url in header section, search link containing: - load.php - or opensearch_desc.php In Wikipedia or wiki.documentfoundation.org, I haven't seen any link with index.php Change-Id: Iccb27aa8aaaf936faf8ec3b3f67eaa98d0426f19 Reviewed-on: https://gerrit.libreoffice.org/38631 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit e34b02834b24be4062ffd535aa1b929481ff427e) Reviewed-on: https://gerrit.libreoffice.org/38646 (cherry picked from commit c51e789b3a5b77b8bca03c3404699655b19ac80d)
2017-07-31tdf#109304: Seems infobar child window wasn't registered in MathKatarina Behrens1-0/+2
thus no signature status infobar appeared (I wonder if read-only bar ever worked too) Change-Id: I8829b2b6a17fb8d38e3ea79b87d544e3fb29f1c1 Reviewed-on: https://gerrit.libreoffice.org/40377 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit a542fe8d38811dff152b69796380e1feec7daa28) Reviewed-on: https://gerrit.libreoffice.org/40387 (cherry picked from commit ef4f47e27477f32f022f3d5f93475a58dc06f5e1)
2017-07-31add libebook-1.2.so.19 in EApi.cxxRico Tzschichholz1-0/+1
Change-Id: I900a190948087360bb4c3cd9235c9848333ad66f Reviewed-on: https://gerrit.libreoffice.org/40358 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5844d813411be8c4c7c394be07a49eaf92885758) Reviewed-on: https://gerrit.libreoffice.org/40362 (cherry picked from commit ffe568afd34be683430e6a31ca2368f957a4876d)
2017-07-31tdf#103984 : For bubble charts append data column...Dennis Francis3-1/+24
for "values-size" role too, after parsing in InternalDataProvider::createDataSequenceFromArray(). Without this, embedded bubble charts in documents(MSO) other than spreadsheets will be empty when imported. Also adds docx import chart2-unit-test in chart2import.cxx Change-Id: I63168074b30090a8b7cf977eb5af443f6b9ac240 Reviewed-on: https://gerrit.libreoffice.org/40258 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 0bdbd099bb52ae687196e06561e03c5c4d9c90eb) Reviewed-on: https://gerrit.libreoffice.org/40337 (cherry picked from commit 34845eca8a6965ef887f180baeffa3af2215c541)
2017-07-31update credits - with aliases fixedChristian Lohmaier1-839/+601
Change-Id: I486428da5459e758d23dd58b189b539896886c4c (cherry picked from commit c48f659a38af4da57cd1c978f17f2598de19156a) (cherry picked from commit ef1d2ab292ec912d4e17bc45ff3b42f59ee5b405)
2017-07-31update creditsChristian Lohmaier1-1557/+1747
Change-Id: I3d2a7bd97c085c68dc5036b6cb3731c24ed63aa2 (cherry picked from commit 8f338d85a576dcc636907ce036cb34559e9c7e36) (cherry picked from commit 4d26a07058deb514c8e6602261ddf94828c7f7cb)
2017-07-31Resolves: tdf#75650 reset boolean number format to General for new formulaEike Rathke1-4/+22
Change-Id: Iec2feefcbb5a92c64f182d93b4055fc009dbe1e5 (cherry picked from commit 1c1783864a356a4394f80dec28db939f4cf572cd) Reviewed-on: https://gerrit.libreoffice.org/40053 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c967cebeab0d5b343bd33d3a6f758aeaa40258f8)
2017-07-31Resolves: tdf#104186 spaces between function name and ( not allowed in OOXMLEike Rathke1-6/+22
(cherry picked from commit 7232980be6a4d67ed28a21b74ef3544cacb29d6a) Conflicts: formula/source/core/api/FormulaCompiler.cxx Backported. Change-Id: I6f6fcdab24a426d0f62052fa2d31f4098d1d893a Reviewed-on: https://gerrit.libreoffice.org/40086 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 6ff7de9c93e280cfe54a0ed660595c98d052ab11)
2017-07-31Blind fix tdf#108612 explicitly checking for and against clipboard documentEike Rathke1-1/+4
This is a combination of 2 commits. Attempt to blind fix tdf#108612 explicitly checking for clipboard document It seems that for some yet unknown reason in an (un)certain constellation ScDocument::IsClipboardSource() returns true because ScModule::GetClipDoc() does not return the clipboard document but the actual document instead, so destroying the clipboard document executes ScDocument::ClosingClipboardSource() and (or in earlier versions) ScDocument::ForgetNoteCaptions() on the actual document instead. Check also that ScDocument::bIsClip is set, hopefully curing the symptom, the real cause is something else. (cherry picked from commit d5020f35aec54f0241fa58557dc6caadc149f5a9) Another attempt to blind fix tdf#108612 Oddly in that scenario on Windows there are two clipboard documents alive when destroying one, so the destroyed one erroneously is said to be a clipboard source and then detachs the comments' caption information. There's no legit case where a clipboard document could actually be the real original source of another clipboard document, so bail out if the caller already is one. (cherry picked from commit 52e09f2c03f7cc024b2973c4806283c324fc23df) 0f8d240d8ec13bf91b77176dc6439a541cf14eaa Change-Id: I5ffd0706592d2737808e7004630a56c53115295b Reviewed-on: https://gerrit.libreoffice.org/40251 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c5917736e39ff1e5d6995f93e9108082a87d9e35)
2017-07-31tdf#109080 First page header/footer ODF (1/2)Luke Deller4-0/+33
The proposal to add <style:header-first> / <style:footer-first> to the ODF standard has not yet been accepted, so meanwhile we should be using an extension namespace for these elements. This first commit (intended for backport) adds support for reading <loext:header-first> / <loext:footer-first> (cherry picked from commit bff8cd3d52223002263dcb8c09758c4fc753b6e3) Change-Id: I616b6a0acaead9d767ae7d119e539b865f3a6774 Reviewed-on: https://gerrit.libreoffice.org/40228 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 63274a5b0528e82faf7eed9cbc50badfdd1d3b55)
2017-07-31tdf#109188 Always load documents read-only in SwOneExampleFrameSamuel Mehrbrodt1-1/+1
Should be no problem since 38a3743e0c5d52f9386f74097fd512d3133fbbe3 Change-Id: I0ce47bc2bdaa900559a16baf25305066977caa6d Reviewed-on: https://gerrit.libreoffice.org/40140 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/40213 (cherry picked from commit 14f9bb560cc1ebf588683bcf2297ab44cb8993eb)
2017-07-31tdf#107975: Revert "fix deleting an image anchored to last paragraphMichael Stahl3-19/+5
... in document" This reverts commit 2903d85d6197829633d7f96c95cd55821c2c20ff. It was a good idea, but is not complete. Change-Id: Ia0da2640889ce6e78b89b27c75fae9d6508afd40 (cherry picked from commit 14d2255cbd254dea6e87a04f747e7d6d3d54ceb9) Reviewed-on: https://gerrit.libreoffice.org/40191 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 1450f9f56c2053a1584f2f1a9e40c54971b57edd)
2017-07-31sw: make SwGrfNode::mpReplacementGraphic swappableMichael Stahl2-0/+27
Same as previous commit, but for sw. (cherry picked from commit a03a0cfb1e41c357950a40623c2f8b6f5507e97d) loplugin:staticmethods (cherry picked from commit 3039b7cae36abb7e9bfffa4fbbba023721376568) Reviewed-on: https://gerrit.libreoffice.org/39968 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 524377f1815773a678721c8ad179be9dbdaf7716) Reviewed-on: https://gerrit.libreoffice.org/40179 (cherry picked from commit 7d229d287ebc2ac961ee36ea048273dcc7ec405a) Change-Id: Id678de3f512204437e37aaedf24e24aff7a9e592
2017-07-31xmloff: ODF export: fix redundant setting of GraphicStreamURL swappingMichael Stahl1-4/+7
XMLShapeExport::ImpExportGraphicObjectShape() unnecessarily swaps out the GraphicObject by calling setPropertyValue("GraphicStreamURL") even if the URL didn't actually change from what was retrieved just a couple lines earlier, incidentally swapping it in too. Well actually it isn't really swapped out, it's marked as auto-swapped, but nevertheless on getting the "ReplacementGraphicURL" property its Graphic will be replaced by swapping it in again. So don't do that, then it's only swapped in once. This speeds up round-tripping the ML bugdoc from 3:20 to 3:00. Change-Id: I65a211a0c225444c06d5516df9c6716360be46c0 (cherry picked from commit b3992ddcd13082a934246b717ae22f57394e6533) Reviewed-on: https://gerrit.libreoffice.org/39966 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 753eb4b54c5ce2a1ce0f392505b5e18a1a10d905) Reviewed-on: https://gerrit.libreoffice.org/40177 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 953c801a678d8af180e27cf67b057136a55be60a)
2017-07-31svx: make SdrGrafObj::mpReplacementGraphic swappableMichael Stahl2-0/+31
These GraphicObjects clog up the GraphicManager cache so it's effectively useless. Round-tripping the ML bugdoc, this doesn't provide much of a speed-up by itself, but together with the previous fix it goes from 3:00 to 1:30 (in an optimized build). (cherry picked from commit c96e3e226fe4eb8f25c54cce4d653d12eda63ce2) Reviewed-on: https://gerrit.libreoffice.org/39967 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit c60344481a60f77ff86e7e5f1f1e952f7ba76d90) Reviewed-on: https://gerrit.libreoffice.org/40178 (cherry picked from commit 142ab1c3e452109d2e5143d26abc6f13e904d7a7) Change-Id: If52e176c790b94ffef9984be53376a34345b06e3
2017-07-31tdf#104883 Don't call InstallFontconfigResources if it's not availableSamuel Mehrbrodt3-0/+25
We need to call it once because we have no other way to detect whether it's working or not. But if we receive an error the first time, we disable it from now on. Change-Id: I67dba8b65660ff7e05bdf2ddc18b565550901cd1 Reviewed-on: https://gerrit.libreoffice.org/39895 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 f86d9d732d9b2aa711d321a8c9f4110b638560b4)
2017-07-31don't use memset on structure with std::shared_ptr memberMarkus Mohrhard4-6/+39
Change-Id: Ie6033b9820435bb6a45aa70f9a48115000571e0f Reviewed-on: https://gerrit.libreoffice.org/40004 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c7fe625c8d41f648f89765abc40bb7b8fd4ed12a) Reviewed-on: https://gerrit.libreoffice.org/40011 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5b9654f240b77448954c707e53adcdfccbdc74f4)
2017-07-31Resolves: tdf#93745 gtk3 spinbuttons are wider than available spaceCaolán McNamara1-16/+16
make dialog 40 pixels wider and allocate 20 extra pixels per spinbutton and shift labels accordingly Change-Id: Ic7e5dd662e01207abcbcbb9043f927eceb5b2bd0 Reviewed-on: https://gerrit.libreoffice.org/39905 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit c1f7d3819387c442b3acb54b09091dd116f28d5e)
2017-07-31Windows build fix: ambigous symbolTamás Zolnai1-0/+7
Caused by: ae86557de53a8762924f18c78a556e2d6881002a These namespaces were removed from the cxx file, but not from the header. Change-Id: I5bae177638f0c9d404aac0fa4577689965ef5c26 Reviewed-on: https://gerrit.libreoffice.org/40585 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-07-28support for filter dialog when an image is exported from context menuMarco Cecchetti6-50/+227
When user save the selected image in a non-vector format the filter dialog used in Draw pops up for filter setting. Conflicts: svtools/source/filter/SvFilterOptionsDialog.cxx svx/source/xoutdev/_xoutbmp.cxx Change-Id: Ic98b48a47322e807627b7a2ccd8044ec0db30efc Reviewed-on: https://gerrit.libreoffice.org/40243 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-07-28lok: sc: copy / paste confusion -- workaroundMarco Cecchetti4-2/+58
Problem: 1. (a) copied April 2. (a) pasted -> April 3. (b) copied March 4. (a) pasted -> March [should have been April] where (a), (b) are different views Solution: A real solution would require to have one clipboard per view. This patch is only a workaround, which doesn't allow to paste content which has been copied in a different view; it takes also care to disable the "Paste" entry in the context menu. Change-Id: I3254f130af106299b0b519884a4ca03db08fc4c8 Reviewed-on: https://gerrit.libreoffice.org/40460 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-28tdf#109313 tdf#108494: fix incorrect Watermark positionSzymon Kłos1-9/+5
Change-Id: I578d89cb732bf3e75b83ee6c65d0320659b5c3f8 Reviewed-on: https://gerrit.libreoffice.org/40514 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 1cbe551d86ec528533fee04f20c490a96c0ec3d3) Reviewed-on: https://gerrit.libreoffice.org/40524 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-28tdf#109314 the same Watermark for first pageSzymon Kłos1-149/+158
Change-Id: I37e0ab40bd76c34a52751d10bc5857c357ad52e9 Reviewed-on: https://gerrit.libreoffice.org/40501 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/40518 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-28Added SAL_NOLOCK_PROFILE variable to ignore lockfileSzymon Kłos1-8/+10
Change-Id: I4fb250468fc17fc8be94d666ef231636b4609c1d Reviewed-on: https://gerrit.libreoffice.org/40100 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-28tdf#109524: use 100% table width when there's no explicit width availableMike Kaganski3-3/+22
According to ECMA-376-1:2016 17.4.63, 17.18.87, etc, all table widths are considered preferred, and actual table layout should be determined using an algorithm described in 17.18.87. When w:tblLayout element is omitted, or there is no explicit width information given, it is assumed that AutoFit Table Layout should be used, i.e. using cells content to determine final widths of table grid. In the description of the AutoFit Table Layout algorithm, it is stated that the table width grows to hold data, but no more than page width. As a first approach, this commit just sets table width to 100% when there's no width data available. TODO is to implement the AutoFit Table Layout algorithm properly. Change-Id: I000c548eb152c70d2c6e053f4d2b1d16e8976c27 Reviewed-on: https://gerrit.libreoffice.org/40500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit cae5dd9363b68dbabbeb2069f4aee7d057f6b5a8) Reviewed-on: https://gerrit.libreoffice.org/40508 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-07-26lok: sc: edit view gets misplaced by other view actions on row/columnMarco Cecchetti5-30/+46
Change-Id: I3f9301c31f38783083fb521d056d8088fc2e508b Reviewed-on: https://gerrit.libreoffice.org/40017 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-26sc lok: disable Undo/Redo state if conflict with other viewsHenry Castro3-6/+93
Change-Id: I5bc5be2b17925ec3a203f9704f62a8c80ac5fc9d Reviewed-on: https://gerrit.libreoffice.org/39363 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/39402 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-26sd lok: disable undo state if conflict with other viewsHenry Castro2-32/+91
Change-Id: I046d118fca32c95f7734d6e29598da56578c9ec0 Reviewed-on: https://gerrit.libreoffice.org/39333 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/39400 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-26sd lok: fix Undo/Redo Document RepairHenry Castro5-80/+57
REPAIRPACKAGE is sent to enable Undo/Redo actions when two views have conflicts. Change-Id: I58133f5b9006c41a297711c52ed0acfce3c19f92 Reviewed-on: https://gerrit.libreoffice.org/39325 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/39398 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-25Defer also loading of the English CalendarWrapper, tdf#109045 follow-upEike Rathke1-4/+8
Always constructing the en-US CalendarWrapper defeats the original intention that not for every construction of SvNumberFormatter a calendar is needed, plus if no en-US is requested constructing such calendar is just wasted. Since commit 2a22696546ace75c38a72ad13f7383aedd00e06a Date: Mon Jul 10 15:56:32 2017 +0200 tdf#109045: store en calendar separately in OnDemandCalendarWrapper Change-Id: I06e13754f03fc1fe4fbf48b76ccb82c917606480 (cherry picked from commit 21394b08475d1d869aa62c1dbb46c3dcc93ae3f0) Reviewed-on: https://gerrit.libreoffice.org/40094 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit edc2ba3bddf2d9a4c72a4ca90579c66f229a6a47) Reviewed-on: https://gerrit.libreoffice.org/40414 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-25crashtesting: 554 crashing documents on export to .docCaolán McNamara1-2/+4
regression from... commit d72e0cadceb0b43928a9b4f18d75c9d5d30afdda Date: Mon Jun 19 15:32:16 2017 +0200 Watermark: tdf#91687 correct size in the .doc hopefully this fix is correct Change-Id: I17512ffdd4db605e79b3adb97551e6f4e3816f2f Reviewed-on: https://gerrit.libreoffice.org/39661 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 661fa18d424690e1c3bce4ac70a8018dabe82637) Reviewed-on: https://gerrit.libreoffice.org/40406 (cherry picked from commit fa4a86135dda98c8b2de85a677ffb3cdc8f4e28b) Reviewed-on: https://gerrit.libreoffice.org/40412 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-24Fix buildAron Budea1-1/+1
after c478d1b3cc371d3b9e8147ff57347f99d25c565e error: looser throw specifier Change-Id: I458b5aaa58f10b951c823cae3d32ef1832c11787 Reviewed-on: https://gerrit.libreoffice.org/40378 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-24Implement mail merge data source from Writer tablesMiklos Vajna56-106/+2108
This is a combination of 17 commits: connectivity: add initial writer backend Similar to the calc one. As a first step the Driver and the Connection interfaces are implemented, though the later has some stubs. (cherry picked from commit 69068f2228147ca0d252762612edbcab0713cdfa) connectivity writer driver: initial DatabaseMetaData implementation With this the list of tables is visible in Data Sources. (cherry picked from commit d7ac239793905564d2754edc52611930b6ba2cdc) connectivity writer driver: add Catalog implementation But leave OWriterCatalog::refreshTables() as a stub for now. (cherry picked from commit 6fb3e3a9c1dd1aec8a1ba90fea51e32048e609bf) connectivity writer driver: add Tables implementation But leave OWriterTables::createObject() as a stub for now. (cherry picked from commit 60020f61339e5836f5a481909c1183af2734f569) connectivity writer driver: add Table implementation Gets rid of the stub warnings in OWriterTables::createObject(). (cherry picked from commit bec2da98c74dc4c02561641862de15e5d2630fa2) connectivity writer driver: add Columns implementation Gets rid of the stub warnings in OWriterTable::refreshColumns(). (cherry picked from commit a11ddfdcf3f5021cbeb0f065694d875bb748dc76) connectivity writer driver: add PreparedStatement implementation Gets rid of the stub warnings in OWriterConnection::prepareStatement(). (cherry picked from commit ac3c24bec925dd53f07b2827dab0d71c0dbaedee) Conflicts: connectivity/source/drivers/writer/WConnection.cxx connectivity writer driver: add ResultSet implementation Now column headers and table data show up on the UI. (cherry picked from commit a93c89894feb663df37609c95d4db523120c0bc1) connectivity writer driver: add Statement implementation Gets rid of the OWriterConnection::createStatement() stub warning. This is the last interface which was not supported by the writer driver, as far as I see. (cherry picked from commit cad0d8df38cf390d0615668ce2ab7c8f7ee42cde) connectivity writer driver: mention Writer in display name It was just "Document" to be consistent with Calc's "Spreadsheet", but it's confusing as we have a Text driver as well. (cherry picked from commit 5445de1432fd65fb3ef613d1dafd2bbb9b99b265) dbaccess: introduce DATASOURCE_TYPE::DST_WRITER By mostly reusing the spreadsheet code. This way the UI allows creating a data source where the backend is a Writer document (containing at least one Writer table). (cherry picked from commit 36f2df84fcfc21038b4d20df38a9e5addfcbde3f) sw mail merge: add support for the new 'writer' connectivity driver By mapping the .odt, .sxw, .doc and .docx extensions to sdbc:writer:. If we are at it, also accept xlsx next to xls. (cherry picked from commit 83b43ef2223b66484e0e90e7b614886e06f955b5) Conflicts: sw/inc/dbui.hrc sw/source/uibase/dbui/dbmgr.cxx sw mailmerge: add writer data source testcase Fails with commit 83b43ef2223b66484e0e90e7b614886e06f955b5 (sw mail merge: add support for the new 'writer' connectivity driver, 2017-07-18) reverted. (cherry picked from commit d9b0108e3af7244179bcc7b07db9d0826c3ac8a6) connectivity: merge OCalcResultSet and OWriterResultSet Into a single OComponentResultSet, as both of them just provide data source functionality based on a file loaded into an LO component, so they can share code. (cherry picked from commit e473d49acc127ece76eb31cb3610e3950f35d9d9) Conflicts: connectivity/source/drivers/component/CResultSet.cxx connectivity/source/drivers/writer/WResultSet.cxx connectivity/source/inc/writer/WResultSet.hxx connectivity: merge OCalcStatement and OWriterStatement Into a single OComponentStatement, as both of them just provide statement functionality based on a file loaded into an LO component, so they can share code. (cherry picked from commit 4073bc15d1aa1b46b2e0953d6316f2ab6a23dc87) connectivity: merge OCalcPreparedStatement and OWriterPreparedStatement Into a single OComponentPreparedStatement, as both of them just provide prepared statement functionality based on a file loaded into an LO component, so they can share code. (cherry picked from commit 196ee66d4aab62678a8cfb762379909bdda16051) connectivity: merge OCalcColumns and OWriterColumns Turns out createObject() only needs the base class OFileTable, and then these can be shared. (cherry picked from commit d3d9292a0fb414e6721b2f3b12b7e283caed946d) Change-Id: I6e8a83155dbbbc3d85794e190c2e710d01902017 Reviewed-on: https://gerrit.libreoffice.org/40231 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-24Resolves: tdf#99071 tree view shows odd text widths when > 100 linesCaolán McNamara1-19/+1
reverts commit 62ea355b2679073b8ee326df5793231996136da9 Date: Thu Dec 12 09:55:35 2013 +0100 fdo#72125: GetTextWidth() can get very expensive. Let's just count an approximate width using a cached value when we have too many entries. The expert dialog got fixed by not populating it with all options on load and instead by incremental disclosure as the users searches/expands it so this optimization effort isn't needed in the meantime there was another problem the above papered over with commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001 Date: Sun May 17 22:56:46 2015 +0900 refactor how font, fg. and bg. are applied in widgets/controls which was fixed (hopefully) in the previous commit Change-Id: I8383d9cd7a9983a85c7f3acec0281d984c44f9e7 Reviewed-on: https://gerrit.libreoffice.org/39951 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/40193 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-07-24list views are recalculating layout on every paintCaolán McNamara1-1/+0
instead of when the font changes since... commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001 Date: Sun May 17 22:56:46 2015 +0900 refactor how font, fg. and bg. are applied in widgets/controls Change-Id: I8c9ebeb8d85f2c8b5e5ddc0aa03b6d64b5348132 Reviewed-on: https://gerrit.libreoffice.org/39950 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/40192 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>