summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-25merge some stringaddsNoel Grandin
found with a lightly tweaked version of the loplugin:stringadd and some hand-holding. Change-Id: I146aadcaf665e98fea89a9cad2df4dc3935622f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152275 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-25desktop: check getDialog()Xisco Fauli
it might return nullptr See https://crashreport.libreoffice.org/stats/signature/dp_gui::TheExtensionManager::ToTop() Change-Id: I4023529aec0ba2c72b4e7db5449d235c208ee30b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152268 Tested-by: Jenkins Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-05-25Fix identical copypaste errorsMike Kaganski
Change-Id: Ic3d93c9141fcf407493ebb9b7cfc40d1598368ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152221 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-05-25Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to 31fe3777cb0dc69a3badc026f4de55c096af48d9 - tdf#154996 Add tabbed UI commands in Help page + refactoring Change-Id: I404321de45f8d4c4621a64d2f30a48421f65f86e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152249 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-05-25Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to c26935e97327fd87907d41dd07f60bdf71ef8067 - tdf#154996 Tabbed Interface command in Help pages + review the Hide / Show sheet command Change-Id: I5dd3e9fe40f06c006282c1b62de38daadd01d2a6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152248 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-05-25tdf#107965: partially revert fix for tdf#91312Xisco Fauli
This commit partially reverts 8a11d34c7e08218b5ff9da4870c460297f312332. tdf#91312 is not reproducible after the revert because the conditional format logic has changed since then and now conditions are grouped. Change-Id: I5ae86c8c3b8611e3fdfed6adbcac7b481bc7217f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152273 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-05-25Related tdf#155443: MySQL/MariaDB direct connect, use more of the new functionJulien Nabet
...getAlterTableColumnPart(). getName() and getTableName() don't deal with database/schema prefix + backticks Change-Id: I31cc9dc98de0449dfe2f6f24305290d4edb9ecb4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152276 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2023-05-25Allow bootstrap variables in Java user classpath settingsSamuel Mehrbrodt
This allows for relative paths to be configured as Java class path. Change-Id: Ie3e6bc3836fb316457e5c9f11dfb77d2fcd49ad4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152271 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-05-25sw: fix crashtesting assert on forum-mso-en-13115.docxMichael Stahl
itrpaint.cxx:436: SwTextPainter::DrawTextLine: Assertion `!roTaggedParagraph' failed. The problem is that there are 2 SwNumberPortion, and the 1st one doesn't have the m_bHasFollow flag set. The numbering suffix is 5 consecutive ' ' spaces, which is oddly enough considered a hook char in SwFieldPortion::Format() but not in SwTextFormatInfo::ScanPortionEnd(). This inconsistency appears to cause the problem, and was already there in initial CVS import, but nothing bad seems to happen when it is resolved. (regression from commit 9b38beadf9eaf027b201cdf0ecb2bce5611014dd and commit df5328ff1e472af9c69d4ff83fa13c71d644ddec) Change-Id: I602d9adb63220cb63ce8a477b617e9aeae45fb8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152274 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-05-25tdf#152048: Fix underline width for Kashida-justified textKhaled Hosny
Fix GenericSalLayout::GetTextWidth() again, this time doing away with using linearPos as it is wrong, the glyph’s position is not directly related to how much it contributes to the text width (for example, combining marks have zero advance width yet their position is different from the base glyph they apply too). This is a followup to: commit ce7c1c608fa99c86c8f2380cd8b82d02123f514e Author: Khaled Hosny <khaled@aliftype.com> Date: Wed Aug 31 07:07:54 2022 +0200 vcl: Fix GenericSalLayout::GetTextWidth() Additionally, inserted Kashida should have its origWidth and newWidth both set to zero, since it does not add to the text width, all additional width is already added to the glyph the Kashida is applied to. With both fixes, the text width of Kashida-justified lines is correctly calculated and the underline no longer extends beyond the text line. Fix test expectation now we are reporting the real text width. Change-Id: I0de93f955929cf3030cf420cb4f4e94df974fb79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152267 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@libreoffice.org>
2023-05-25more TypedWhichIdNoel Grandin
Change-Id: I2536f09fc48ff641c0e5c646ca7127f293ae5db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152259 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-25Revert "BaseMutex->std::mutex in OPropertyForward"Julien Nabet
This reverts commit b0244ef9e44c5c1dc9faf9705f2ae1dba499d62c. Lock when trying to save a change in a table: #0 futex_wait (private=0, expected=2, futex_word=0x55f20be59550) at ../sysdeps/nptl/futex-internal.h:146 #1 __GI___lll_lock_wait (futex=futex@entry=0x55f20be59550, private=0) at ./nptl/lowlevellock.c:49 #2 0x00007f462caab262 in lll_mutex_lock_optimized (mutex=0x55f20be59550) at ./nptl/pthread_mutex_lock.c:48 #3 ___pthread_mutex_lock (mutex=0x55f20be59550) at ./nptl/pthread_mutex_lock.c:93 #4 0x00007f45fad12a63 in __gthread_mutex_lock(pthread_mutex_t*) (__mutex=0x55f20be59550) at /usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/x86_64-linux-gnu/c++/12/bits/gthr-default.h:749 #5 0x00007f45fad138c5 in std::mutex::lock() (this=0x55f20be59550) at /usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/std_mutex.h:100 #6 0x00007f45fad1389c in std::unique_lock<std::mutex>::lock() (this=0x7ffd5b691a78) at /usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/unique_lock.h:139 #7 0x00007f45fad136b1 in std::unique_lock<std::mutex>::unique_lock(std::mutex&) (this=0x7ffd5b691a78, __m=...) at /usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/unique_lock.h:69 #8 0x00007f45fb060b55 in dbaccess::OPropertyForward::setDefinition(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) (this=0x55f20be59520, _xDest=uno::Reference to (dbaccess::OTableColumnDescriptor *) 0x55f20bd765b8) at /home/julien/lo/libreoffice/dbaccess/source/core/misc/PropertyForward.cxx:128 #9 0x00007f45fb039edc in dbaccess::OContainerMediator::elementInserted(com::sun::star::container::ContainerEvent const&) (this=0x55f20bd9ac30, _rEvent=...) at /home/julien/lo/libreoffice/dbaccess/source/core/misc/ContainerMediator.cxx:105 #10 0x00007f461ebaa03e in comphelper::OInterfaceContainerHelper3<com::sun::star::container::XContainerListener>::NotifySingleListener<com::sun::star::container::ContainerEvent>::operator()(com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> const&) const (this=0x7ffd5b691c90, listener=uno::Reference to (dbaccess::OContainerMediator *) 0x55f20bd9ac58) at include/comphelper/interfacecontainer3.hxx:252 #11 0x00007f461eba9e4c in comphelper::OInterfaceContainerHelper3<com::sun::star::container::XContainerListener>::forEach<comphelper::OInterfaceContainerHelper3<com::sun::star::container::XContainerListener>::NotifySingleListener<com::sun::star::container::ContainerEvent> >(comphelper::OInterfaceContainerHelper3<com::sun::star::container::XContainerListener>::NotifySingleListener<com::sun::star::container::ContainerEvent> const&) (this=0x55f20ba55ee0, func=...) at include/comphelper/interfacecontainer3.hxx:274 #12 0x00007f461eb8aab3 in comphelper::OInterfaceContainerHelper3<com::sun::star::container::XContainerListener>::notifyEach<com::sun::star::container::ContainerEvent>(void (com::sun::star::container::XContainerListener::*)(com::sun::star::container::ContainerEvent const&), com::sun::star::container::ContainerEvent const&) (this=0x55f20ba55ee0, NotificationMethod=&virtual table offset 32, Event=...) at include/comphelper/interfacecontainer3.hxx:289 #13 0x00007f461eb8527d in connectivity::sdbcx::OCollection::appendByDescriptor(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) (this=0x55f20ba55e80, descriptor=uno::Reference to (dbaccess::OTableColumnDescriptor *) 0x55f20b909188) at /home/julien/lo/libreoffice/connectivity/source/sdbcx/VCollection.cxx:388 #14 0x00007f45fb060571 in dbaccess::OPropertyForward::propertyChange(com::sun::star::beans::PropertyChangeEvent const&) (this=0x55f20be59520, evt=...) at /home/julien/lo/libreoffice/dbaccess/source/core/misc/PropertyForward.cxx:94 #15 0x00007f462b59ac96 in cppu::OPropertySetHelper::fire(int*, com::sun::star::uno::Any const*, com::sun::star::uno::Any const*, int, unsigned char) (this=0x55f20b7e8098, pnHandles=0x7ffd5b69320c, pNewValues=0x7ffd5b6934a8, pOldValues=0x7ffd5b693198, nHandles=1, bVetoable=0 '\000') at /home/julien/lo/libreoffice/cppuhelper/source/propshlp.cxx:680 #16 0x00007f462b59bb77 in cppu::OPropertySetHelper::impl_fireAll(int*, com::sun::star::uno::Any const*, com::sun::star::uno::Any const*, int) (this=0x55f20b7e8098, i_handles=0x7ffd5b69320c, i_newValues=0x7ffd5b6934a8, i_oldValues=0x7ffd5b693198, i_count=1) at /home/julien/lo/libreoffice/cppuhelper/source/propshlp.cxx:568 #17 0x00007f462b59a64e in cppu::OPropertySetHelper::setFastPropertyValue(int, com::sun::star::uno::Any const&) (this=0x55f20b7e8098, nHandle=22, rValue=uno::Any("long": 10000)) at /home/julien/lo/libreoffice/cppuhelper/source/propshlp.cxx:543 #18 0x00007f462b59884b in cppu::OPropertySetHelper::setPropertyValue(rtl::OUString const&, com::sun::star::uno::Any const&) (this=0x55f20b7e8098, rPropertyName="FormatKey", rValue=uno::Any("long": 10000)) at /home/julien/lo/libreoffice/cppuhelper/source/propshlp.cxx:265 #19 0x00007f45f996faf0 in dbaui::OFieldDescription::copyColumnSettingsTo(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) (this=0x55f20bf4f960, _rxColumn=uno::Reference to (dbaccess::OTableColumnWrapper *) 0x55f20b7e80a8) at /home/julien/lo/libreoffice/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx:623 #20 0x00007f45f99784c4 in dbaui::OTableController::alterColumns() (this=0x55f20b7931e0) at /home/julien/lo/libreoffice/dbaccess/source/ui/tabledesign/TableController.cxx:1070 #21 0x00007f45f99731d5 in dbaui::OTableController::doSaveDoc(bool) (this=0x55f20b7931e0, _bSaveAs=false) at /home/julien/lo/libreoffice/dbaccess/source/ui/tabledesign/TableController.cxx:356 Change-Id: I4363cdad7339eb2ad69f9839832b11f448dd989c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152258 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2023-05-25ExternalProject_libxml2 still needs to build the xmllint executableStephan Bergmann
No idea why fd6cbd983a3021d22321854d0414bdc42c6cb1b7 "upgrade to libxml2-2.11.4" started to only explicitly make libxml2.la (the commit message doesn't say), but that caused at least <https://ci.libreoffice.org/job/lo_ubsan/2788/> to fail with > make[1]: *** Deleting file '/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated' > [build VAL] CustomTarget/sfx2/classification/example.validated > /bin/sh: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2//xmllint: No such file or directory > make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_ubsan/sfx2/CustomTarget_classification.mk:20: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated] Error 1 Change-Id: I7e7aa2bae05cf8674720cfd72c78840cd7a28919 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152256 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-05-25[API CHANGE] remove XModuleUIConfigurationManager3 and XUIConfigurationManager3Miklos Vajna
The motivation was to not modify XModuleUIConfigurationManager / XUIConfigurationManager, but as pointed out at <https://gerrit.libreoffice.org/c/core/+/151798/10#message-31d00a775989b981a5f50639623cc773d6ea930d>, it may be fine to modify XModuleUIConfigurationManager2 and XUIConfigurationManager2 instead of adding XModuleUIConfigurationManager3 and XUIConfigurationManager3. Indeed, searching for usage in <https://github.com/libreoffice/wollmux>, only the published interfaces are used, so let's fold XModuleUIConfigurationManager3 into XModuleUIConfigurationManager2 and XUIConfigurationManager3 into XUIConfigurationManager2. This is a reasonable middle ground between 0 API change and breaking known users of the public API. Change-Id: I2dedee7e255f9dda9c9057961e6c829f83b2b709 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152254 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-05-25sw floattable: handle <w:doNotBreakWrappedTables> in the DOCX filterMiklos Vajna
<w:doNotBreakWrappedTables> primarily appears in documents imported from RTF, unless \nobrkwrptbl is specified there (which, confusingly, means to do split floating tables). Change-Id: I1891b89787719805e6c87045dee3c63c68ed2940 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152255 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-05-25xmloff: rename theme color names and color-table to theme-colorsTomaž Vajngerl
For ODF it's not needed to abbreviate names and we prefer to use full names. The theme color names in OOXML are abbreviated and the same names were used also for ODF - this was changed now. "color-table" used in "theme" element has reused the already existing "color-table" element name in ODF, but they don't relate to each other. The name was changed to "theme-colors", which makes more sense anyway. Change-Id: I61ec91895d301ad4343f2b977d5cbcf38e360b99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152252 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-05-25tdf#155443: MySQL/MariaDB direct connect: pb to change fieldname in tableJulien Nabet
Copy and simplify "getAlterTableColumnPart" from Mysql JDBC part which seems to do the right job with table name. Change-Id: I94d20b002a60f2ce1ea4d7e4de8040a9cbf04994 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152247 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2023-05-25Update pdfium to 5778Miklos Vajna
- external/pdfium/abseil-trivial.patch is no longer needed, upstream does what we did previously - external/pdfium/build.patch.1: re-generate with 'patch -p1' + 'git diff' - external/pdfium/include.patch is no longer needed, upstream does what we did previously Change-Id: I39a6f721e436aa53914bbf43b78ac7d86e5eac59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152244 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-05-25sw: fix wrong downcast in UndoManager::IsViewUndoActionIndependent()Miklos Vajna
In case a user types in one view, an other user types in an other view, finally the first user deletes, then getting the undo state resulted in a memory corruption. This went wrong in commit 2875c65946e59f5dd7968155463bf00bd71d440b (sw, out of order undo: allow a subset of a non-empty redo list, 2021-11-11), the intention was to check if we have a redo item and it has the expected type, but we checked the type of an earlier undo action that belongs to the view. Fix the problem by checking the type of the correct undo action, this was probably a copy&paste error of mine. Resolves <https://github.com/CollaboraOnline/online/issues/6412>. Change-Id: I6cb2a081067695a045d86b4ef427cc5a76c0f9c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152204 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-05-25use more TypedWhichId in editengNoel Grandin
Change-Id: I2eb2b50ef7002e23221c985ab3218617b3832aa7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152203 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-25svx: combine svx::NamedThemedColor into NamedColorTomaž Vajngerl
Change-Id: I9a9656ddce9c12564411cfcb3e8e8714ae74a418 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152236 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-05-25svx: change NamedColor be a struct instead of std::pairTomaž Vajngerl
Change-Id: Ice1625e8cae8da859ea8a940b3f8e40f6f9d7037 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152235 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-05-25xmloff: rename *-color-theme-reference to *-complex-colorTomaž Vajngerl
Change-Id: I63dd83522da7699162eb06a019a679d4b8750d10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152053 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-05-24tdf#138279 Revert "On double click on chart select the chart backgroud"Justin Luth
This reverts 7.1 commit 6a915073f8400fd34274cf311994bbc9bf498ab6. The change was simply wrong. There is NOTHING about this context that indicates that a double-click is happening. So whatever this patch was trying to do, it simply was made in a completely wrong way. So best to just revert, and put the onus back on the interested parties to redesign a fix for their double-click issue. Change-Id: Ia209c0552839d6cce1b348432789f0f861ac5703 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152023 Reviewed-by: Justin Luth <jluth@mail.com> Tested-by: Jenkins
2023-05-24tdf#148897 tdf#143239 sw: move flys off the page in SwTextFrame::Format()Michael Stahl
The bugfix regresses testTdf143239, so we add some scary additional hacks: * testTdf143239: turns out that this was already moving back and forth many times but then ran into some loop control - now with the fix for tdf#148897 this still happens, but the result is now bad, where previously it was good (by accident?). Move the flys off the page also in SwTextFrame::Format() - there is already code there to detect that footnotes have been moved off by Format_() - this is similar, the formatting should be redone immediately if there is a fly that created SwFlyPortions in the current frame, but the fly was actually moved to the next page by the very same Format_() splitting the frame. * testKeepWithNextPlusFlyFollowTextFlow: here the problem was that the para with the fly didn't move back to page 1; need to clear the SwLayouter when toggling FieldNames. * testKeepwithnextFullheight: this test document will loop creating infinite pages if the newly add move code is run during SwObjectFormatterTextFrame - the latter must move the flys if it is active, not SwTextFrame::Format(). This is all a bit experimental but i failed to have a better idea... (regression from previous commit) Change-Id: Icfcbd270137116198128d549b34e7f49a47b6911 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152246 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-05-24tdf#148897 sw: layout: force invalidate background when moving fly off pageMichael Stahl
The fly 15 moves forward in SwLayAction::FormatContent(), then back again later, without being positioned on the next page, and it happens to go to the same position that it originally had. Then SwFlyNotify sees that the position is the same, and doesn't do any invalidation of the background, so the fly overlaps a text frame. When the fly is moved by the object positioning code (before the below commit), it first gets a new position on the next page, and then moves back, so all invalidations happen. Force the invalidation of the background in this case. (regression from commit eb85de8e6b61fb3fcb6c03ae0145f7fe5478bccf "sw: layout: if fly's anchor moves forward, move fly off SwPageFrame") Change-Id: Ifdc9460defe7b1f37cbb05310906146919e8fb6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152245 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-05-24Fix typoAndrea Gelmini
Change-Id: I9478777b375b69794a3ae61ee35842ca94b6ba1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152202 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2023-05-24tdf#155465 doc export: handle para last line - justifyJustin Luth
This was already OK for import in OOo 3.3, but never exported. DOCX export landed in 2019 (no bug report). No existing unit tests matched for DOC. make CppunitTest_sw_ww8export4 \ CPPUNIT_TEST_NAME=testTdf155465_paraAdjustDistribute Change-Id: Iaea149c21259fe2a9002c8ce7c023327bbd13746 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152199 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com>
2023-05-24tdf#141684 tdf#147740 notebookbar: fix disappearing icons in groupbar #2Justin Luth
AFAICS, the code was non-sensical before. Hopefully now it is logical. Apparently returning the correct width doesn't mean much, but that is the only thing that should be changing in this patch. I would assume that returning an accurate width is the proper thing to do for this function... Change-Id: Iab26ac7fd8cd00127d2646f792fa552ec148dc74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152126 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2023-05-24upgrade to libxml2-2.11.4Caolán McNamara
'checked' field removed with: https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55 win32 'run_debug' removed with: https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b add libxml2-XMLCALL-redefine.patch.0 to avoid: UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the following warning is treated as an error UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 'XMLCALL': macro redefinition UnpackedTarball\expat\lib\expat_external.h(69): note: see previous definition of 'XMLCALL' Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-05-24Remove triplicated includeAndrea Gelmini
Change-Id: I345a6e87ebf27188e9bdfe82ee364c2363b48efd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152197 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2023-05-24Fix CppunitTest_configmgr_unit for --disable-report-builderStephan Bergmann
...after abd630e81bc150d05e4129cc22752ecf461777c7 "Allow all hierarchical path segments to be ['...'] quoted", which failed as the checked MimeTypeClassIDRelations group is conditional on install:module="reportbuilder". (See the comments at <https://gerrit.libreoffice.org/c/core/+/151673/2#message-f029dd1877f8a946647456ed73a7b60f6dfc0e8f> "Allow all hierarchical path segments to be ['...'] quoted".) It looks like there is no other, non-conditional property with a slash in its name, so the test now just tests the ['...'] syntax on an otherwise unproblematic property name. (Alternatively, we could have extended the configuration data used by unit tests with such a problematicaly named property.) Change-Id: I820004a5b824326d86e67c158994f13e71ba135e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152184 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-05-24Remove duplicated includeAndrea Gelmini
Change-Id: I01ff5b522433826f560c9adbe606393e449434ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152198 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2023-05-24Related tdf#146518 Add Watch/Stack window commands to toolbarRafael Lima
This patch adds the new commands WatchWindow and StackWindow to the Basic toolbar, together with the related ObjectCatalog command. Change-Id: Ia50d4a695271c6fae6446c18548930a3e9063489 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151787 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2023-05-24remove obsolete commentNoel Grandin
Change-Id: I0b241b61f300fb3ed25b74595c3f8a7d018105b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152186 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-24sw floattable: add a DoNotBreakWrappedTables compat flagMiklos Vajna
RTF doesn't break floating table across pages, and there is a matching DOCX compat flag to handle such documents. We can ignore floating table info on the model as a workaround, but that would mean the info is lost on save, so that's not ideal. Instead add a new compat flag that disables fly split at a layout level, which allows both not splitting tables & retaining the model-level info. This commit does the doc model, UNO API, layout & ODT filter, the Word filters are not yet updated. This compat flag is probably quite rare, so introduce a mechanism to only write the compat flag when it's true: this way the majority of the documents don't need to say anything about it and we can assume "false" for them. Also fix two missing xmlTextWriterEndElement() calls in the xml dumper. Change-Id: I32321ec204d7bfe011fcf024b97c906da0db8aae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152190 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-05-24Update git submodulesAndras Timar
* Update dictionaries from branch 'master' to 2404521a6c320ae5e307c6c0fed31d81de751a88 - On Linux dictionaries are packaged separately Change-Id: I604a0f12bdbedc0f35a27ead0f995e9dd3a27d8b Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/152191 Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2023-05-24ScripForge (SF_Dialog) new OrderTabs() methodJean-Pierre Ledure
Set the tabulation index f a series of controls. The sequence of controls are given as an array of control names from the first to the last. Next controls will not be accessible (anymore ?) via the TAB key if >=1 of next conditions is met: - if they are not in the given list - if their type is FixedLine, GroupBox or ProgressBar - if the control is disabled Args: TabsList: an array of valid control names in the order of tabulation. Start: the tab index to be assigned to the 1st control in the list. Default = 1. Increment: the difference between 2 successive tab indexes. Default = 1. Returns: True when successful. The method is available from Basic and Python user scripts This change will require an update of the SF_Dialog help page. Change-Id: Ie854227691c4e182b49a521b1285deaa4de3d1ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152166 Reviewed-by: Jean-Pierre Ledure <jp@ledure.be> Tested-by: Jenkins
2023-05-24sw: fix crash in SwNode::GetFlyFormat()Xisco Fauli
FindFlyFrame() might return nullptr See https://crashreport.libreoffice.org/stats/signature/SwNode::GetFlyFormat() Change-Id: Id99a806e62f03b8912747525c8b0235c1b23232b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152156 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-05-24Remove unused comphelper::adjustIndexToStartOfSurrogateStephan Bergmann
...introduced in 28cc0bff10f5dcec0c7b698ae7ba275845b2cad1 "Break comphelper::adjustIndexToStartOfSurrogate out of o3tl::iterateCodePoints" in preparation for bd5c3582581f37513f45b518e348f443d5d57334 "a11y: Fix returning unpaired surrogates when retrieving characters", but which never picked it up Change-Id: I5a10a3053d2f51333e27b74a808a41df7c1912ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152183 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-05-24CppunitTest_sw_uiwriter4: restore part of testTdf107975 on WindowsMiklos Vajna
Just disable the part that in fact fails, as requested at <https://gerrit.libreoffice.org/c/core/+/152180/2#message-a9a5614df8b71f2b545ede872c5af9efa41a029b>. Change-Id: Ic856525505d25d7b443058e6e56151270c4c1244 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152181 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
2023-05-24speedup drawing toolbars, cache min-widthNoel Grandin
doing the style lookup for the minWidth is really very slow in gtk Change-Id: Ic7c44edada8d7205586fe569f30d92d4243642a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152182 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-24CppunitTest_sw_htmlexport: avoid reqif magic in testReqIfListMiklos Vajna
Set the filter options explicitly, rather than inferring it from the test name. Change-Id: Id24ee8755afeed0393f7ebe164f1caf27a2e0ca8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152170 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-05-24tdf#148088: Fix master related UI in DrawBaole Fang
Page/Master Page... -> Page/Change Master Page... (corresponds to Impress) In the above dialog: Available Master Slides -> Available Master Pages Select a Slide Design -> Select a Page Design After clickling load: Load Master Slide -> Load Master Page In Master mode, right click/Rename Master: Rename Master Slide -> Rename Master Page Change-Id: I6a8e987d6f3eaf91289ec061ec87cd76b3f90ca2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151489 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2023-05-24CppunitTest_sw_uiwriter4: disable testTdf107975 on WindowsMiklos Vajna
E.g. <https://gerrit.libreoffice.org/c/core/+/152138> failed 3 times in a row, always on this test, always on Windows. Also <https://gerrit.libreoffice.org/c/core/+/152170> failed 2 times in a row, again only on this test, only on Windows. At the same time, it doesn't fail reliably locally, so hard to debug the root cause. Change-Id: Iaf257d2b7ef5f46f6275b6ebcebc2156f4e58d04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152180 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-05-24CloneList::CopyConnections: Replace duplicated code by loopDr. David Alan Gilbert
There's a chunk of code copied for the two ends of the connection; replace it by a loop with the original code. Change-Id: I80d80f61879a08612dd8314963cccb35651c2091 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152073 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-05-24Update git submodulesAndrea Gelmini
* Update helpcontent2 from branch 'master' to 2cbe21de3941407ffbd6957dfb88f142122ad057 - Fix typo Change-Id: I68cced3d3101be527beea717e828da418834f117 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152134 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-05-23perf: surprising to see getenv on a profile.Michael Meeks
Change-Id: Id97c77d4c836e4f3c5a9eff6da07eb52d29248c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152105 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2023-05-23perf: surprising to see PDF being vsprintf'd during JSDialog rendering.Michael Meeks
Avoid some hundreds of these: _cairo_pdf_surface_show_page ... cairo_surface_destroy CairoTextRender::CairoTextRender via. SvpCairoTextRender: :SvpCairoTextRender(SvpSalGraphics&) SvpSalGraphics: :SvpSalGraphics() Change-Id: Ieefb65138f7e685f09dbf4c36a2fccd39b4b05cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152173 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-05-23tdf#155350 Do AutoCorrect of Input Method textCaolán McNamara
for all of SvxAutoCorrect::IsAutoCorrectChar() chars not just quotes Change-Id: I368836ea3c2dcdcc7fbe6906d7ae886f312d73d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152172 Tested-by: Jenkins Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>