summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-09-21tdf#39828 sw: fix table formula calculation at track changesLászló Németh3-0/+100
Tracked deleted cell content, e.g. removed digits of the numbers were used in calculation instead of the actual table content. (For example, if the cell content changed from "1" to "2", tracked cell text is a crossed out "1" and a plain "2", and Writer calculated with "12" instead of "2".) Change-Id: Iecc91585cd37be3647d85f97ba1716a5fc836242 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122393 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-09-21add commentNoel Grandin1-0/+1
Change-Id: I0f9627d0d573c5a5bade00f40dea2d0f1b518528 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122391 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-21no need to use recursive_mutex in graphic::ManagerNoel Grandin2-8/+8
regular std::mutex is fine Change-Id: I820bb83117a0ea920f550f6ad459a623b4939ee3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122390 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-21reduce cost of BasePrimitive2D (tdf#125892)Noel Grandin13-23/+112
the default WeakComponentImplHelper wants to allocate two child objects (osl::Mutex and BroadcastHelper). So use a custom re-implemenation that does not need to allocate any child objects. Change-Id: I288e58558398e39daa0d4b11e0b60a924445240d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122381 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-21tdf#142579, tdf#143103: sc: Add UItestXisco Fauli2-0/+43
Change-Id: I2bc3eabeeb23534d985649c4191798ca9281b7e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122389 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-21tdf#142580, tdf#143103: sc: Add UItestXisco Fauli2-0/+60
Change-Id: I188716de98e6a9ea1c2b97c6341d578120a242b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122388 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-09-21Fix splitting of "permission-for-group/-user:" stringsStephan Bergmann1-9/+14
...that had been introduced in f5c266695a4a88da7db971a21915e2bbf758d48e "tdf#66398 Parse and output permissions for DOCX using bookmarks": For one, in DocxAttributeOutput::DoWritePermissionTagStart permissionIdAndName was left empty in the permission-for-user case. This had already been addressed for DocxAttributeOutput::DoWritePermissionTagEnd in 7f0b7410e84a222d8fbee7c4fadd3b40028a068d "permissionIdAndName is empty in permission-for-user case". But from the calling code it looks like in both functions that permission will always start with either "permission-for-group:" or "permission-for-user:", so assert that rather than silently doing nothing if the assumption is wrong. For another, in both functions the code didn't take any precaution if permissionIdAndName didn't contain a colon (which would cause undefined behavior when OUString::copy is called with a negative count argument). Again, from the calling code assume that permissionIdAndName will always contain a colon, and assert that. Change-Id: Ia7432413c138d47efbe8aec76f14c561ac241fb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122387 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-21reduce cost of some getProperty calls (tdf#125892)Noel Grandin8-156/+112
use OUStringLiteral to avoid cost of repeated OUString construction from ascii literal Change-Id: I4f8a4714c093e890adaa5524172bdc91231a561a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122379 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-21tdf#144347 sw: fix tracked deletion of table with tracked contentLászló Németh4-3/+89
When a table contained tracked content already, its tracked deletion (or cut) didn't work correctly, if the deletion contained also the text before or after the table: accepting the deletion left an empty table in the text, also Hide Changes showed an empty table before that in the place of the deleted text. Follow-up of commit f481c2c8e74bded11fac754e493560391229dbcd "df#144057 sw track changes: hide deleted table rows". Change-Id: If3294fe0316df7c065e7ff63290c1723386ec7ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122382 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-09-21tdf#142602 DOCX: export adjustment points of custom shape arrowsDaniel Arato (NISZ)3-26/+516
When exporting custom shape arrows LO used to fall back to writing out their plain vertex coordinates, losing the customizability of the shape after loading from file. This commit changes the export of some of the most commonly used arrow custom shapes to proper adjustment value export. Follow-up to commit 63cd67e5e18f01aca303131e148c80398a181a41 "tdf#92525 tdf#142398: fix export of simple custom shapes". Change-Id: If248556764bdb7e00cfde4ebe5b32bb380b1fa19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121901 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-09-21stack allocate this TextLayoutCache object (tdf#125892Noel Grandin1-3/+3
Change-Id: I838543c47ec420ec3b562e0b7e8524c4b2f070a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122380 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-21tdf#127900 sd: fix regression at applying master propertiesAttila Bakos (NISZ)3-1/+819
Language settings of frames in slide master weren't applied on the slides based on that master. Regression since LO 6.3 by "tdf#126067 Fix slide scope feature." (commit 40bb9ac690d979ef544d5aa759bd734a176912a0). Co-developed-by: Dániel Arató (NISZ) Change-Id: I559adbe00870ed8a3d2947fef8dae435a387e34a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120993 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-09-21fix !HAVE_FEATURE_DESKTOP build, IsOver->OverlapsCaolán McNamara3-4/+4
and change some commented out cases Change-Id: Icc60b19de7d12a78e7d40e7aa94dae40dc8b60a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122378 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-21tdf#144253 tdf#144324 sc filter: use formatted values in filtersBalazs Varga4-2/+25
if the results of formulas are values. Followed up of 40acda4e78127fa9f513646ef210b074d40cf307 (Related: tdf#140968 avoid duplicated filter values) Change-Id: Ib396d2b7cc08ba41b5936a53a28b5e38bf678b3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121715 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-09-21do not special-case Clang for Skia on Windows Arm64Luboš Luňák2-5/+1
We hard-require Clang for Skia, because MSVC compiles it poorly. Somebody who doesn't want or can't use Clang may just as well use --disable-skia. This reverts commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e. This reverts commit b36df65bb2393f8f46eea68c861d7570e7a772a1. Change-Id: If0310ce13e4023c6ae43f96447b48665ab7e4353 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122336 Tested-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-21Resolves: tdf#136442 don't query siblings and parent to determine typeCaolán McNamara1-53/+3
because this is used during sorting of the tree elements so its position isn't necessarily meaningful during the sort. DBTreeListUserData is supposed to exist for elements not staged for removal and that already has the type as a member Change-Id: Ie1004dbcdca2fae8711941d98a084103a0b15815 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122354 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-21Related: tdf#136442 implAppendEntry is always passed a DBTreeListUserData*Caolán McNamara2-8/+9
Change-Id: Idb51b28a52d79476c2897a318314d6267727e9e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122353 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-21Avoid "test: : integer expression expected" on non-macOS platformsStephan Bergmann1-1/+1
Change-Id: I90a31483b1750c59299e9a9f148990a8a68d4860 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122377 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-21Remove some "Attention" comments of little valueStephan Bergmann6-17/+12
...and rather add sal/config.h includes, while at it Change-Id: I0ea917b101d89f16228bea6b3102b630c8202e07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122369 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-21tdf#143591 DOCX import: handle anchored objects as at-charMiklos Vajna3-13/+9
This partially reverts cc8f8ae55f681755f5da3bf64e4c30bb713f0383 (DOCX drawingML shape import: wp:anchor's behindDoc attribute, 2013-11-19), it seems to be more important to be consistent with the DOC import than with the VML import which is no longer used for DOCX shapes crated with Word >= 2010. Change-Id: I631da010bce1b4d3c392645e0ae3797a03665a42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122367 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-09-21vcl: remove OutputDevice's GetDevFontSizeCount() and GetDevFontSize()Chris Sherlock20-201/+30
The OutputDevice::GetDevFontSize() function is only used for non-scalable (bitmap) fonts. We have stopped supporting bitmap fonts since LO 5.3, see tdf#103514: Support for bitmap-only fonts on Windows has been removed (Khaled Hosny) I found the following when removing PhysicalFontFace::SetBitmapSize(): 1. as mnHeight and mnWidth and not set by anyone, I realized I could remove them, which meant removing GetHeight() and GetWidth() 2. PhysicalFontFamily::GetFontHeights() populates heights from the collection of font faces into a sorted vector of font heights taken from PhysicalFontFace. As this no longer exists this function serves no purpose, it has been removed. 3. PhysicalFontFamily::GetDeviceFontSizeList() calls upon PhysicalFontFace::GetFontHeights(). This function takes this sorted list of font heights, and then populates and returns a new list of sizes (or rather, heights). As the heights aren't available any more, this function is also unneeded, so it has been removed. 4. OutputDevice::GetDevFontSizeCount() calls upon PhysicalFontFamily::GetDeviceFontSizeList(). This function has the side effect of initializing the list of fonts. 5. When I checked what calls on GetDevFontSizeCount(), there is only one caller - FontList::GetSizeAry() in svtools. The function returns a standard font size list if the family name is empty, or there are no font sizes (via OutputDevice::GetDevFontSizeCount()). As this will *always* be empty (see chain above) then this function just needs to always return a standard font size list. Thus OutputDevice::GetDevFontSizeCount() and GetFontSizeList() are no longer called upon by anything, so they can be removed. 6. svtool's FontList::GetSizeAry() no longer uses the FontMetric parameter, so this has been removed from the function signature, and cleanup done of the function that calls upon it in svtools, framework, editeng, and desktop. A number of variables that were no longer used due to this change were also removed. 7. This change removed the need for the mpSizeAry unique_ptr in FontList. ImplFontListFontMetric::GetDevice() and mpDevice could also be removed as it was no longer used anywhere. 8. After simplifying GetSizeAry(), it turns out it was the same as GetStdSizeAry(), so removed FontList::GetSizeAry() and used FontList::GetStdSizeAry() in its place. 9. Changing to use GetStdSizeAry() revealed that FontSizeBox::Fill() no longer used the pFontMetric paramter, so this was removed, and call sites updated. 10. Due to change to Fill(): a. SvxFontSizeBox_Base::UpdateFont() no longer uses the const css::awt::FontDescriptor& rCurrentFont parameter, so removed this. This also removed the member variable m_aCurrentFont b. SvxCharNamePage::FillSizeBox_Impl() had a number of newly unused variables removed. c. SwStdFontTabPage::Reset() and SwStdFontTabPage::LoseFocusHdl() had a number of newly unused variables removed. Change-Id: If840e240155c36ed351c63e3136b5b44bb058697 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121932 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-21Update git submodulesRafael Lima1-0/+0
* Update helpcontent2 from branch 'master' to 476d099e11be81ddb1b8388fbb92bc1b7069d2bf - tdf#144556 Fix information on deactivating AutoCorrect in Calc Change-Id: I6cb86dbf7fec71e3b67558117be951ad64689ed6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122282 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-09-21Implement the SourceTreeProvider CursorStephan Bergmann1-7/+111
Change-Id: Ibf54bd1e852ea23fb37c7222625895d240452424 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122361 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-21vcl: add sal/config.h in preparation for patchChris Sherlock40-0/+77
The convention is that we need to add sal/config.h to the start of files. This patch is created in preparation of a patch I have queued to test and move PhysicalFontFace to vcl::font namespace. Change-Id: I15dd24d7f01e077d407ac192a0413d796517eb72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122228 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-20use MSVC's /Zc:inline option to reduce binary sizeLuboš Luňák4-3/+8
If I'm getting it right, MSVC has a non-conforming feature that allows to declare a function as inline without defining its body in the header, and it'll work if the function is actually emitted elsewhere, and the linker will sort it out. This seems to be implemented by forcing emitting of out-of-line copies of all inline functions, which is wasteful. /Zc:inline disables this useless feature, which seems to save quite some space (optimized build, starmath's .o files 350k->220k, smlo.dll 2.5M->2.2M). The docs don't say anything about binary compatibility, but treat it the same way as -Zc:dllexportInlines, just in case. This change also may help avoid the tdf#144598 problem for our AVX/etc. code, such as in Calc. Change-Id: I73cc5d46ba1e4245e8d3b6688804c2b9684d2f9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122334 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-20use clang-cl's -Zc:dllexportInlines- for clang-cl buildsLuboš Luňák11-2/+45
This is clang-cl's equivalent of -fvisibility-inlines-hidden, and it seems to be also sort of the equivalent of MSVC's -Zc:inline. So it saves build time and disk space. Clang docs say that this is binary compatible in only one direction, so our public C++ code shouldn't be using this, as external C++ code could try to use exported inlines that are no longer there. Change-Id: Ie6217808f8ee4a15344183abfc65038e1558d1b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122352 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-20use clang-cl's -Zc:dllexportInlines- for Skia (tdf#144598)Luboš Luňák4-2/+38
This is clang-cl's equivalent of -fvisibility-inlines-hidden, and it seems to be also sort of the equivalent of MSVC's -Zc:inline. So it saves build time and disk space. As an additional effect, this disables emitting copies of inlines functions in every .o file where the function is called (even if inlined), which means that it hopefully avoids the problem of SkOpts_avx.cpp generating a copy of SkRect::round() which would include AVX code, and the linker might select this as the instance of SkRect::round() to keep, thus making SSE2 code call AVX code without checking for AVX availability first. Change-Id: I97541ae11d05f489894bc9233271eb21fd520f43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122335 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-20ofz: can now undo temp -L/usr/msan/lib hackCaolán McNamara1-3/+0
now that https://github.com/google/oss-fuzz/pull/6493 has landed Change-Id: I38634fec9c3e6c50499f1164d7b873dd1889efe6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122368 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-20Resolves: tdf#144620 toolbar config item overwrites options dialog oneCaolán McNamara1-0/+1
There are two SwMailMergeConfigItem involved. One SwMailMergeConfigItem from the toolbar created and considered modified and with changes not commited to the config yet. Then the other SwMailMergeConfigItem is created by the options dialog and commited on ok, but after that commit at cui/source/options/treeopt.cxx at line 723 there is a utl::ConfigManager::storeConfigItems() to flush all outstanding config items, so the one belonging to the toolbar is now flushed after the options dialog one was written. The SwMailMergeConfigItem has a IsModified() of true right after ctor which doesn't seem intentional, there is no explicit set of Modified to true on setting the simple bool members, the Modified bit is toggled on when using the more complicated modifier methods during ctor so very much looks like an accidental side effect. Change-Id: If84a6f01c7bf92704dd1e175a2bd8e2ea59e157f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122364 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-20be more disciplined with SetUpdateLayout on editengineNoel Grandin13-43/+64
save/restore in more places, and check in more places before doing layout, so we dont waste time on expensive layout Change-Id: I311f1f7f97a508da296078e936cb3704938dfdc3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121687 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-20Revert "tdf#99492 sw layout: always paint merged cell grids"Justin Luth1-0/+4
This reverts LO 7.1 commit c016fe2b5918d6e53113e100b1126076b6e1a6a3. This failed for two reasons. 1.) If it is not a solid color (like a graphic for example) then the graphic is going to be repeated in each cell. 2.) This is NOT actually repainting the visible cell's background. It is painting the hidden cell - which MIGHT be different from the visible cell (in the case of a solid color). Since this will require a completely different approach, I am just reverting this. Thanks Mike for finding an example document that shows the flaws. Change-Id: Icdc21e09118e7c33ac9f7ede23c913b95ad69c93 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122366 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2021-09-20wina11y: Drop bool param from CMAccessible::NotifyDestroyMichael Weghorn6-10/+9
... and 'AccObject::NotifyDestroy', respectively. The only calling site calls it with 'true' as parameter (and 'CMAccessible::NotifyDestroy' was calling 'm_xAccessible.clear()' regardless of what value the passed param had anyway). Change-Id: I08a24f79b50ec327ae461bd44ee6460a2d8145f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122343 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-20wina11y: Drop AccObject::m_bShouldDestroyMichael Weghorn2-11/+3
The getter, 'AccObject::ifShouldDestroy', was unused, so drop it. The only place where the 'm_bShouldDestroy' member was actually used was in 'AccObject::NotifyDestroy', where it was assigned a value from a method param that was then passed further right away, so there's no need to store the value at all. Change-Id: Id5688e9742892e345b143a8eebeed5099696a0f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122342 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-09-20introduce SfxItemSetFixed and use it in DefaultPropertiesNoel Grandin7-43/+92
DefaultProperties::SetObjectItemSet is very hot when loading shapes, and a large chunk of that cost is allocating the pool item array. So use a template class to allocate the array in-line to the class, which means it can be allocated on-stack. Change-Id: Ic53b41f35784726362de38fceb35f8634cddf0a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122310 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-20tdf#124176 - Use pragma once instead of include guardsChris Sherlock19-78/+20
This patch is created in preparation of a patch I have queued to test and move PhysicalFontFace to vcl::font namespace. Change-Id: I805a8bd1fa881fc4bc6d2f26f1051b9247587701 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122226 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-20Update git submodulesOlivier Hallot1-0/+0
* Update helpcontent2 from branch 'master' to 6d7110084bb66a1b2d3afce9567a83be58642e8f - Mute l10n on Basic instructions Change-Id: I389e49ed5ca19047d13e691057bd5c5edcc30ee2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122365 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-20tdf#33749 - rationalise several confusing cell merge controlsRoss Johnson2-9/+2
1) Replace the entire "Format > Merge Cells" submenu with the single "Format > Merge and Center Cells" button with all the same behaviour it has on the Formatting Bar. 2) Replace the "Split Cells" button from the context menu of a selected merged cell with the "Merge and Center Cells" button showing the current merge status, as it does elsewhere. 3) The "Merge Cells" checkbox in the Properties sidebar Alignment section is unchanged. Rationale: The current behaviour of the "Merge and Center Cells" button on the Formatting Bar is consistent with all other formatting buttons, eg, "Align Left" is still "Align Left" (but shown activated) when the text is currently already left aligned, and toggling it off reverts the alignment to a default alignment. It behaves correctly and intuitively IMO. The "Merge Cells" button in the "Format > Merge Cells" submenu should be removed as it appears to do the same as "Merge and Center Cells", that is, when it works correctly. It isn't helpful though as it has at least two problems: 1) it is greyed out if a merged cell is selected, unlike "Merge and Centre Cells"; 2) it becomes selectable when a range of cells is selected that includes a merged cell, but won't perform the merge. Removing both "Merge Cells" and "Split Cells" buttons from the Format > Merge Cells submenu leaves one entry, the "Merge and Center Cells" button, which should then be promoted to the top level menu. Change-Id: I2f592211f888427d5bba384c28c8c3c7d92d8de6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122293 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-09-20Update git submodulesRoss Johnson1-0/+0
* Update helpcontent2 from branch 'master' to 7a45cfda035abefcda03767a4c81f93c69d593b1 - tdf#33749 - HTML Help pages - reflect changes to cell merge in Calc Replaced the entire "Format > Merge Cells" submenu with the single "Format > Merge and Center Cells" button with all the same behaviour it has on the Formatting Bar. Replaced the "Split Cells" button from the context menu of a selected merged cell with the "Merge and Center Cells" button showing the current merge status, as it does elsewhere. Also, add the "Merge and Center Cells" link to the Formatting Bar Description Help page. It was missing. Change-Id: I8f200faa7a218adae533752def032f4b7f28eed6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122313 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2021-09-20Update git submodulesRoss Johnson1-0/+0
* Update helpcontent2 from branch 'master' to a03b2a3c515c5a15cbe22a24ee436fabd9ec272c - tdf#123506 - HTML Help pages - group search results under module headings The "double entries" reported are because the search results are never grouped according to module (CALC, WRITER, IMPRESS, etc). Results are now grouped. The HTML Help page search function uses a "fuzzy" algorithm to pick matching results. This observation by the reporter is not a bug and so the main Help page has been updated to include an explanation. The main Help page has also been updated to draw attention to the highlighing of the matching characters from the search term, to show exactly how the match was made. Change-Id: Ibdb9ac726b36b9dd6f605c854192ec644bfe09e1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122312 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2021-09-20avoid division by zeroLuboš Luňák1-1/+2
A rectangle in SwRegionRects may apparently be empty. Change-Id: I0956be2921d5110e2a8b9867bebf99814dd222f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122351 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-20Drop unused osl_FileStatus_Mask_FileURLStephan Bergmann1-2/+1
...in code that never called aStatus.getFileURL(), ever since the code's introduction in 4a25fb867f7cc0a0fc21c4079c84fadec6647ad1 "Make TempFile destructor remove temp directory recursively" Change-Id: I998ca23089125706b2377f192ace702a0ce804ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122350 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2021-09-20tdf#144091 svx: fix unwanted blur of shadow from table cell fillMiklos Vajna9-22/+221
Initial render support for shadows of table shapes were added in commit a75bf43a8d6c5dec6dcc86908c142ceec541aa8c (tdf#129961 svx: add rendering for table shadow as direct format, 2020-12-02). That already noticed a trick with the shadow of table shapes: the shadow is generate from the cell fill and the border, but not from the text. An additional trick is that when blur is enabled for the table shape's shadow, then only the border should be blurred, not the cell fill. In the bug document's case, the effective cell background was gray, with a semi-transparent red shadow. We used to render cc0000 with blur and cccccc without blur, now we correctly render cca3a3, matching PowerPoint. Change-Id: I7326a5f6254cf19b2d05181084c78e734ff7a7b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122349 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-09-20ofz: avoid TimeoutCaolán McNamara2-3/+14
Change-Id: I941a5b9b930248236f35b31582ee8f2c9e0be16e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122348 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-20no need to allocate these SfxItemSet on the heapNoel Grandin1-7/+7
Change-Id: I1703ee1d7cfc5f3f3458dce8db36fa86c578814c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122331 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-09-20Adapt SetWindowLong call to 64-bit buildStephan Bergmann1-1/+1
This failed with GWL_WNDPROC being undefined in 64-bit builds. See the note at <https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setwindowlongptra>: "To write code that is compatible with both 32-bit and 64-bit versions of Windows, use SetWindowLongPtr." Change-Id: I7abcc681b4daf459eb0c0481266949c75ecf4dda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122341 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-20improve the SwViewShellImpl paint region API a bitLuboš Luňák6-38/+30
Make it clear that the region is a paint region, and make the ownership clearer when SwViewShell takes it over. Change-Id: I229255a8e2d07ccc228e894e85b0a47f1e2b1259 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122309 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-09-20clean up ambiguous confusing rectangle APIs like IsInside()Luboš Luňák236-663/+678
Reading 'rectA.IsInside( rectB )' kind of suggests that the code checks whether 'rectA is inside rectB', but it's actually the other way around. Rename IsInside() -> Contains(), IsOver() -> Overlaps(), which should make it clear which way the logic goes. Change-Id: I9347450fe7dc34c96df6d636a4e3e660de1801ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122271 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins
2021-09-20Fix type of css.drawing.FillProperties FillColor propertyStephan Bergmann1-4/+5
(where css.util.Color is a typedef for UNOIDL LONG). This caused issues on Windows, where in C/C++ sal_Int32 is a typedef for long rather than int. Change-Id: Ic0407674d06a219210d7f0448100005d7135eb79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122340 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-09-20sw: prefix members of SwNavigationConfig, SwNumRulesWithName and SwSrcViewMiklos Vajna6-131/+131
See tdf#94879 for motivation. Change-Id: I2740ff914fe35a069ce67ad10783dadc0cfdbf74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122339 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-09-20no need to allocate these SfxItemSet on the heapNoel Grandin1-11/+11
Change-Id: I5a80d85225d1e5ba98a52885a79bed5bb873243d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122330 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>