summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-14upload libmwaw 0.3.21David Tardon
Change-Id: Id28cd361237ce67b76a865ad4291ccece521af85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126768 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit c74d59a8b47bb8228c297a60e6b5b0cc5e08aa53) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126809 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-14tdf#62032 xmloff: list-level is positiveInteger, impl is 0-basedJustin Luth
Thanks for catching this Regina. Change-Id: Iaf6a0c9161378934818e392126a4437e55f5ddf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126743 Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit aed4c2d80c2f11b82631c097ed0b15a5cb52283d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126812
2021-12-14tdf#134960 List drawing objects in order of appearance in documentJim Raykowski
in Writer Navigator drawing objects content type member list Current code seems like it should work but GetFrameOfModified doesn't provide layout position for drawing objects like it does for table and frame objects. This patch gets position of drawing object in document directly from SdrObject. Change-Id: I501757900f265370d8e3b606cb4b3a81464e73f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126627 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 9e046e43fc6d3fecd193da076c0871a458ba71dd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126808
2021-12-13related tdf#92010 sc autoformula: ensure proper sorting orderJustin Luth
When typing "=a", autoformula was suggesting ACCRINT,ACCRINTM,ACOS instead of starting with ABS. [This has been true since these 3 suggestions started in LO 5.2.] Prior to this patch, the very first item in the sorted list (ABS) was placed at the end of the suggestion vector. That is because the loop immediately increments. Since the given initialization value is end(), it set begin() as the starting loop value and then immediately incremented to item 2. Item 1 was finally evaluated last, putting ABS after ZTEST. The backwards loop handled this properly, so do the same thing for the forward loop. Change-Id: I539c749ea43140a1480d74471787bc886dda671e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126723 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit b2fb1631ab5b3c1d9d09aefa0d3a81307e7ffa35) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126750
2021-12-13tdf#92010 sc autoFormula: prefer MRU formulasJustin Luth
Prior to 4.3, only MRU formulas were auto-completed. Then it changed to suggest all formulas - alphabetically for the most part. That 4.3 commit 5b0b7553241bb5150b12bbf7625b4b0b36970272 completely removed all reference to MRU. But it makes sense to prefer an MRU over a strictly alphabetical match. This patch depends on LO 7.4 patch "new ScTypedStrData: typically missed argument in CTOR" Change-Id: Id5d860d1401693f43833719977d1c1e4c386385c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126499 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit b93a6964e0466c1b67d2c233040357a8f6c75214) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126749
2021-12-13tdf#146208 sw DOCX: fix crash at Redo of tracked table changesLászló Németh
Importing DOCX tables with tracked row deletion and insertion, accepting them, Undo, and accepting them again (or Redo) crashed LibreOffice, related to the missing Undo support of deletions in SwExtraRedlineTable. SwTableRowRedline is not used for DOCX export since commit dbc2bdffbec9b3f7eba485652cdd43634458b5a6 "tdf#145091 DOCX: don't export obsolete table row change data", so it's possible to switch off deletion of row changes in SwExtraRedlineTable to fix crashing, keeping SwTableRowRedline only to fix the round-trip of the original row change Date temporarily. Change-Id: I6ac571656e45c4299a07a63646bb28d6d1fcd081 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126662 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6a9cf64ea7509aac258f290cc1f204fd1ce1f974) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126748
2021-12-13Remove dubious code in ui fileXisco Fauli
Introduced in f773e7aa8c96e070085ece95889f02590ed65f89 < Resolves tdf#144227 - Default command to switch UI > Change-Id: I1975d6d61a2fd225e87dffe65708a1f5e531f106 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126735 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 29bbed22e404700f9538e244df6e02681da1fc1b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126747 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-13lok: don't crash accessing an invalid ObjectContact cacheDennis Francis
Fix description: Avoid storing a reference to the object-contact (sdr::contact::ObjectContact) of the page-window (SdrPageWindow) related to ScDrawView in the "proxy" object-contact. In the current setup there is no way to invalidate the proxy object when the original object-contact and its page-window are destroyed (in this case it seems during a sheet-switch). Instead query the real object contact just in time when the grid offsets are requested from the proxy object-contact. Performance: Behaviour of offset computation is not affected. It is still cached in the "real" object contact and it is only computed after it gets invalidated (because of change in zoom) Crasher reproduction(LOK): 1. Create a spreadsheet with two sheets - one with a table of texts and shapes and other may be empty. 2. In first sheet select a single row(via header) and press Ctrl+X. 3. Go to the empty sheet, and paste (Ctrl+V) and immediately save using Ctrl+S. ---Relevant part of backtrace----------------- <signal handler called> 0x00007ff96781cc70 in main_arena () from /lib64/libc.so.6 0x00007ff964f2f47b in sdr::contact::ViewObjectContact::getGridOffset (this=0x6f01f20) at /opt/libreoffice/co-2021/svx/source/sdr/contact/viewobjectcontact.cxx:456 0x00007ff95cffac5a in (anonymous namespace)::ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact (this=0x6fb00a0, rTarget=..., rClient=...) at /opt/libreoffice/co-2021/sc/source/ui/view/gridwin4.cxx:1315 0x00007ff964f2f493 in sdr::contact::ViewObjectContact::getGridOffset (this=this@entry=0x5e0c5e0) at /opt/libreoffice/co-2021/svx/source/sdr/contact/viewobjectcontact.cxx:459 0x00007ff964f30732 in sdr::contact::ViewObjectContact::getPrimitive2DSequence (this=0x5e0c5e0, rDisplayInfo=...) at /opt/libreoffice/co-2021/svx/source/sdr/contact/viewobjectcontact.cxx:364 0x00007ff964f30a82 in sdr::contact::ViewObjectContact::getObjectRange (this=0x5e0c5e0) at /opt/libreoffice/co-2021/svx/source/sdr/contact/viewobjectcontact.cxx:198 0x00007ff964f30d00 in sdr::contact::ViewObjectContact::ActionChanged (this=0x5e0c5e0) at /opt/libreoffice/co-2021/svx/source/sdr/contact/viewobjectcontact.cxx:220 0x00007ff964f20294 in sdr::contact::ViewContact::ActionChildInserted (this=0x5dd83a0, rChild=...) at /opt/libreoffice/co-2021/svx/source/sdr/contact/viewcontact.cxx:180 0x00007ff96506628a in SdrObjList::impChildInserted (rChild=...) at /opt/libreoffice/co-2021/svx/source/svdraw/svdpage.cxx:288 0x00007ff95c808bcd in ScDocument::CreateAllNoteCaptions (this=<optimized out>) at /opt/libreoffice/co-2021/sc/source/core/data/document.cxx:6614 ... 0x00007ff95cbedcc5 in ScXMLImportWrapper::Export (this=this@entry=0x7fff5432f110, bStylesOnly=bStylesOnly@entry=false) at /opt/libreoffice/co-2021/sc/source/filter/xml/xmlwrap.cxx:730 0x00007ff95ccfd896 in ScDocShell::SaveXML (this=0x5c4c330, pSaveMedium=<optimized out>, xStor=...) at /opt/libreoffice/co-2021/sc/source/ui/docshell/docsh.cxx:556 0x00007ff95cd009c7 in ScDocShell::SaveAs (this=0x5c4c330, rMedium=...) at /opt/libreoffice/co-2021/sc/source/ui/docshell/docsh.cxx:1801 ... 0x00007ff95d081af4 in ScTabViewShell::ExecuteSave (this=0x5e9b100, rReq=...) at /opt/libreoffice/co-2021/sc/source/ui/inc/viewdata.hxx:354 ----------------------------------------- Change-Id: I00eac440546624bc448dcd30499957dea7c1de87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126471 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com> (cherry picked from commit ff175d858e897964d81cf3b7edaa6ccde32e098b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126519
2021-12-13tdf#146173: combine non-BMP characters' surrogates correctlyMike Kaganski
Change-Id: Ib3af1f9e461f133d2f5b09b9db4fb87c1ede0b9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126658 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 21154ea8c450f9f5568b32123d34a20e498a9290) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126683 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-13tdf#121699 sc: wrap LOKit stuff with isActiveJustin Luth
This is a partial revert of LO 6.1 commit 009d2756b1678477ec23d5647bd5004c4bff3a62. It is one thing to change code that you don't really know why it is setup that way, but it is another thing to ignore the resulting regression reports for 3 years. Not impressed. It look me only 1 hour to work through this, and this is completely outside of my normal line of programming. Change-Id: I8671677f38cc1332c6c5a76847801e2680097048 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126500 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit a99aea61c3199dc8188d4d873a10201082dff2e2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126686 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-13tdf#146048: detect UTF-16 without BOMMike Kaganski
Change-Id: I3c1742cdf88dfa08cf35d9f95875d4d3d6af09db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126596 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 3392f567be8d52804b187b0bced47204ef38fa3c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126600 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-13Fix regression in connectivity/evoab2Julien Nabet
Regression from 46d3e84d7a131f7c72cb536ab2f314cb55ffc155 Directly initialize vector in connectivity (part 2) Pinpointed thanks to this log: warn:dbaccess:612118:612118:dbaccess/source/core/dataaccess/connection.cxx:344: DBG_UNHANDLED_EXCEPTION in OConnection exception: com.sun.star.sdbc.SQLException message: Invalid descriptor index. /home/julien/lo/libreoffice/connectivity/source/commontools/dbexception.cxx:365 SQLState: 07009 ErrorCode: 0 wrapped: void message: /home/julien/lo/libreoffice/tools/source/debug/debug.cxx:104 when launching Base then connecting to Evolution local. Change-Id: Id4cb0fc322b0df24ed2b2d89a5595f4841db1845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126672 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-13tdf#146179: fix Dev Tools crash when inspecting object in special fileJulien Nabet
0 0x00007f3177297361 in SvxUnoTextBase::createEnumeration() (this=0x313ba98) at editeng/source/uno/unotext.cxx:1911 1 0x00007f317729751d in non-virtual thunk to SvxUnoTextBase::createEnumeration() () at editeng/source/uno/unotext.cxx:1918 2 0x00007f31755c2a7b in (anonymous namespace)::GenericPropertiesNode::fillChildren(std::unique_ptr<weld::TreeView, std::default_delete<weld::TreeView> >&, weld::TreeIter const*) (this=0x7ffee92c8140, pTree=std::unique_ptr<weld::TreeView> = {...}, pParent=0x0) at sfx2/source/devtools/ObjectInspectorTreeHandler.cxx:719 3 0x00007f31755c15f1 in ObjectInspectorTreeHandler::appendProperties(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) (this=0x8e499d0, xInterface=uno::Reference to (SvxPluginShape *) 0x313b8e0) at sfx2/source/devtools/ObjectInspectorTreeHandler.cxx:1270 4 0x00007f31755c0e85 in ObjectInspectorTreeHandler::NotebookEnterPage(rtl::OString const&) (this=0x8e499d0, rPageId="object_inspector_properties_tab") at sfx2/source/devtools/ObjectInspectorTreeHandler.cxx:1154 5 0x00007f31755befa0 in ObjectInspectorTreeHandler::LinkStubNotebookEnterPage(void*, rtl::OString const&) (instance=0x8e499d0, data="object_inspector_properties_tab") at sfx2/source/devtools/ObjectInspectorTreeHandler.cxx:1129 ... (gdb) p GetEditSource() $2 = (SvxEditSource *) 0x0 See full bt here: https://bugs.documentfoundation.org/attachment.cgi?id=176872 Change-Id: I1f3f48c742a2a3c6a2abcb2ed06d8f60e6f7a77f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126666 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit a5f2f989a0a7a5b602b7f3e39e99d7f4c2342cee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126678 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-13Adapt CppunitTest_cppcanvas_emfplus CPPUNIT_TEST_NAME=testFdo77229::TestBodyStephan Bergmann
...to 374e261ad1ea8b41f5ecdd850c27fdc961c4868b "increase maximum document thumbnail size from 256 to 512" (which wasn't caught by Jenkins due to bcd243793ee4174d71b5e61c88d2bc79fd0d7f1d "CppunitTest_cppcanvas_emfplus: disable this in case there is no display to use") Change-Id: Ibe3dc93401e237c37b4823f0393746b1e8b569bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126424 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d519d0a434310c0ee7cc4a1c04a6ff7c59f87f53) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126680
2021-12-13Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-7-3' to 495103834a0a664f92aeab6436af195451139544 - Mute l10n for BASIC variable types Change-Id: I096e41267dfbfa167409b91657c8b2ea015bab1e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126701 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit d0774bb418359c1135dab327cbc21b32d9513d02) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126679 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-12-11Update reference links for ISO 639 and 3166Eike Rathke
SIL has restructured their site, and ISO either moves things around or doesn't make them available at all. For 3166 use Wikipedia if ISO doesn't want to be a reference.. Change-Id: I2f906376c081667f57d48fa0386015a90857aae5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126689 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 06ac18e6302d666c363740644a7976e8c22d1113) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126674
2021-12-11tdf#128895 sc xmlimport: create enough dynamic cols if propsJustin Luth
Since LO 6.3, only 64 columns are created by default, where previously it was a fixed 1024. A common user practice is to hide all columns not used, but this collapsed property was lost because only part of the columns were actually created and thus exported. In this example, import specifies 1017 hidden columns (H-AMJ), but since only 64 columns are created, export only specified 57. So ensure that on import, any column with defined properties is created - even if they don't contain any content. Change-Id: If928880baf5585613715a1f4361a9059584d1ad2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126540 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 297ab561c6754f89326a1e8ce1751233669578d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126668
2021-12-11Update git submodulesRafael Lima
* Update helpcontent2 from branch 'libreoffice-7-3' to 3cff9e221a47781e5c5a096f597b79b20bf63fa9 - Silence strings for l10n in sbasic/shared (Part 2) Change-Id: Ia14a0773d1dc13eaf8737eca3f68594eb1bb8054 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126670 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit fa7fd622849d9e31d3f27e3762b0a0e578838cc0) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126671
2021-12-11tdf#146140 sw DOCX import: fix moveFrom regression with broken text contentLászló Németh
(Also a small clean-up: increase the character limit for tracked text moving detection: Only 2 or more (non-whitespace) character deletions are checked for it, because single characters are often typos or some control-like characters, e.g. soft hyphen, not real text movings.) Details of the regression: commit d32d9a2b3c5e3963f4a18f6c7bbf50fab2e9b2be "tdf#123460 DOCX track changes: moveFrom completely" fixed the missing redline import of the end of the moved paragraphs, but paragraph end was imported as w:del, not w:moveFrom explicitly. From commit f51fa7534421a195a58b4a737a2e836d8c25ba81 "tdf#145718 sw, DOCX import: complete tracked text moving" this resulted two deletions (a moved one and a plain one) instead of the previous single one. Moreover, exporting these double deletions at the same position to ODT, raised a back-compatibility issue with broken text content, see tdf#107292 (solved recently, but not in older LibreOffice versions). Removing the explicit w:del code path in writerfilter, it solved the regression from commit f51fa7534421a195a58b4a737a2e836d8c25ba81 "tdf#145718 sw, DOCX import: complete tracked text moving". See also commit 9e1e88ad5cf2dc0e9b188c60930445652a6c7519 "tdf#145720 DOCX export: fix loss of tracked moving". Change-Id: I15bfc83b87dd42a762ff84edf5bae765fe02a5ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126631 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 692bc46b25db61176b4ced7b7beffeca7d55068e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126669 Tested-by: László Németh <nemeth@numbertext.org>
2021-12-11tdf#145720 DOCX export: fix loss of tracked movingLászló Németh
of documents created in MSO to keep interoperability. Export moved redlines as moveFrom/moveTo instead of del/ins elements (also for newly created tracked moving). Export "MoveBookmark" elements moveFromRangeStart, moveFromRangeEnd, moveToRangeStart, moveToRangeEnd, which imported from DOCX documents created in MSO. Without them, moveFrom/moveTo elements were imported as plain deletion or insertion in MSO. Note: MoveBookmark elements were imported and exported as collapsed plain bookmarks. Now keep their ranges, also store the information of moveFrom/moveTo for correct export. In the export filter, mandatory author and date of the tracking information restored from RedlineData of the first redline within the MoveBookmark, if it's possible. Follow-up to commit f51fa7534421a195a58b4a737a2e836d8c25ba81 "tdf#145718 sw, DOCX import: complete tracked text moving". Change-Id: I54242453a7f7d8f73ea074fc74e8e7bc86d07d01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126258 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 9e1e88ad5cf2dc0e9b188c60930445652a6c7519, commit bbb09ebda08fec0702de0fb50dbe630acf73af2f and commit 3efde47ec9ee091479c04129696f99dc934c3f64) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126290 Tested-by: Jenkins
2021-12-11Revert "tdf#145354: Ensure displayed paper name matches displayed paper ..."Tor Lillqvist
It causes tdf#146045. This reverts commit 65081542d2dabdf17820d62abdc5a22d3734e52d Change-Id: Id980701b1a823c8bf7cfb57e0b32cf5d672c3bfa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126373 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit d2ca15952de167b6236139d53f6757a7c0d22d0a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126526 Reviewed-by: Justin Luth <jluth@mail.com>
2021-12-11tdf#144680 mailmerge toolbar: enable icons unless no resultsetJustin Luth
which backports 7.4 commit 9a115a254171d702a56a93c5c7e320de755dc8e8 plus tdf#144680 mailmerge toolbar: disable all icons if no resultset (7.4 commit 16376cae68f4406ef9440bdcb7b9617de6a6f998) plus a backport-only paranoid check to ensure that xConfigItem exists. This fixes a problem introduced in LO 6.3 (backported to 6.1.5) via commit 60714a814847f6d10f00aa6809a3896a48741e0b tdf#121606: displaying Mail Merge toolbar shouldn't activate connection Before 6.1, a user needed to run the mailmerge wizard (or start the toolbar manually) in order to have the mailmerge toolbar become available. In either of those cases, the connection to the database was attempted and thus enabled or disabled the various buttons based on the status. All good. In 6.1, the toolbar was started on document load, as soon as database fields were detected. Sounds reasonable - good context sensitive UI. The problem is that databases can often be password protected, or on slow, remote sites. Thus the 6.3 commit mentioned above, which disabled most buttons until the connection was established. Well, having disabled buttons isn't too helpful, and basically put us back to needing the extra step of running the mail-merge wizard anyway. The only problem with leaving them enabled is that we need to ensure that we don't run the functions with bad results. So sure - this means that a user thinks they can use the mail-merge, attempt it, and then may find the buttons disable when it won't work. That is the same as the forward/backwards buttons though, so no big deal. Plus it is good feedback that something isn't right (which will rarely ever be true). The only time the buttons disable is for non-existant resultsets. [Note that buttons do NOT disable for a wrong password, or for a remote connection that can't be established. And that is what we want anyway, so that further attempts can be made after fixing the underlying problem.] Change-Id: I3e82d2d3b35d04632650933c768cb0b5c006cb6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126625 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126633 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-12-11Update git submodulesRafael Lima
* Update helpcontent2 from branch 'libreoffice-7-3' to ca76e7f693ffe416833bea1e86689aa21646a980 - Silence strings for l10n in sbasic/shared (Part 1) These strings are appearing for translation in Weblate but they're pure Basic code/syntax that does not need translation. Change-Id: I8a3f16fcb23f18a2b2b46eb7eaf8bbf74023dd84 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126606 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit bba53dc2eb06941ab4e9b9c22722b22c19cd3698) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126667 Tested-by: Jenkins
2021-12-10merge fixes to zxing's copy of stb_imageCaolán McNamara
see: https://github.com/nu-book/zxing-cpp/pull/269 CVE-2021-28021 CVE-2021-42715 CVE-2021-42716 though it's unclear if there is any relevence to our usage of zxing-cpp Change-Id: I30fa7682af56c432b651d8c0385f1b85c3582101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126604 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-10Resolves: tdf#145974 reduce the papersize by scrollbar thicknessCaolán McNamara
if scrollbar required and scrollbar isn't an overlay one Change-Id: I839fd8c214febadb80f692b53dc156e251f506ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126602 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-10Related tdf#102506: make Find Bar Ctrl+F searching by value by defaultJulien Nabet
Change-Id: I4c001b60eecbcdae95cde6d79cc91bb887d7a742 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126490 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit b60bc1e597032e598caf43d1a13409068b800f57) Change-Id: I95105ca522aa4905fa223b80828684810f0dccd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126599 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-10tdf#133353, Make 2nd argument optional for DCOUNT and DCOUNTA.Winfried Donkers
The functions accept empty second arguments, but the function wizard and hints stated that it was required. Change-Id: I74fcfcc31492ed776085d1bc6ee6a9ff22a87818 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126620 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 885465bc0ae6029d8adad57015fb0ff6c26a6ba6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126594 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-10Resolves tdf#145976 - Resizing issues with the macro dialogHeiko Tietze
Fill attributes removes; some spacing added to be HIG conform Change-Id: Ic45bab071db23498e98df5fbed34ee5a50df1390 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126569 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit 5b0707f66e2c49a11f3a23e3ec9940b26d881165) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126593 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-12-10tdf#146108 Calc slow to change cell focus..Noel Grandin
in a document with a big background image Revert "tdf#136058: remove some caching" This reverts commit 57c40329a2b469813a1f357de355a37c8e3077ae. And add some comments for future would-be optimisers. Change-Id: Ie8686edc38dcdbe7d9e78599c1a259aab68278a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126527 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126574
2021-12-10tdf#138999 only grab keyboard and not pointing devicesCaolán McNamara
this way scrolling in a combobox dropdown and moving the mouse outside the widget doesn't cause the scrollbar to jump to the top. No ill effect seen in a) autofilter dropdowns in calc b) color dropdown in writer main window or sidebar and clicking on combobox subwidget to launch its popup and select an entry to return to color dropdown c) submenu popups from style combobox dropdown Change-Id: I6ad445a6fab899d52907237e1f5506cce31b1f48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126408 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4f41fb1cba455db617d7fb68450ea1e38ac9cb0d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126430
2021-12-10Resolves: tdf#146141 don't double delete commentsCaolán McNamara
which can happen because empty comments are deleted automatically on losing focus back to main document, so explicit delete of an empty comment resulted in a double delete Change-Id: I30390995a260235ed8702b0a088c05e91c953b3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126589 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-10new ScTypedStrData: typically missed argument in CTOR, tdf#142910 follow-upJustin Luth
Pretty much any attempted use of eType was completely wrong and lost. Regression from commit f6b143a57d9bd8f5d7b29febcb4e01ee1eb2ff1d CommitDate: Wed Jul 7 17:44:46 2021 +0200 tdf#142910 sc filter: fix "greater than" or "smaller than" etc Most calls to this are missing the "rounded number" argument, so the enumator is actually accepted as the double fRVal, and the StringValue eType was left as the default value (Standard), instead of the intended enumerator. 0.0 looks too much like 0, 0 to even notice in casual code reading. This had rendered the type mostly irrelevant. Change-Id: If4fa69d4b3077981244a2c3a785f80b77f9f9501 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126453 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit ac1ea5944a236efef75af7c85d0ffe10d374e7fa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126592 Tested-by: Jenkins
2021-12-09change use of wrong slot id to name of correct commandCaolán McNamara
slot was introduced with commit 27452a082237065ac4cf475c8398241907164b2c Date: Wed Oct 10 14:32:04 2007 +0000 INTEGRATION: CWS pppopt02 (1.24.74); FILE MERGED 2007/09/28 14:52:06 sj 1.24.74.1: added slot to be able to clear the undomanager as 27115, but got renumbered to 27118 with commit 35fe915b7cf508356a88897d520b89fc986407fb Date: Wed Jun 10 15:47:52 2015 +0200 Fix sd ID conflicts and duplicates using its name is verified to call the expected handler for it Change-Id: I656d91937612b0807353455930328aa37d5eecb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126587 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-09tdf#129430 PPTX export: fix workaround for "At least" line spacingTibor Nagy
to avoid bad overlapping lines. PPTX does not have the option "At least", so line spacing with this setting is converted to fixed line spacing. Improve this workaround to use single line spacing, if the "At least" value is lower than the size of the characters, like "At least" is handled by Impress. Change-Id: I29b41225d48fd9a447e7f6ef3a8a7cc7ba9ef354 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125553 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit fc1e5202cbfb36b28b0e597811f39895c19ae6ba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126588 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09tdf#145162 PPTX export: fix extra bullet regressionAttila Bakos (NISZ)
Placeholders have bullet by default in MSO, so write <a:buNone/> for paragraphs where numbering/bullet is disabled to avoid extra bullets in Impress. Regression from commit b6b02e0b4c9d739836e1f61a886ea45b01e6696e (tdf#111903 tdf#137152 PPTX export: fix placeholders). Change-Id: Ib4c563cba475d61bc475ca05623e7c7b20fded30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126528 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f57cfddb51b7d7409b7b425dc200aa73406a13bd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126524 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09sw: fix crash in SwFEShell::SelectObj()Miklos Vajna
Crashreport signature: SwContact::GetFormat() sw/inc/dcontact.hxx:112 SwFEShell::SelectObj(Point const&, unsigned char, SdrObject*) sw/source/core/frmedt/feshview.cxx:292 SwWrtShell::UnSelectFrame() sw/source/uibase/wrtsh/select.cxx:326 SwWrtShell::DelRight() sw/source/uibase/wrtsh/delete.cxx:467 SwBaseShell::ExecDelete(SfxRequest&) sw/source/uibase/shells/basesh.cxx:198 I.e. it seems that in case we're in the middle of a delete, then it's possible that the mark list contains an SdrObject that doesn't have a matching SwClient anymore. Ignore such SdrObjects when looking for the textbox of a draw shape. Change-Id: I065b2ea44d39220184a5f604c3ea13f6a106ddb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126563 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit fa1609be20baa2ccd3293a034e004efa1ae5b90e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126515 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09Related tdf#145910: relax a bit more denylist about OpenGLJulien Nabet
tdf#99919, tdf#100243, tdf#117477 and tdf#115092 are not related to slide transition Change-Id: I41e80a6b1d025adbde7bccbedb7235d4c3c8b281 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126462 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit dd4120ce811b8530505650d481514009a441234f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126522 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09ofz#42082 OOM with embedded pict in ww6 documentCaolán McNamara
Change-Id: I2772e55c20d4f38d26bfe36250f4fd281d4713d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126521 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-09tdf#145671 Don't open URL twice in cell edit modeSamuel Mehrbrodt
Change-Id: I8a324d6a037c8a5c0efc0b2825657513c2f9841c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126159 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit b9362e87a3646a6693b81fb0d40e28ce7813a251) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126441 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09tdf#145322, tdf#144378 fix printing for vertical writingMark Hung
Printing still uses ExTextOutRenderer to render text because Skia haven't yet support printing and DWriteTextRenderer can't bind the printer DC. ExTextOutRenderer uses win32 API ExtTextOutW. In order to renderer upright CJK text in vertical writing with that API, the HFONT created with CreateFontIndirectW needs a font name prefixed with '@'. OTOH, use '@' prefixed font with Skia break the vertical writing unit test. - WinSalGraphics::ImplDoSetFont: use '@' prefixed font name if the requested font is vertical and is for printing. - ExTextOutRenderer: use SetTextAlign and text metric tmDescent to adjust vertical glyphs. It's not consistent with Skia or DWriteTextRenderer, and is still incorrect in many cases. The patch is adapted from reverting commit 5686c1aca40beb9514d40c86b4a3780a8a1334ba Author: Mark Hung <marklh9@gmail.com> Date: Sun May 2 14:45:45 2021 +0800 vcl: use DWriteTextRenderer for vertical writing. Change-Id: Ib2d3df8b68cad4bebe0672c9da0a16b62aed99e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125978 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit 6720e9569d7ab6c20616ec6b97e5d4a56948908b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126443 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09tdf#146094 Impress refuses to go in presentation modeNoel Grandin
regression from commit 043ba6ddf8d90b04acfae8ec836c4b772fb36754 Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Mon Oct 11 16:08:12 2021 +0200 loplugin:moveparam in slideshow Change-Id: I8d6ec81f60e9bdba5b371b8a79abf3d07c523dfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126567 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 0cfd60b12855bc1e40640eb2e4cd4ea87d18ff7b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126520 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09svx: fix crash in ViewContact::ActionChanged()Miklos Vajna
Crashreport: sdr::contact::ViewContact::ActionChanged() svx/source/sdr/contact/viewcontact.cxx:197 (discriminator 2) SdrTextObj::NbcSetOutlinerParaObjectForText(std::unique_ptr<OutlinerParaObject, std::default_delete<OutlinerParaObject> >, SdrText*) svx/source/svdraw/svdotext.cxx:1379 sdr::properties::TextProperties::ItemSetChanged(SfxItemSet const&) /usr/include/c++/10/bits/unique_ptr.h:360 sdr::properties::RectangleProperties::ItemSetChanged(SfxItemSet const&) svx/source/sdr/properties/rectangleproperties.cxx:54 Change-Id: I82de3e849cef33d207c8fd5e1c225de78d5f8705 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126562 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 85bc09d05f4824929d5b1381343c3ca75e7f6006) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126516 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09tdf#117280: derive SfxEvents_Impl from css::document::XDocumentEventListenerMike Kaganski
It abused XEventListener, and created a DocumentEvent object from the incomplete data passed to notifyEvent in EventObject. That way, the data initially created for the document event (in Supplement) was lost on the way. Change-Id: I409611482ce2323a3192c68f3525f450a9395815 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126090 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 28eef82cb16faef0b8ddc9912560efb779baa9f9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126093 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-12-09sw: support for other sdt attributes roundtrip in datepickerVasily Melenchuk
Word Control Field with datepicker is implemented with LO datepicker, but during this conversion we lose some field data, like control color, data mapping, etc. This data is already retrieved and stored in grab bag, so we need just to keep this grabbag in field and use it again on export. Change-Id: I6af8204fe1a7d2f9081d83372a6786b2f86260d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125486 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126280
2021-12-09writerfilter: extend SdtHelper for better support control typesVasily Melenchuk
There is much more different controls which must be supprorted in future. So approach with isInsideDropDownControl() and validateDateFormat() is not sufficient. Use enum to determine and store control type. Change-Id: Ibea7fde117c059053195be213a3ae821644f277c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125471 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126279
2021-12-09sw: refactoring for docx sdt blocks outputVasily Melenchuk
Previous approach with almost duplicate storage and processing for paragraph-level and run-level sdt blocks was very bulky. Especially this became visible once supported std elements list start to grow. Paragraph-level sdt block and run-level sdt block data are almost identical, so they can be kept in one standard class (SdtBlockHelper) and use the same methods for collecting data from grabbags and writing to output without passing huge amount of parameters. Change-Id: I4e1183eddf20317e954cb8aca72e97a4fc45ac68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125372 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126278
2021-12-09Related: tdf#145786 cooperate between our own grabsCaolán McNamara
Change-Id: I97a1868c3f086b7f414d18d0fb4daa1c6d09846f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126514 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-09tdf#144107: fix incorrect conditioning on bGrid...Dennis Francis
introduced in 3092322bb83998397b09d3f34b6d04b5e5c1da50 The intention was to avoid the default line drawing in the original else branches to be conditional on bMergeCover. The previous patch used 'bGrid' as a surrogate for the original 'else' case - which is wrong. Change-Id: I7c6b49fa9c21064312273b1051ffc7f81de3fef3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126076 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com> (cherry picked from commit 307c1f13821386687b8cf3c560ff2570b89ac3a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126134
2021-12-08Related: tdf#144410 excessive "resize" triggeredCaolán McNamara
so changing cursor pos becomes hit or miss in the dropdown arrow shown case Change-Id: I6e08a022041667fe8368b2cb09289a598957eb87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126511 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-12-08tdf#146120 sw: show tracked table changes with different colorLászló Németh
In Change Tracking, show deleted table rows in cyan and inserted rows in pink. In this case, don't show original table row or cell background. Follow-up to commit f481c2c8e74bded11fac754e493560391229dbcd "tdf#144057 sw track changes: hide deleted table rows". Change-Id: Ib9cc411b62b92bc8a83dda7589f3e798f7e96f41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126482 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f348440e17debacbcba9153e238e010e8c020bdc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126510 Tested-by: Jenkins
generated by cgit (git 2.34.1) at 2024-07-04 00:49:38 +0000