summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tdf#120546 fix DOCX overriding numrule formatdistro/collabora/dcm-6.2Jan-Marek Glogowski2021-07-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... at least in the view. This "fixes" the import side of the exported OOXML document with multiple overridden numrule character format. This prevents the change of the shared numrule, which results in all bullets being formatted like the last overridden numrule. What is missing is a consistent way to edit the override, as the override is currently just stored in an internal attribute, the "ListAutoFormat" property. Fixing editing for good will be a larger work, as "ListAutoFormat" must be reflected in the GUI and must have a higher priority then the numrule format. Currently positioning the curser in front of the number or bullet entry lets one change the numrule format, which is applied to all bullets of the same rule. This special DOCX override mode is enabled by the import filter setting DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING to true. This should also change the edit mode, so that a change of the entry doesn't modify the rule, but the override and this must also be reflected in the GUI character settings. (cherry picked from commit 4412689b1358b5cc932f905417f23e2a3cbb494b) Change-Id: I057f7a354bc3c413b114eec772e06c7063029699 Reviewed-on: https://gerrit.libreoffice.org/81878
* tdf#130799 DOCX import: fix missing inside vertical bordersSzabolcs Toth2021-07-082-1/+22
| | | | | | | | | | | | | | | | | caused by incomplete handling of tables with 1-column rows with merged cells. Have to check the rows below current to see if they contain also one cell, therefore form a column, or more than one cell, in which case do not remove vertical borders. Regression from commit: 8a2eb40abbd52d960dd21308157186be0ca9dd3d (tdf#129442 DOCX import: fix right border of 1-column tables). Change-Id: If9ca7ccd42255e78c61b6271e19262ab5cc8e439 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89081 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
* avoid windres preprocessor quoting-messups with current cygwinChristian Lohmaier2021-07-063-3/+3
| | | | | | | | | | | | | | | | | | apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov <git@litvinovg.pro> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117600 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* use --enable-ooenv only if --enable-debug/dbgutilLuboš Luňák2021-03-231-2/+9
| | | | | | | | | | I'm not sure what the original purpose of the ooenv script was, but now it contains only debugging settings such as malloc debugging, which has a noticeable overhead (8.2s->10.1s in my random case). At least openSUSE appears to not actually package the script, but it still doesn't make sense to use this script in non-debug builds. Change-Id: I4518bb1680a543ed520399c11c83dd6dc5539f71
* tdf#84635 quadratic slowdown on loading large tablesNoel Grandin2021-03-233-24/+28
| | | | | | | | | | | | | | skip the re-registration scan in SwTableBox::ChgFrameFormat, which we don't need since we are creating this table for the first time On my machine, loading the 69 page file goes from 40.9s to 30.4s loading the 128 page file goes from 79.1s to 45.1s Change-Id: Id9e48256556e19eca34a892b29beff7eab9f51f1 Reviewed-on: https://gerrit.libreoffice.org/69885 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
* do not disable Writer font caching on zoom mismatchLuboš Luňák2021-03-231-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code disables font caching for some cases, e.g. when exporting to PDF if the zoom is set to anything else than 100%, or also when loading a document. It unfortunately comes from the OOo initial import, so it's impossible to find out why it should be needed. SwFntObj instances are created only using SwFntAccess ctor, which checks any SwFntObj it tries to reuse, so if this some additional factor to consider when reusing SwFntObj, then it can be checked there. But when I remove the code, I cannot see any breakage. Tests pass, normal rendering is fine, document thumbnail is fine, printing is fine, PDF export is fine, embedding in a spreadsheet is fine. We had a look at this with Miklos and concluded that it is not needed (until proven otherwise, in which case it'll be also known why it would be needed). Change-Id: I59d375229a265a4353c1da6dd067d892dd4ecfb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112589 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* improve font caching in SwFntObjLuboš Luňák2021-03-232-56/+103
| | | | | | | | | | | | | | | | | | | | | The code previously cached only SalGlyphItems, but such caching fails if SalLayout::GetGlyphs() does not return valid glyphs, which is the case with MultiSalLayout. Worse, it not only fails, but layout is once computed for caching, that fails, and is computed a second time for actual use. This improved cache caches the result of GetTextWidth(), which itself improves the performance a bit, but it also allows caching the value for GetGlyph() not returning valid glyphs. Moreover this also caches failures to get valid glyphs from GetGlyphs(). There are quite some calls to GetTextArray(), I didn't cache those, but it might be added if needed. Change-Id: Ia2589fb1b778f4f154c88f65d9906584284239da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112588 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* Related: tdf#124109 sw: save one vcl layout call in SwFntObj::DrawText()Miklos Vajna2021-03-221-1/+11
| | | | | | | | | | | | | | | Commit 436b829f5b904d76039db0818cff5dedf1ae89f1 (sw: save one vcl layout call in SwFntObj::DrawText(), 2018-08-16) did this unconditionally, which broke kashida justification. Re-introduce the same mechanism, but this time opt out in the kashida case to keep that working. This means that for Latin scripts we are back to 2 layout calls (instead of 3) for each keypress in Writer. Change-Id: I890f0ab04d1f5dce561f1536d7c8a6d67a639813 Reviewed-on: https://gerrit.libreoffice.org/69557 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
* ODT export: handle style name of covered cellsMiklos Vajna2021-03-223-38/+22
| | | | | | | | | | | | | | This is the export side of commit 1001dbaef4dec2b51c25ed8343bab6910f1219e1 (ODT import: handle style name of covered cells, 2021-03-19). We already exported the autostyle, but <table:covered-table-cell> did not refer to it. This is useful when the covering and the covered table cells have different border settings. (cherry picked from commit 6fa6e19fdca29752492a5230b2a948075a347c87) Change-Id: I7773903fa62f53686f000473f7a03c68dd77602a
* ODT import: handle style name of covered cellsMiklos Vajna2021-03-225-2/+107
| | | | | | | | | | | | | | Similar to commit 66ac8e60896f6306bed8fbb34606fd14474f19ce (sw: fix unwanted long vertical border around vertically merged Word cell, 2021-03-04), but that one was for the DOCX import / rendering. (cherry picked from commit 1001dbaef4dec2b51c25ed8343bab6910f1219e1) Conflicts: sw/qa/extras/odfimport/odfimport.cxx sw/source/filter/xml/xmltbli.cxx Change-Id: I394a4f062544a9774b9b40ec757cb37e72220561
* sw: fix unwanted long vertical border around vertically merged Word cellMiklos Vajna2021-03-053-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | In case cells A1 and A2 are vertically merged, they can still specify different border properties for the two cells. Word draws the border properties of the covered cells, while Writer ignores the formatting of A2 in this case and only uses the properties of the covering cell. Table cell border collapsing rules already differ in Word and Writer, so SwTabFramePainter::Insert() knows if the table cell's border is Word-style or not. Extend this code to handle vertically merged cells better. In general, this means a cell no longer has a fixed set of 4 borders, but each edge may have several sub-borders. This commit is a step in that direction, and handles the case when a vertical (left or right) border style is set initially, but not set at the end -- as we iterate through the list of cells in a vertical merge. (cherry picked from commit 66ac8e60896f6306bed8fbb34606fd14474f19ce) Conflicts: sw/qa/core/layout/layout.cxx sw/source/core/layout/paintfrm.cxx Change-Id: I35a05097ce70243099307ce8066766aef61a2bc5
* sw table cell borders: add optional Word-compatible border collapsingMiklos Vajna2021-03-053-1/+135
| | | | | | | | | | | | | | | | We always compared border width and other aspects only after that, Word works with border weight according to their implementer notes. So extend svx::frame::Style to be able to collapse borders using weights and opt in for that from sw/ in case a compat mode (which is related to tables, off by default and is set by the DOC/DOCX import) is set. (cherry picked from commit e6fa52c2c371c7adc9c2c2cb18c3a8cf782cfa4b) Conflicts: sw/qa/core/layout/layout.cxx Change-Id: I1f682789302c88a0d326c6c0263ad3007441cb24
* tdf#132898 writerfilter: use last merged cell's bottom borderJustin Luth2021-03-051-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Previously, this was just using the border set on the first cell. Obviously, the bottom merged cell should contain the definitive setting for the bottom border. This depends on all of the commits for tdf#129452. P.S. The top border is obviously fine defined by the top merged cell. P.S. The left/right borders are a bit more interesting. In MSO, each row's value applies to that section of the merged cell. I.E., it isn't treated as a cell border at all. Only noted as a comment here, since how to deal with it is probably best left as is - defined by the top cell. (cherry picked from commit 03803de58bd426eb0b726437dc205d92383e8e2e) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport15.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: Ibe8d31cba5122078ce73020f7816bff0b2ae36c6
* tdf#129452 writerfilter: use column, not cell when comparing rowsJustin Luth2021-03-053-4/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A natural mistake - especially when there are no existing functions - is to assume that cell number defines column number, and so it is valid to compare between rows. This patch provides the functions, and switches this bug's earlier patch to properly use columns instead of cells. This commit depends on two prior patches in bug 129452: Change-Id: Ie305477f0e3468a4a923095d76f520d97fe99ffe Change-Id: Ibfdac336bbb1f7303c7e585a85c94be37ad6f916 I hope that this implementation covers all the bases. This code is dreadful to understand, as witnessed by comments from those much smarter than I. P.S. I also cancelled a vertical merge if the cell is not there (in a gridAfter situation). If a row is shorter than the previous ones, then a vertically merged cell should not be considered to be able to span that gap. If the cells below are still merged, it would be considered a new merged cell. (cherry picked from commit 19d7f9624e92422409ed2744091d502fdae8692b) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport15.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/dmapper/TableManager.cxx Change-Id: I63158ac73b1bf86d9f75dd3c1299d1b1a3f08064
* tdf#129575 DOCX import: fix table style preferenceLászló Németh2021-03-0516-42/+203
| | | | | | | | | | | | | | | | | | handling by recognizing docDefault properties instead of default-value based heuristics. (cherry picked from commit f15d67442972c5f69c71925a6bfa5aa1a39d54eb) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport13.cxx sw/qa/extras/ooxmlexport/ooxmlexport6.cxx writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/PropertyMap.hxx writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/dmapper/StyleSheetTable.hxx Change-Id: I3bab9d85d77d0e5f1c357121b1caf02cbe4899c4
* tdf#81100 DOCX import: repeat header according to table styleLászló Németh2021-03-056-14/+38
| | | | | | | | | | | | Table style based repeating table header wasn't repeated, only direct table formatting. (cherry picked from commit f9aac900ada3d507526eeeed5b51fc7a10ab4cae) Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx Change-Id: I119e6d32bf22c6c85a84aa42ae4cd6c5f60166b2
* tdf#81100 DOCX: keep "repeat table header" table style settingLászló Németh2021-03-055-2/+43
| | | | | | | | | | | | during round trip by grab-bagging //tblStylePr/trPr/tblHeader. (cherry picked from commit 93ebf6a85f699e0594e05374ac37f8e582292d4f) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx sw/source/filter/ww8/docxtablestyleexport.cxx Change-Id: Id9d3150ca48031791aeda19c126bc4d4ac16fb8f
* tdf#127814 DOCX: fix default paragraph margin in table cellsLászló Németh2021-03-053-0/+14
| | | | | | | | | | | | | when the table is started on a new page. Undefined w:before in w:docDefaults/w:pPrDefault resulted 0.5 cm paragraph top margin instead of 0 cm. (cherry picked from commit 88ddeed17d5a7caca407f892a094a3dcb0aff501) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport6.cxx Change-Id: I94a2aa9e9c5fcee6443b74bb261c300c6a8e1303
* tdf#119054 DOCX: fix not table style based bottom marginLászló Németh2021-03-056-24/+71
| | | | | | | | | | | | | | in table cells, ie. using paragraph styles with bottom margin setting or direct paragraph formatting of bottom margin. Both of them overwrite the table style based bottom margin. (cherry picked from commit 6100909c84550036932d031f4d2f652e158a1a0a) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I527b16c24fe47df8412291089ff86fadd3f9430b
* DOCX: clean-up paragraph bottom handling of table styleLászló Németh2021-03-051-32/+2
| | | | | | | | | | | | | Revert of commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52 ("bnc#816593 DOCX filter: import paragraph spacing from table style), keeping only the working unit test. (cherry picked from commit 00eeb7b3f765a51f51f7911a116982fbfb83efb7) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I735744aadb071ef2f0d939cb637d83cfc5716fe4
* tdf#128752 DOCX: fix partial direct paragraph spacing in tablesLászló Németh2021-03-055-3/+29
| | | | | | | | | | | | | | | When direct formatting of a table paragraph set only top margin, but not the bottom margin, also there was no paragraph style setting for the bottom margin, the paragraph was imported using docDefault bottom spacing instead of the table style bottom spacing. (cherry picked from commit d8f3f8ecd9e6304f3a98ab03fae6bc545893f782) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport6.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx Change-Id: Ib7f5f80dd2485a0fd4ab8e0645b7d730a7ec3c5c
* related tdf#99602 writerfilter TODO: subscript - use CharStyle fontsizeJustin Luth2021-03-052-5/+30
| | | | | | | | | | | | | | | | | GetAnyProperty was missing a check for character style properties. This patch depends on commit 875793d841165aaaaefa2c34b855e8f0f8a8c214 related tdf#99602 writerfilter TODO: subscript - use ParaStyle fontsize and on commit 5e97d1a57717f8dbf69b987d2bda8616972eec52 NFC writerfilter: preparation for adding CharProps to GetAnyProperty (cherry picked from commit 9b8052bba91ed616de77006cd0d3dee3965caece) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport13.cxx Change-Id: I4e28589917e41fa545d5aab05f97a67502486136
* NFC writerfilter: preparation for adding CharProps to GetAnyPropertyJustin Luth2021-03-055-51/+69
| | | | | | | | | | | | | | | ...for tdf#99602 specifically, but I've intended to do this for a long time. Currently GetAnyProperty doesn't look in Character Styles for the requested property. But it should. GetPropertyFromCharStySheet can re-use a lot of the code for GetPropertyFromStyleSheet, so split that up and explicitly identify the existing function as ParaStyle. (cherry picked from commit 5e97d1a57717f8dbf69b987d2bda8616972eec52) Change-Id: I9843153a6c09a10d63a575cb1f35a56c21c9cb9c
* tdf#129452 writerfilter: preserve gridSpans longer than currentRowJustin Luth2021-03-055-36/+40
| | | | | | | | | | | | | | | | | | | It is a fairly common thing for table operations to compare items in the same column (like merged cells for example). In order to determine column information, each row's (gridBefore - change-id Ie305477f0e3468a4a923095d76f520d97fe99ffe - and) merged cells need to be known. So save that information in the cell data - and don't just throw it away after the current row has been analyzed. Good grief. (cherry picked from commit 2e8992aea2017e89a6f7ba5f0ef544f29059243b) Conflicts: writerfilter/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/TableManager.cxx Change-Id: Ibfdac336bbb1f7303c7e585a85c94be37ad6f916
* tdf#94801 DOCX import: fix table width loss by roundingLászló Németh2021-03-046-7/+21
| | | | | | | | | | | | | | | | | | | | | | | up the converted sum of table grid values. Small table width loss (< 1/100 mm) could result big layout differences, based on different line breaking etc. When table width is calculated by sum of table grid widths, now there is only a single conversion to 1/100 mm at the end, with rounding up the width instead of rounding down. Preventing regressions, both grid and cell width values are stored in the original twip now, instead of converting them to 1/100 mm one by one. (cherry picked from commit 62d084d50c0e6c90918f687251ffbb15264d7317) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx sw/qa/extras/ooxmlexport/ooxmlexport14.cxx sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6f0755b6604f4976b8ecb25255c76fe6afd5e35b
* tdf#129452 writerfilter: preserve gridBefore longer than currentRowJustin Luth2021-03-045-22/+30
| | | | | | | | | | | | | | | | | | | It is a fairly common thing for table operations to need to compare items in the same column (like merged cells for example). In order to determine column information, each row's gridBefore (and merged cells) need to be known. So save that information in the row data - and don't just throw it away after the current row has been analyzed. Good grief. (cherry picked from commit 2ad32b39af2e00ef253a2ef99e033feef416808f) Conflicts: writerfilter/source/dmapper/DomainMapperTableManager.cxx writerfilter/source/dmapper/DomainMapperTableManager.hxx writerfilter/source/dmapper/TableManager.cxx Change-Id: Ie305477f0e3468a4a923095d76f520d97fe99ffe
* tdf#116194 DOCX import: fix missing tables with w:gridBeforeLászló Németh2021-03-048-15/+74
| | | | | | | | | | | | | | | | | | | | Regression from the commit cf33af732ed0d3d553bb74636e3b14c55d44c153 "handle w:gridBefore by faking cells (fdo#38414)" This patch replaces the previous fix with a better solution, fixing tdf#38414 on the proposed DomainMapper level. (Note: to reject the old fix completely, its follow-up commit w:gridAfter will be handled in a similar way.) Now the related regressions, tdf#111679, tdf#120512 and the complex forms of tdf#116194, tdf120256 and tdf#122608 are fixed, too. (cherry picked from commit da1f71edfc72928b07a569b98e2766a8a7de9d2a) Conflicts: writerfilter/source/dmapper/DomainMapperTableManager.cxx Change-Id: Id25f5fb4d9021c87ee8c82782b2038e6fb255673
* tdf#129452 DOCX import: fix bottom border of merged columnSzabolcs Toth2021-03-043-3/+27
| | | | | | | | | | | | | | | | Bottom border of a vertically merged column of a table was missing if the inside borders were turned off and the merge included the last cell of the column. This happened because the first cell (topmost) in a set of vertically merged cells determines the borders of the new merged cell, and the turned off inside borders were at the bottom in this case. (cherry picked from commit 0f4dd820ee433932d9d9237b676292d31c4ba913) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport3.cxx Change-Id: I3d3defad18a1315117a554a36ad599eb46daffe9
* tdf#129450 DOCX import: fix bottom border of 1-row tablesSzabolcs Toth2021-03-043-0/+17
| | | | | | | | | | | | | Bottom border was missing in a 1-row table with disabled inside borders. This happened because LO applied the empty horizontal borders to the bottom border of the table. (cherry picked from commit 6b1bd2699b0bdad6dc42db741dea0717cf7c1d36) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport3.cxx Change-Id: I40140bf63297189edad13088f98fc5f869969c2d
* tdf#129442 DOCX import: fix right border of 1-column tablesSzabolcs Toth2021-03-043-0/+17
| | | | | | | | | | | | | Right border was missing in a 1-column table with disabled inside borders. This happened because LO applied the empty vertical borders to the right border of the table. (cherry picked from commit 8a2eb40abbd52d960dd21308157186be0ca9dd3d) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport3.cxx Change-Id: Ib190689bf5059bfd7dbf07b07808cd761015f37e
* tdf#124399 DOCX import: don't apply inside borders to 1-cell tablesSzabolcs Toth2021-03-043-0/+18
| | | | | | | | | | | | | | Extra cell borders appeared on the bottom, top, left or right of the 1-cell tables when only the "inside borders" option was selected. The extra borders were the ones that would normally have appeared as inside borders if there were more than one cells in the table. (cherry picked from commit 8a59f18b6eb22c43ec10cdc29ba5a13d5feba4f0) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport3.cxx Change-Id: I05d5f2a5a0168989f220d20a95b6dacf5152f9f7
* Version 6.2.8.2, tag libreoffice-6.2.8.2libreoffice-6.2.8.2Christian Lohmaier2019-10-103-0/+0
| | | | Change-Id: I011a01def8d8112ca712a5e652d942a1f3af2e06
* bump product version to 6.2.8.2Christian Lohmaier2019-10-101-1/+1
| | | | Change-Id: I4a21f58918014425de04dcbc4dfa1d3919c5f978
* update creditsChristian Lohmaier2019-10-101-1311/+1339
| | | | | | Change-Id: Ib98367116f9727f6ec54372d4cd90b657258b0d7 (cherry picked from commit 70ae1da67310a596e5bc49f1053c7ff72c84f539) (cherry picked from commit 5f01fe15eb2661f1f9ce12d1d99dc2a705b462ee)
* tdf#128013: fix Crash when linking an odp fileJulien Nabet2019-10-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=154847 Regression introduced by: https://cgit.freedesktop.org/libreoffice/core/commit/?id=3c86ffd8ded628e6f2b4187948a1b1056f6a0f56 Reviewed-on: https://gerrit.libreoffice.org/80500 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058) Reviewed-on: https://gerrit.libreoffice.org/80506 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: Id9355958b0c4a56215ff98f0e5be13a3074ce45f Reviewed-on: https://gerrit.libreoffice.org/80539 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 60f604bd06418c2a521e0b7b018c0edf7e65e9c4) Reviewed-on: https://gerrit.libreoffice.org/80563 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
* Update git submodulesChristian Lohmaier2019-10-091-0/+0
| | | | | | | | | | * Update translations from branch 'libreoffice-6-2-8' - update translations for 6.2.8 rc2 and force-fix errors using pocheck Change-Id: I2341567f45e7f639212e55292e568bebe88dbd9b (cherry picked from commit 3e7a06d16ca2b062179f0ea9ba1d0cc573f4c4b4)
* tdf#124391 Fix doubled menu in global menuSamuel Mehrbrodt2019-10-091-2/+6
| | | | | | | | | | | Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038 Reviewed-on: https://gerrit.libreoffice.org/80466 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Related: tdf#124600 sw textbox: sync left/right margin of shape to textboxMiklos Vajna2019-10-093-0/+24
| | | | | | | | | | | | | | | | | | | | | | Writer TextFrames have a default left/right margin; sync from shape to textbox is needed to have correct layout when a DOCX shape has 0 left or right margin. The left margin of the shape was already correct. (The shape in the docx file was extended to have text.) (cherry picked from commit ff5f02b9282e19a2a8a68604c588e9487021b0b5) Change-Id: I832f1bc460f2553bd7f08252d3e21000b4906538 Reviewed-on: https://gerrit.libreoffice.org/80109 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 74fc3dd94adeaac750e4cea08281d912dc5a11ee) Reviewed-on: https://gerrit.libreoffice.org/80439 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
* Related: tdf#124600 DOCX import: ignore left wrap on left-aligned shapesMiklos Vajna2019-10-085-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The DOC import does the same in SwWW8ImplReader::AdjustLRWrapForWordMargins(). This fixes one sub-problem of the bugdoc, so now the shape anchored in the header has a correct position. This made it necessary to re-visit the tdf#115719 testcases, which are minimal reproducers. The original document had from-left alignment (instead of align-to-left), but this did not matter before. Bring the test documents closer to the original large document, so the tests still pass and don't depend on LO mis-handling the above mentioned left-aligned situation. (The interesting property of tdf115719.docx, where Word 2010 and Word 2013 handles the document differently is preserved after this change.) (cherry picked from commit 4883da6fd25e4645a3b30cb58212a2f666dae75a) Change-Id: I973c13df47b0867e2c4756f0c448495257b7c9d5 Reviewed-on: https://gerrit.libreoffice.org/80041 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 6de9cff1f918b6fc3ef58d9e080388c741e84b55) Reviewed-on: https://gerrit.libreoffice.org/80106 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
* Resolves: tdf#127786 cache Glibc locale string in LanguageTagImplEike Rathke2019-10-081-10/+20
| | | | | | | | | | | | | | | | | | | | | ... for non-simple @modifier strings that are constructed using liblangtag, as loading resource strings needs it over and over and over again. Change-Id: Ib6a74e5ddb44508aa41f101c200a508bfa4a13bd Reviewed-on: https://gerrit.libreoffice.org/79770 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 24c7c12224f1c1d66f335f6fe085595352137646) Reviewed-on: https://gerrit.libreoffice.org/79775 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 99782b52c3cc25a32661c382ca98a32f6ec87003) Reviewed-on: https://gerrit.libreoffice.org/79787 (cherry picked from commit e7b8101cf7643d612393079d7f1cea07d8b1c774) Reviewed-on: https://gerrit.libreoffice.org/80105 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* Resolves: tdf#127873 accept ',' comma group separator in number entities againEike Rathke2019-10-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Existing documents unwittingly may have used that as decimal separator in such locales (though it never was as this is always the en-US locale). "Regression" from commit 9336286a7ea5385541344f444e6f8702c85bdacb CommitDate: Fri Nov 30 22:15:22 2018 +0100 [API CHANGE] Resolves: tdf#42518 new KParseTokens::GROUP_SEPARATOR_IN_NUMBER Change-Id: I0ffc1b8ec7c1820fccd8277036c64093dddf82fe Reviewed-on: https://gerrit.libreoffice.org/80023 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 2caa9d7ddcff3f6e380c306b737e9b5e9cdaf4c2) Reviewed-on: https://gerrit.libreoffice.org/80046 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* filter: XHTML: make "calc-heading-digit" a little fasterMichael Stahl2019-10-081-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exporting OpenDocument-v1.3-csd01-part3-schema.odt to XHTML fails with: runtime error: file share/xslt/export/xhtml/body.xsl line 1404 element variable xsltApplySequenceConstructor: A potential infinite template recursion was detected. You can adjust xsltMaxDepth (--maxdepth) in order to raise the maximum number of nested template calls and variables/params (currently set to 3000). Unfortunately the document contains this many headings, and the calc-heading-digit computes the value by recursively looking at every preceding heading in the document, without TCO apparently... Try to improve this by using XPath to filter early the headings that are effectively ignored in the 3rd xsl:when case anyway: the ones with a level lower than the one for which the number is requested; this limits the recursive calls to the number of headings on the same level. Change-Id: Iddf5a91664402a57a0138731ddc9cebb06b0a126 Reviewed-on: https://gerrit.libreoffice.org/79720 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 86cca6b40ced4031dec4b708ac67b5cbe70cddf9) Reviewed-on: https://gerrit.libreoffice.org/79841 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 059fff471b05c0e26589a1a621b467af5bc6a159) Reviewed-on: https://gerrit.libreoffice.org/80008 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#125585 write default layer status for OLE objectsRegina Henschel2019-10-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | The layer status is taken from the active view, when saving the document. But embedded documents have no view. Error was, that for all layers value 'false' was written in that case. With this patch the defaults (visible, printable, not locked) (true, true, false) are written. Change-Id: I2388ce31cc208fba075083889ec1bb2f874ef482 Reviewed-on: https://gerrit.libreoffice.org/79701 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 12f9a9f341fd8f8a98f7cd98f296a8729d279e0d) Reviewed-on: https://gerrit.libreoffice.org/79786 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 44c0b7416d1abee971ef0b4b17e67f6e391dd807) Reviewed-on: https://gerrit.libreoffice.org/79859 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
* bump product version to 6.2.8.1.0+Christian Lohmaier2019-09-261-1/+1
| | | | Change-Id: I84adf6557e38c4b3c99b95773a4f991a80465b30
* Branch libreoffice-6-2-8Christian Lohmaier2019-09-264-1/+1
| | | | | | | | | | | | This is 'libreoffice-6-2-8' - the stable branch for the 6.2.8 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.2.x release, please use the 'libreoffice-6-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I30687e641cd99a90546ae916db9d4eb600598beb
* Revert "tdf#117988 writerfilter: IgnoreTabsAndBlanksForLineCalculation"Justin Luth2019-09-262-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts LO 6.2 commit 49ddaad2f3ba4e17e1e41e94824fb94468d2b680. tdf#127617 proves it simply was not the correct solution. I replaced the unit test document with one that clearly demonstrates that spaces/tabs should NOT be used in line height calculations. Example document tested with Office 2003, 2010, 2016. Change-Id: I2833384a017526d665adef0cae968bc4aef0dd94 Reviewed-on: https://gerrit.libreoffice.org/79473 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 202bee1a819de7b1e8c75dd863c4154f66419400) Reviewed-on: https://gerrit.libreoffice.org/79484 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit b0c5bc47d0d170df1384dd48cee9291ce6044083) Reviewed-on: https://gerrit.libreoffice.org/79527
* tdf#99115: add Css selector '*' style only if the element...Xisco Fauli2019-09-253-14/+112
| | | | | | | | | | | | | | | | | | | | | ... is on top of the hierarchy Otherwise, we add it for every element on the hierarchy Adapt unittest from https://bugs.documentfoundation.org/show_bug.cgi?id=100198 Provided by Sam Yygier Reviewed-on: https://gerrit.libreoffice.org/78997 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 4007ced54d611d1397387f7329a47de5efaca32f) Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: I72c7ae08f3ce0194eff86697b202d5553810abeb Reviewed-on: https://gerrit.libreoffice.org/79018 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tdf#127652 sw_redlinehide: don't set invalid SwTextFrame offsetsMichael Stahl2019-09-251-1/+2
| | | | | | | | | | | | | | | | | | The obvious problem here is that if a deletion spans multiple text frames, the offset of the 2nd one must not be reduced lower than the start position of the deletion; apparently this fixes the subsequent crashes with stale text portions having now invalid indexes into the string. (regression from 0acde7514e666fc04805fd36503bd174162336ca) Change-Id: Iaf9e2c5ca06ed36dc0e8611891d19c22f7661d34 Reviewed-on: https://gerrit.libreoffice.org/79421 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 9ec2c77046901fdacca77753052b54c81e6bc82c) Reviewed-on: https://gerrit.libreoffice.org/79433 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
* Update git submodulesChristian Lohmaier2019-09-241-0/+0
| | | | | | | | | * Update translations from branch 'libreoffice-6-2' - update translations for 6.2.8 rc1 and force-fix errors using pocheck Change-Id: I373ede836681f1aa2f1fbf9729b52ecbe198dd79
* Resolves: tdf#127695 IsGroupObject == true doesn't mean its a SdrObjGroupCaolán McNamara2019-09-241-3/+5
| | | | | | | | | | | | | but that it has a SubList Change-Id: I473464de5c6bba5c36be1ad7cbd21a3158645d66 Reviewed-on: https://gerrit.libreoffice.org/79412 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit e6c07d2018d0b6be7492664fa22f70461b1422b8) Reviewed-on: https://gerrit.libreoffice.org/79428 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
generated by cgit (git 2.34.1) at 2024-05-01 14:28:30 +0000