summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-09-13tdf#117988 writerfilter: IgnoreTabsAndBlanksForLineCalculationJustin Luth3-1/+6
Introduced in LO 4.0 in a mass copy of compat settings in commit 355d25eac764713f4d52eac801ade6e2ff1deab0 Reviewed-on: https://gerrit.libreoffice.org/57991 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 49ddaad2f3ba4e17e1e41e94824fb94468d2b680) Change-Id: I0d95941ff2815a43e571be1a6a0dbab1d12185d6
2018-09-12python: add sample python script to insert/replace textAshod Nakashian1-0/+61
Change-Id: Idde3cd22ecc1f1bd34f7519acedc85584ed2deaf Reviewed-on: https://gerrit.libreoffice.org/58160 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-09-12sw lok: delay processing idle jobs to let LOK finish initializationAshod Nakashian2-3/+29
When loading document, LOK needs to setup the client view, register callbacks, get document size and type, etc. All of these need to take SolarMutex, which is taken by the idle jobs immediately after loading, blocking LOK from finishing initialization and rendering the first tiles for the user. This gives the user the impression that the document is loading for far longer than it actually is, due to lack of interactivity (or indeed any activity on the screen besides the spinning wheel). By delaying the idle jobs, we allow time for LOK to finish initialization and render the first tiles before the idle jobs kick in and hog SolarMutex. Reviewed-on: https://gerrit.libreoffice.org/56572 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 1056640a6e1fd044cb61f5bf5ee85dfec3cbeb7c) Change-Id: Ic6f437bfd6f43dfed2aaa1a9d3510d43f5ec30ae Reviewed-on: https://gerrit.libreoffice.org/58157 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-09-12desktop: move font initialization into preloadDataAshod Nakashian1-24/+26
Reviewed-on: https://gerrit.libreoffice.org/57160 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit bbba0902fc1f1c6bb2a7f1e6ff2b682e2fbd3cc9) Change-Id: I66840512b45e987cc7b08b07b65bdb24f2023a41
2018-09-12desktop: move dictionary preload before font initAron Budea1-2/+2
spell-checker is initialized during font init since e7f65920b12517b31f0c5cbfd0dcb8df96d20ba4 Change-Id: Ia5b5223aa8cc00d0e80451142ae18a7046ad00d4 Reviewed-on: https://gerrit.libreoffice.org/57064 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2018-09-12desktop: initialize fonts in pre-initAshod Nakashian1-0/+27
Reviewed-on: https://gerrit.libreoffice.org/56573 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit e7f65920b12517b31f0c5cbfd0dcb8df96d20ba4) Change-Id: I5a3acc41196c7e0672514fa2dae00e5fc0f76a1f
2018-09-12tdf#82177 docx export: eliminate invalid tcPr insideV/H bordersJustin Luth4-24/+7
better fix than cecf71c18da5430c10daa8522d38d5144edefc14 since: 17.4.25 insideV (Table Cell Inside Vertical Edges Border) This element specifies the border which shall be displayed on all interior vertical edges of the current group of table cells. [Note: Although individual table cells have no concept of an internal edge, which would render this property useless in most cases, it is used to determine the cell borders to apply to a specific group of cells as part of table conditional formatting in a table style, for example, the inside vertical edges on the set of cells in the header row. end note] So, I interpret this as insideV/H having meaning only within table styles, and not when directly applied to a cell. The only documents I've seen with insideV/H directly applied to a cell seem to have been created by LO - which dumps them everywhere, redundantly. Tablestyle cell groupings are handled elsewhere via grabbag dumps, so insideV/H borders can be eliminated from TableCellProperties. Change-Id: I128417f0a0b485c85ede463daacb8feabc457302 Reviewed-on: https://gerrit.libreoffice.org/60187 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d934fe802c228d5478cea228b84ba56b6c9b9241)
2018-09-12tdf#102290 sw ui: give all columns a chance to growJustin Luth1-1/+5
Previously, if an earlier column wished for the entire table width, then none of the other columns could adjust their size, even if they only wanted one more character. This slight change gives every column a chance to "wish" for an equal portion, and still gives the earlier columns a chance to maximize. So, this should implement very similarly to before, thus workflow should not be impacted. Change-Id: I11e8b94ce333735aa92b5388af6319f8eb0ccc51 Reviewed-on: https://gerrit.libreoffice.org/60027 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 62159ea8cc806df327461275563e95dfdff25667)
2018-09-12tdf#94009 ww8export: always export section marginsJustin Luth5-0/+104
Since the internal SW defaults (0) don't match the import defaults, always write the top/bottom, left/right margins into the document definition. It is very rare indeed to have a zero margin anyway, since the page margin being zero is highly discouraged because of printing. The bug report is for DOCX, but it also affects DOC. I don't have an example where LRSpace is skipped, but it only makes sense to treat these two the same just in case. Change-Id: Ie9a08ad0dd4f73bc976756fe244fc33e2dc804f3 Reviewed-on: https://gerrit.libreoffice.org/59967 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit efd316b6171b9e1827c5e34ddb12658f48268e24)
2018-09-12tdf#82177 docx export: no inside borders on outside cellsJustin Luth5-5/+27
Well, not on the bottom or right outside cells. Obviously the presence of a bottom or a right in those cases doesn't indicate an inside line. Reviewed-on: https://gerrit.libreoffice.org/59600 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit cecf71c18da5430c10daa8522d38d5144edefc14) Change-Id: I5d0661fd60f478a392b12fe9093c2e47e130631b
2018-09-12tdf#115670 vml shadow: shadow is off unless explicitly set onJustin Luth2-1/+5
The absence of "on=" is treated in Word (tested 2003) as off. Change-Id: Ibc6b0e5ca0f25a9c3ca1b9505fa24c4d821bfd0 Reviewed-on: https://gerrit.libreoffice.org/59457 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b914c4c98bfca32168ff05fec7cc687c95754d36)
2018-09-12tdf#119232 ww8import: even page means default to start on page 2Justin Luth3-3/+14
I didn't see this mentioned in the sprm documentation, but that is how MS Word seems to implement it. Change-Id: I5b86ecf99a884e768877cdb0e71f43cdb9f2ad76 Reviewed-on: https://gerrit.libreoffice.org/59221 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2127581728ae61eca7470b288c21d1c02754fb5b)
2018-09-12tdf#57589 writerfilter: support hash-encoded colorsJustin Luth3-0/+23
Previously, a hash-encoded value would simply fail to zero and thus the color would be dark black. The unit test covers two conditions. Paragraph 1 has a valid encoding, and pararaph 2 has an invalid coding (which is ignored and fails to COL_AUTO). Change-Id: I68940f5c4b0975a87feb6cab8fb3572b7546a077 Reviewed-on: https://gerrit.libreoffice.org/59295 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 7d01ce4021bafde8184355f46d1cbe2c370767e1)
2018-09-12tdf#37223 insert OLE tables in text tables as native text tablesLászló Németh1-3/+28
to solve the long-standing problem of Calc/Writer integration, ie. now Calc table data are inserted cell by cell in Writer text tables instead of putting an unwanted second table over the original, as an OLE object. First insert the OLE table as a nested native table using paste special as RTF, and cut and paste that to get a native table insertion, removing also the temporary nested table. This fix has got correct undo, but unfortunately, also a small flash during insertion by the temporary nested table. I've tried to fix that by LockView and LockModify, but it seems, they don't help. Note: the planned solution mentioned in the original OOo issue (reported in 2004) suggested to use a hidden temporary document, but that has got poblems with clipboard usage. Change-Id: I49253239f1878bce5fc4c93494f997ed37101a1c Reviewed-on: https://gerrit.libreoffice.org/58346 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 80d3d1044a1ad921bff990e2c4bb4dbf7c0a35c6)
2018-09-12tdf#37223 Writer: insert 1-cell tables as text instead of OLE objectLászló Németh1-2/+21
to get a user-friendly solution to copy Calc cell content to a text document and to its native tables. NOTE: MSO does the same for copying 1-cell tables, while LibreOffice was able to do this only with paste special as RTF. Change-Id: I6156333055aa9bed4cf56ff12f913e89d3f5700c Reviewed-on: https://gerrit.libreoffice.org/57783 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit b9d18daf5b23155a9b4dfcdd5d1f23ed53bc3849)
2018-09-12tdf#118533 fix shape import: zero top margin only in first paragraphLászló Németh3-2/+6
commit 0307a62790b33ee0c02c2323a8f759e53e2035a4 fixed the top margin import of the paragraphs of document sections, and import of first paragraph of the text frames with beforeAutospacing, but nullified all other paragraph top margins in frames. Note: there is no visible margin difference in the unit test (extended by this commit) before and after the fix, because the first paragraph uses also afterAutospacing, resulting still 14pt paragraph space. But the tested beforeAutospacing value of the next paragraph checks the fix correctly. Change-Id: I0ab3b8bbff33c5488f4b4af1ea4dabf7105103f2 Reviewed-on: https://gerrit.libreoffice.org/57231 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 970eaaf1bdade63fd651db591c683e36e662f8f5)
2018-09-12tdf#118533 RTF/DOCX import: fix beforeAutospacing for first paragraphLászló Németh6-3/+30
of a text frame (first bug of tdf#104354), a table cell or a document by setting zero top margin here. This bug could result non visible paragraph content in narrow frames, as in the test document of the commit. See also commit f737c9386a605cb7d8c9dbc210c557f98f6cdc19 for a similar fix for first paragraph of a shape. Fix top margins of the first paragraphs of the affected tdf#82006 and tdf#107480, adding also new paragraphs to their RTF tests cases to keep the original tests, too. Reviewed-on: https://gerrit.libreoffice.org/56737 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 0307a62790b33ee0c02c2323a8f759e53e2035a4) Change-Id: Iea3c735eeb262233b82090fb9491991ed2df2b4e
2018-09-12tdf#107690 DOCX, XLSX and PPTX unit tests for "Open as read-only"László Németh6-2/+32
ie. OOXML export/import of "_MarkAsFinal" MSO document property. Reviewed-on: https://gerrit.libreoffice.org/56475 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit bbdb6cb8ed0d77eeb2e413b38f29d2084bd8257b) Change-Id: I01f0702d5467e78eb93ce8dce8ba25874839c3e3
2018-09-12tdf#107690 OOXML import/export of setting "Open as read-only"László Németh6-19/+80
Import custom document property _MarkAsFinal as LoadReadonly setting, export LoadReadonly as _MarkAsFinal in DOCX, XLSX and PPTX documents. Before this fix, LibreOffice opened read-only OOXML documents as editable, also saved and exported _MarkAsFinal=true silently, resulting unintented read-only warning info bar in MSO. This commit improves interoperability a lot, because this is a basic document protection of MSO, recommended on its UI. Note: LoadReadonly (on File->Properties...->Security, property "Open file read-only") doesn't show "Edit read-only" info bar from commit 630186ff4e0eba7317e542f8c3eca39ebd068721, but it's still possible to switch on editing by Edit->Edit Mode. MSO shows info bar for _MarkAsFinal. (There is an advantage to hide the info bar in LibreOffice in a mixed environment, to avoid overwriting of press-ready MSO files by LibreOffice.) Note 2: Other differences of LoadReadonly in LO and _MarkAsFinal in MSO: (1) Switching on editing doesn't remove the LoadReadonly property automatically in LO. (2) Saving with LoadReadonly doesn't switch off editing of the actual (still opened) document in LO. Reviewed-on: https://gerrit.libreoffice.org/56180 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 9a5c56a9c4e04589b0a6bb710573922e459d9685) Change-Id: Ie279c0670090d075103384cfa44ff1c2a2898216
2018-09-12filter clean-up: remove duplicate of checking EMF magic headerLászló Németh1-15/+11
Change-Id: I63fd380be974c1d15beef0d2cfec42350119ae2f Reviewed-on: https://gerrit.libreoffice.org/56050 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 4188a037fbaf3618df26e1661a4586483036f055)
2018-09-12tdf#108064 OOXML export: keep preset dashes with any line widthAdam Kovacs6-39/+32
Change-Id: I496e1cbac527383837a4e8fcdee42967ecf555e4 Reviewed-on: https://gerrit.libreoffice.org/59968 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f3d6c44c9cb533fe4f1cd28fc95adc36cac4bfd5)
2018-09-12tdf108064 OOXML export: keep preset dashes in shape outlinesAdam Kovacs3-9/+35
Extending commit d7551e32609d0e0de8ac419576ca42d65c5015be to all default MSO 2016 preset dashes: Saving an ooxml file with LibreOffice now preserves the prstDash tags with the values sysDot, sysDash, dash, dashDot, lgDash, lgDashDot, lgDashDotDot, instead of converting them to custDash tags. Note: the import of the preset dash outlines are still not relative to the line width, in spite of their original behaviour in MSO. Change-Id: I65eaf06952a968019495664067010c874fce1352 Reviewed-on: https://gerrit.libreoffice.org/59203 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f5f235051055d24c8aced602078c54261603efea)
2018-09-12tdf#108028 OOXML: Fix line breaking of chart titleBalazs Varga1-0/+1
With adding the "TextMaximumFrameWidth" property to the chart title's textbox property, it breaks chart titles longer then the chart width, as in OOXML reference implementation. LibreOffice previously distorted the text and squeezed the chart. This patch will fix it. Change-Id: Ic086d25b49e9c5cf9c6f2c79f141592749adc7d8 Reviewed-on: https://gerrit.libreoffice.org/59991 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 063e92004b65411dbee7fc12ab00c78aa9c69a86)
2018-09-12tdf#119617 Fix export of Autofit property of shapes to PPTXBalazs Varga3-0/+22
With this patch the "Resize shape to fit text" property (TextAutoGrowHeight-->spAutofit/noAutofit) will be exported correctly to PPTX format. Change-Id: I5fa975c6390a17bad30c360b3b17aa944bbe72af Reviewed-on: https://gerrit.libreoffice.org/60043 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 86b14cc8bd910651cef422a0f7408adc0fc51a17)
2018-09-12tdf#119562 Fix export of AutoFit property of shapes to XLSXBalazs Varga3-1/+17
With this patch the "Resize shape to fit text" property (TextAutoGrowHeight) will be exported correctly to XLSX format. Change-Id: I488ceead452aef9096e7766f957de425c8486f85 Reviewed-on: https://gerrit.libreoffice.org/59778 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 7626dc2d81dc5eb647d6f8937cc1d220a8b8ef4b)
2018-09-12tdf#94502 Fix overlap export of Stacked Bar Chart to *.xlsxBalazs Varga3-1/+39
Export the Overlap value with 100% for stacked charts, because the default overlap value of the Bar/Column chart is 0% and LibreOffice do nothing with the overlap value in Stacked Chart case, unlike the MS Office. Change-Id: If4e20b88c2b1180f68a8d2b610c407d674a8498b Reviewed-on: https://gerrit.libreoffice.org/59448 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins (cherry picked from commit 17c2b0af97f73b9103be982b15d7111b3980e027)
2018-09-12tdf#118153 VBA Macro: add XLSX support to Workbooks.Openbvarga911-0/+1
by accepting "MS Excel 2007 XML" in isSpreadSheetFile(). Test example: Workbooks.Open Filename:="/tmp/test.xlsx" Change-Id: Id7102325c96842bb413b1fb7bb8162e8bca41f4e Reviewed-on: https://gerrit.libreoffice.org/57030 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit fc434c8fd62ccb6d083af075f1ab83da6bd76b8d)
2018-09-11Bump version to 6.0-10cp-6.0-10Andras Timar1-1/+1
Change-Id: I8d7844fc7e2f67bc338cb1fb67b2bf792aca38e3
2018-09-11sw: tdf#119742 fix null pointer in SetCursorInHdFtJuergen Funk1-1/+2
In SwWrtShell::ChangeHeaderOrFooter the ChgPageDesc destroys the frames of the header, that's why GetCurrFrame returns null later. Change-Id: I26915237c8b455a5b8ad0bbd5c2de38537dfef08 Reviewed-on: https://gerrit.libreoffice.org/60130 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 77d075facaf4fc8954666ad541ed14f75d964fba) Reviewed-on: https://gerrit.libreoffice.org/60302 Tested-by: Jenkins (cherry picked from commit 6a8b0d2a9c52b0706772c3b05edc4da995211dc6)
2018-09-11tdf#114400 Import drawoo:fontwork-xyz attributesIlhan Yesil1-0/+15
Either the document has attributes in the old namespace or in the new, both will be imported. But export is still in the old namespace. Change-Id: I9f4d1ca0d8af37c13b513f99cc7d254c68867bb2 Reviewed-on: https://gerrit.libreoffice.org/59405 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 278e66488135c8fa2714520d056573c64ea803cf) Reviewed-on: https://gerrit.libreoffice.org/60207 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9b9e6de5c4f6fe3eb9b02e91f7dd7e482ecac5fe)
2018-09-11update creditsChristian Lohmaier1-1859/+1890
Change-Id: I946580363eb272f95694b000d6daa997e761285d (cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d) (cherry picked from commit 44f55da18947f4721590381683bac6302616b561)
2018-09-11mysqlc: Fix XResultSet::absolute and previousTamas Bunth1-1/+4
We need to update the actual row position after using absolute or previous. Change-Id: Ie85f9679b7a06649a88ac8ee08436bf7f4a58a22 Reviewed-on: https://gerrit.libreoffice.org/60329 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-09-11tdf#118845: make HiddenPara have higher priority deciding visibilityMike Kaganski6-17/+112
Otherwise, a Database field in a paragraph which is non-empty would force the paragraph to be visible, regardless of HiddenPara field telling it to be hidden. Regression from commit db04be037b611e296ef9f2542322c52ed82d7a2b Reviewed-on: https://gerrit.libreoffice.org/59792 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 64cb57c82d9e7f7069821b2e2ef92574ec73ebe2) Reviewed-on: https://gerrit.libreoffice.org/59865 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Change-Id: I21807e22bd339fd1ea0aaa3b382579f688903418 Reviewed-on: https://gerrit.libreoffice.org/60025 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-09-11tdf#109229: Set "TextBox" prop before filling textbox-related propsMike Kaganski3-5/+33
Otherwise those properties aren't set, and defaults are used Change-Id: Ib6671c019ff652ec5b59d9cbbf02a4e536a17817 Reviewed-on: https://gerrit.libreoffice.org/60267 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c3422cd205d8da852f5c310b5f08028d6c4c5eb4) Reviewed-on: https://gerrit.libreoffice.org/60297 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-09-10tdf#108691, tdf#119639 Don't print hidden objects in XLS(X)Aron Budea5-7/+53
In Excel hidden drawing objects aren't printed. When not hidden, printing is controlled by a separate 'Print object' setting. Only rely visibility setting for now, but properly: visible means also printed, hidden means not printed. Ie. import visible property also as printable, and only output visible property in XLS(X) formats. For the future, in XLSX format printability is controlled by attribute 'fPrintsWithSheet' of element 'clientData', don't know about XLS, there fUsefPrint/fPrint bits don't appear to be used anymore (see note in tdf#119639). Reviewed-on: https://gerrit.libreoffice.org/59915 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit b38065ea941375bf4f78f13314e84f4a875545d9) Change-Id: I728107b30056f7bf073f2fefddece1bef1eb2e7a Reviewed-on: https://gerrit.libreoffice.org/60275 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-09-08Revert "tdf#110987: type detection, binary Office formats > templates"Aron Budea1-8/+8
This reverts commit c1817a5b12da642e365a3ef72b556d33c6e29a76. Change-Id: Ia1442dedd07436e5954943c6ff09ed8d9d2b9fc6 Reviewed-on: https://gerrit.libreoffice.org/60197 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 1bb732acc6b4d3de94f343041472ccc096723b30) Reviewed-on: https://gerrit.libreoffice.org/60204 Tested-by: Aron Budea <aron.budea@collabora.com>
2018-09-07Bump version to 6.0-9cp-6.0-9Andras Timar1-1/+1
Change-Id: I52427a36808fd47dabf4ba26916f626c7956389e
2018-09-07mysqlc: ensure cursor is not out of rangeTamas Bunth2-22/+70
when calling getXXX() methods of a simple result set. Change-Id: I9e018385bb73468ea520b03275232c0982cbcba0 Reviewed-on: https://gerrit.libreoffice.org/60095 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com>
2018-09-07upgrade curl to 7.61.1Thorsten Behrens1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/60042 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d15d3ce697e88e72cec84b5b9b9619a37a8ae7ed) Conflicts: download.lst Change-Id: I4590f5f705dd08c63a1532ce5afa94a3af953f24 (cherry picked from commit 2a3c28b37dcdce35c35af2b91483b08746a1597b) Reviewed-on: https://gerrit.libreoffice.org/60055 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3e7dea0348149ae43e5142d5820b094643f39178)
2018-09-06Update git submodulesAdolfo Jayme Barrientos1-0/+0
* Update helpcontent2 from branch 'distro/collabora/cp-6.0' - .howtoget, now more Collabora-y Commit cef6bdec37d8001d8f8c2c0f30c3a44500e38ec6 mass-changed LibreOffice’s green with Collabora’s purple, but .howtoget divs, having a pale green background, looked very discordant. Change-Id: I05ade2f92f49764b199214ef64cf4091169d61cf Reviewed-on: https://gerrit.libreoffice.org/60079 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-09-06Properly encode OAuth2 credentialsStephan Bergmann2-0/+60
Reviewed-on: https://gerrit.libreoffice.org/59986 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 33f7485dedea90e0f80c6348fa8ac5f27c5052e0) Conflicts: external/libcmis/UnpackedTarball_libcmis.mk Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5 Reviewed-on: https://gerrit.libreoffice.org/60017 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 2c4c7a11f18dd54a9dc319d00fa61672adbdc66d)
2018-09-06ofz#10189 check container sizeCaolán McNamara1-2/+6
Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161 Reviewed-on: https://gerrit.libreoffice.org/59913 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 6ee76d210846b84e93420a321c7908721ffe9e43)
2018-09-05tdf#119146: fix populating maCurrentSubsetsMike Kaganski1-2/+21
Regression from commit 4600b07c1d787f959618d9ecf54161e4ea4ffa61 Before the mentioned commit, creating a subset X, and then adding sub-subsets until all the subset is excluded, had left the subset X with two *empty* nodes in maCurrentSubsets, 1st of them having both mnStartIndex and mnEndIndex equal to maSubset.mnStartIndex, and 2nd having both mnStartIndex and mnEndIndex equal to maSubset.mnEndIndex. The commit above changed that to adding maSubset to maCurrentSubsets in the beginning of each exclusion, which finally resulted in a messy maCurrentSubsets with multiple duplicating nodes effectively covering all maSubset. That resulted in the item as a whole handled *besides* the sub-subsets. This commit (1) avoids adding extra maSubset to maCurrentSubsets, and (2) adds the two empty nodes in case all the subset has been excluded by its sub-subsets. Change-Id: I7fc5f2d0b6ecf4f9247351da3a2746032150557b Reviewed-on: https://gerrit.libreoffice.org/59948 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit a8aaffa6ea0f0fd8cf1d22883173df64a93e3322) Reviewed-on: https://gerrit.libreoffice.org/59952 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/60024 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-09-03Bump version to 6.0-8cp-6.0-8Andras Timar1-1/+1
Change-Id: I2f3c6a1d8eea3dc00a221c81704f1724df65a226
2018-09-03fix for 'mysqlc: Use unique_ptr on C style arrays'Andras Timar1-1/+1
Change-Id: I9460c6f8e52890ebb37ae59264ba9035b063f560
2018-09-03Don't link Library_mysqlc against -lnslStephan Bergmann1-1/+1
At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development headers and libraries. (It only still contains some binaries for backwards compatibility, in the libnsl sub-package: "This package provides the legacy version of libnsl library, for accessing NIS services.") The -lnsl was present ever since 4946c62f2943dfb3466cc4214a9c8ccd922669b5 "mysqlconnector: initial import from CWS mysqlnative", but appears to not be necessary (at least any more). Reviewed-on: https://gerrit.libreoffice.org/52536 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd) Conflicts: mysqlc/Library_mysqlc.mk Change-Id: I10b56cdc1a438fb2978125ae0acde0dbec747e78
2018-09-03tdf#112454 Also consider last SCTAB in loopMichael Weghorn1-1/+1
Since 'rRange.aEnd.Tab()' is valid, it needs to be included in the loop to get a valid result. Reviewed-on: https://gerrit.libreoffice.org/59798 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 03b361673d04f31e0602d2988e4df26eaeb53a34) Conflicts: sc/source/core/data/document.cxx Backported. Change-Id: I7b2447e059dc03444c56e7fc0b113e1b618dd510 Reviewed-on: https://gerrit.libreoffice.org/59878 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 9858b7004856a632778dde0dc7edddb14b673194)
2018-09-03tdf#117823 Save mail merge config item in new viewIlhan Yesil1-0/+1
The config object is now saved in a newly created document. Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0. Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6 Reviewed-on: https://gerrit.libreoffice.org/59728 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c) Reviewed-on: https://gerrit.libreoffice.org/59803 (cherry picked from commit 55498d196c31c098b02da5f4638fc0ca155b60b4)
2018-09-03mysqlc: implement beforeFirst and fix findColumnTamas Bunth2-4/+3
Change-Id: I9a12ef6c61b83f588be89ed9aff301d570155d74 Reviewed-on: https://gerrit.libreoffice.org/59881 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-09-03mysqlc: Use unique_ptr on C style arraysTamas Bunth4-19/+15
Change-Id: Id65487191c29f7af1a171c06345034d1dc5b20ec Reviewed-on: https://gerrit.libreoffice.org/59856 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/59871 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>