summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OInterfaceContainerHelper3 needs to be thread-safeco-21.06.9-1Noel Grandin2021-12-041-2/+6
| | | | | | | | | Change-Id: I11b84917033073d29268e61175faf43cbd5b1168 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125986 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 17aa192818caeb9af1381051a2dfda9568f7ce07) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125991
* Make the tdf#97983 changes to BASIC optional based on an environment variableTor Lillqvist2021-12-0416-20/+57
| | | | | | | | | | | | If you want to keep the string to floating point conversion semantics in BASIC as they were in LibreOffice 6, set the LIBREOFFICE6FLOATINGPOINTMODE environment variable to some non-empty value. Change-Id: I13d6d5d834e1bb81ef8df489db2b1da79f01dfc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125803 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* nss: upgrade to release 3.73Michael Stahl2021-12-038-117/+10
| | | | | | | | | | | | | | | | | | | | | | | Fixes: CVE-2021-43527 Memory corruption via DER-encoded DSA and RSA-PSS signatures Includes: nss: upgrade to release 3.71 * external/nss/nss.getopt.patch.0: fixed upstream * external/nss/nss-win-arm64.patch: fixed upstream * external/nss/nss_macosx.patch: one hunk was fixed upstream Conflicts: download.lst Change-Id: I5c3f169c57fc2763029b07ad7e325b2f53b7e28f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126218 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit c8e21d246bcb4289cb25c82be440cd07b7418436) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126234 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* svx: fix crash in ViewContact::ActionChanged()Miklos Vajna2021-12-031-1/+4
| | | | | | | | | | | | | | | | | | 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/+/126277 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
* tdf#140912 Better handling of the picture placeholders.gulsahkose2021-12-034-0/+52
| | | | | | | | | | | | | To see icon and placeholder text at the center of picture placeholder shape, we set the TextContourFrame and GraphicCrop properties. Change-Id: I49e3d08c9020e593232c60c97af3f45fb620075e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126165 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126214 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
* tdf#144244: fix crash when FILESAVE a calc file after delete some columnsJulien Nabet2021-12-031-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see bt here: https://bugs.documentfoundation.org/attachment.cgi?id=176507 Regression from 3238606c8470f3eaeada3fc601e186ec5cfac925 tdf138138 Apply shape shift also to NoRotatedAnchor The 'normal' anchor (as on screen) is connected to the snap rectangle, the NoRotatedAnchor is connected to the logic rectangle. They differ, if the shape is transformed, e.g. rotated. Error was, that values of the 'normal' anchor were applied to NoRotatedAnchor instead of calculating the shift of NoRotatedAnchor independently. The error becomes only visible on save, because there the NoRotatedAnchor is used. Effected shape types are legacy shapes, text boxes and transformable OLEs. I have not tested, whether this fix would work for LO 7.0 too. Let's apply the same controls as we do with ScDrawObjData retrieved with GetObjDataTab Change-Id: I73cb3dd3c47a7ec55667e498d4a62842ce63d861 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125852 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 1d45f84bd08c8d196fcf3c9baaf2cad010884e5c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126140 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 788859c02f11d264ab04cec4a29a1bcaafc05c18) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126267 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
* Bump version to 21.06.9-1cp-21.06.9-1Andras Timar2021-12-021-1/+1
| | | | Change-Id: I0072b5e5912badd21d73b1f59fe7d5ad4c9a85ce
* Replace unixODBC to iODBC that is BSD licensedAndras Timar2021-12-0217-4219/+5210
| | | | | | | Change-Id: Ia794fd97bb70b1e33385517971a174430d11cab7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126117 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
* typo fixes in license textAndras Timar2021-11-301-11/+11
| | | | Change-Id: I27e1baa2fd5d19546afc7bce30758b3442bd8ed3
* jsdialog: sidebar: enable animation panel effectsSzymon Kłos2021-11-255-5/+31
| | | | | | | | | | | | | | | - enable subcontrol .ui for jsdialogs in annimation panel - optimize to not recreate widget on every sidebar refresh - don't sent close message for whole sidebar when called from subcontrol This fixes widgets in annimation panel like: Direction listbox, or other replacements for selecting color, font etc. for font effect Change-Id: I5683ca9cefe384ed0d2a34d46936ddf4a9b45bce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125757 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
* Bump version to 21.06.8.1cp-21.06.8-1Andras Timar2021-11-241-1/+1
| | | | Change-Id: I273a257760216d6232b9624cfbb0b729098696d8
* Crash around help-windows.Michael Meeks2021-11-231-1/+2
| | | | | | | | | | | | | | | | | | | Seems a popular way to crash: vcl::Window::ImplCallMove() vcl/source/window/event.cxx:555 vcl::Window::Show(bool, ShowFlags) [clone .localalias] /usr/include/c++/10/bits/unique_ptr.h:173 vcl::Window::Show(bool, ShowFlags) vcl/source/window/window.cxx:2345 HelpTextWindow::ImplShow() vcl/source/app/help.cxx:371 Scheduler::ProcessTaskScheduling() vcl/source/app/scheduler.cxx:495 Change-Id: I33ca0059844395c41f4d76619cca22aec81df207 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125709 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
* jsdialog: correctly clean statically created message dialogsSzymon Kłos2021-11-232-9/+28
| | | | | | | | | | | - remember WindowId for statically created message dialogs - remember _DIALOG_ handle for message dialogs so response action can be done Change-Id: I1f6c9877e20dcbed4855b32d1e89d9ce3ff12111 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125686 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
* jsdialog: send popup when launched using Popover widgetSzymon Kłos2021-11-233-4/+19
| | | | | | | | | | | - enable validity listbox in online - flush when sending close popup to be sure it is sent Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: Icf33e26c48b78ab60030a7395e8c7ee5462fbf7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125647 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
* drop intermediate vcl container for ScFilterListBox floating toplevelCaolán McNamara2021-11-235-186/+114
| | | | | | | | | | Change-Id: Ib76fe7658f5f6817f048b1490be59bf24fc26e11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111688 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125646 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
* avoid only painting to windows in LOK mode, not invalidationsLuboš Luňák2021-11-231-30/+5
| | | | | | | | | | | | | | | | | | | | | | 9b73d3e8926d5f9b10464d19b539eef3eb088f50 disabled painting to windows in LOK mode, because it doesn't make sense as those windows are not even visible, but it tried to do it by avoiding even invalidations. That can trigger problems because some dialogs actually are forwarded to clients in LOK mode, and apparently they need the invalidations to proceed normally (the Format->Cell dialog in Online didn't repaint scrolling of the Date listbox, I don't know what exactly the actual problem was, but mnPaintFlags were different than when not avoiding invalidations). So revert most of the relevant commits and keep only avoiding actual drawing, which is what 057968bbce406efe6564347329df45b7e did. Change-Id: I4e212966830f4c690e6143b9d5fedbc24619e1ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125673 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
* Crash when fetching clipboard data.Michael Meeks2021-11-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like some unusual corner-case around HTML export. sw::DocumentContentOperationsManager::CopyImplImpl(SwPaM&, SwPosition&, bool, SwPaM*, bool) const /sw/source/core/doc/DocumentContentOperationsManager.cxx:5068 sw::DocumentContentOperationsManager::CopyImpl(SwPaM&, SwPosition&, bool, SwPaM*, bool) const /sw/source/core/doc/DocumentContentOperationsManager.cxx:4609 sw::DocumentContentOperationsManager::CopyRange(SwPaM&, SwPosition&, bool, bool, bool) const /sw/source/core/doc/DocumentContentOperationsManager.cxx:1936 SwEditShell::CopySelToDoc(SwDoc*) /sw/inc/pam.hxx:193 (discriminator 2) SwFEShell::Copy(SwDoc*, rtl::OUString const*) /sw/source/core/frmedt/fecopy.cxx:224 (anonymous namespace)::lclOverWriteDoc(SwWrtShell&, SwDoc&) /sw/source/uibase/dochdl/swdtflvr.cxx:413 SwTransferable::GetData(com::sun::star::datatransfer::DataFlavor const&, rtl::OUString const&) /include/sfx2/objsh.hxx:866 TransferableHelper::getTransferData2(com::sun::star::datatransfer::DataFlavor const&, rtl::OUString const&) /include/com/sun/star/uno/Type.h:121 TransferableHelper::getTransferData(com::sun::star::datatransfer::DataFlavor const&) /include/rtl/ustring.hxx:438 getFromTransferrable.isra.0 /include/com/sun/star/uno/Any.hxx:151 encodeImageAsHTML /desktop/source/lib/init.cxx:4382 doc_getTextSelection Change-Id: I1af52d827ebdc9bbc5278f56547d1b3fd1b87e7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125455 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* Bump version to 21.06.7.1cp-21.06.7-1Andras Timar2021-11-191-1/+1
| | | | Change-Id: I3b491c4475c327507784ee5ec86a4e67c4810c23
* revert "vlookup - optimize SC_EQUAL and NOT_EQUAL." (tdf#139612)Luboš Luňák2021-11-192-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That commit breaks lookup when the "Search criteria = and <> must apply to whole cells" option is disabled, as it enforces whole cell checking regardless of the option. Given that the option is enabled by default in LO ('SearchCriteria' in Calc.xcs) and it's what MSOffice does as well, and this default gives good performance regardless of the option, I don't understand the purpose of the commit. Possibly it was based on a document where somebody disabled the option and then indeed got worse performance. Solution: Don't do that :). This reverts the code parts of a953fa1c0f6a40a08859570516c511f3a841 . The test I've kept but switched to ensure that partial matching does work if the option to match whole cells is disabled. I've also changed the tooltip for the option to mention performance and not suggest that off is the default. 7.2: UI string change not included. Change-Id: I56d7b6e7b8e9f0622f7ad6d447daf56c3b705a7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125267 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 8dec2a98ce29251936cd45ebf864a89ff767ee50) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125351 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
* Avoid some -Werror,-Wdeprecated-copy-with-user-provided-dtorStephan Bergmann2021-11-173-11/+2
| | | | | | | | | | | | | ...after e6968f0485cfb2f6c941d11c438386e14a47095d "PPTX import: fix handling of theme overrides in the chart import" introduced a use of std::make_shared<Theme> Change-Id: I5f6384b81e02034b6b2fdf3a3bad0148de4eb584 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125228 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125279 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* jsdialog: use string identifiersSzymon Kłos2021-11-167-38/+62
| | | | | | | | | | | | | | Thanks to that it is easier to debug and find widgets in maps. Sidebar and notebookbar are now in different map entries. This fixes the issue when destroying notebookbar deleted sidebar's widgets. After this patch sidebar works correctly when using notebookbar mode in lok. Change-Id: Ie9dcb82675129bdb567b766e29779744f500cb48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125216 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
* tdf#127512: PPTX import: fix handling of theme overrides in the chart importMiklos Vajna2021-11-163-4/+47
| | | | | | | | | | | | | | A problem since commit 08818d8a45e034ad825c7fafbb76766f106f1d1d (bnc#882383: Do not ignore themeOverride for charts in .pptx, 2014-07-04), an override for one chart should not affect later drawingML objects. (cherry picked from commit e6968f0485cfb2f6c941d11c438386e14a47095d) Change-Id: I22b70c8c82e8e8520179c628f566d7f6663c887f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125269 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* disable Writer shadow hack in LOK caseLuboš Luňák2021-11-151-15/+18
| | | | | | | | | | | LOK redraws always with new content, so there's no need to rewrite any possible previous content, and this breaks transparency in LOK case. Change-Id: I1df3fe738f5ac1290720f0e18d6d391e220eb8ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125225 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* lok: sw: remove database tabHenry Castro2021-11-141-0/+4
| | | | | | | | | | | It is not functional the database feature yet. Change-Id: Iea073512424a738dc2d789923740b837d6f3d691 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125113 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit ead2aa7a7088aa2b41a90746351fdf74822dbbe0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125129
* sw, out of order undo: allow multiple actions from other viewsMiklos Vajna2021-11-135-15/+90
| | | | | | | | | | | | | | | | | | | | | | Previously we assumed that the action to be executed is always exactly the top of the undo stack minus 1 element. Extend this, so that in case an other view appends two or more elements to the undo stack, we still find our undo action. Obviously only do this if all those undo actions are independent from us. This requires replacing the swap in svl/ with a move-out + move a range down + move in construct. (cherry picked from commit 39f231360013e944a8713248359662b9f282d902) Conflicts: sw/source/core/undo/docundo.cxx Change-Id: Ic12d32d6eb5e77618d99eddb4fa096802f32d655 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125102 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* Fix -Werror=shadow in basesh.cxxAron Budea2021-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | sw/source/uibase/shells/basesh.cxx: In member function ‘void SwBaseShell::ExecUndo(SfxRequest&)’: sw/source/uibase/shells/basesh.cxx:564:29: error: declaration of ‘rView’ shadows a member of ‘SwBaseShell’ [-Werror=shadow] 564 | SwView& rView = rWrtShell.GetView(); | ^~~~~ In file included from sw/source/uibase/shells/basesh.cxx:63: sw/source/uibase/inc/basesh.hxx:41:18: note: shadowed declaration is here 41 | SwView &rView; | ^~~~~ Since c72e500ccaf0ce2261c5233b80fba9342778f810. Change-Id: I5fda3ad4805dc59a9e0e01dd262c09952a2bc97e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125077 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
* make it explicit whether to ignore the result of getLOKPayload()Luboš Luňák2021-11-1210-20/+26
| | | | | | | | | | Returning an empty string to signify 'ignore' was a poor design, as some messages types actually may have valid empty messages. Change-Id: Ia82d3d97d150bc5ef412a1bd4b1091d9b2d84385 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125089 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
* sw, out of order undo: allow a subset of a non-empty redo listMiklos Vajna2021-11-114-6/+77
| | | | | | | | | | | | | | | | | | | | | | | | | Specifically, we used to not allow out of order undo at all if the redo list was non-empty. This relaxes that condition a bit. Out of order undo is OK with a non-empty redo list, in case all undo actions in the redo list are either 1) owned by the current view or 2) independent from the undo action to be executed I.e. if view1 has lots of type undo actions and an view2 adds a single type undo action on top of it, then allow view 1 to execute multiple of its typing undo actions, not just a single one. (cherry picked from commit 2875c65946e59f5dd7968155463bf00bd71d440b) Conflicts: sw/source/core/undo/docundo.cxx Change-Id: I2f5d9404a9994ed74b65233d2a315976c27b28b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125039 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* lok: no need to layout comments in writercp-21.06.6-1Szymon Kłos2021-11-111-0/+3
| | | | | | | | | | | | | | | | Annotations in writer use EditEngine what caused to send cursor position from that EditEngine to online and showing cursor in the top left corner of a document after comment insertion. We don't need to resize/update position comment windows as we send only abstract description of the comments and later rendering is handled by client. Change-Id: I1df0e44f9500c438efd00942a372754c7fbaa170 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124794 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* do not draw "desktop" (=surrounding background) in Writer in LOK modeLuboš Luňák2021-11-111-0/+3
| | | | | | | | | It's meant to stay transparent. Change-Id: Ia6264c44f369e80092f78a6a6674857460cd7c04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124716 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* Impress- Correct commands mentioning Page instead of SlideNnamani Ezinne2021-11-116-52/+55
| | | | | | | | | Replaced UNO commands that have similar implementation but their labels bear Page instead of Slide Change-Id: I5fb24493478b0a8fdd4e324066d8112497fc9eb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124888 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* Handle UNO command aliases in ToolBoxesSzymon Kłos2021-11-112-1/+32
| | | | | | | | | | | This allows to use ".uno:InsertSlide" which is an alias for ".uno:InsertPage" in the notebookbar. Change-Id: Ia52488b65e308a62b686e77b38cba3675deece73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124952 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* sw: allow undo of typing in 2 views independent from each otherMiklos Vajna2021-11-1114-14/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undoing out of order is dangerous by default, so limit this to a very specific case as a start, that allows growing in follow-up commits. For now, allow out of order undo if: 1) redo stack is empty 2) we're in LOK mode (different views represent different users) 3) we undo a single action (count is 1) 4) the top undo action doesn't belong to the current view 5) the top and the previous undo actions are independent Which only requires that SwUndoInsert::UndoImpl() is independent for two different paragraphs, which seems to be the case. Independent undo actions opt in for this, currently the only such allowed undo action is SwUndoInsert ("typing"), which adds characters to a single text node. Even those are only considered independent if they operate on different text nodes. On the positive side, this allows out of order undo in the frequent case where two users collaborate on a long document and they just type some new content into the document at different paragraphs. (cherry picked from commit 8e8e72f08b01a284cf1a90b888d48acfb6a33d2e) Conflicts: sw/source/core/inc/UndoManager.hxx sw/source/uibase/shells/basesh.cxx Change-Id: Ibb4551e8f7046b4947491b8bf751eaa0cbb2d060 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124955 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* Resolves: tdf#145386 Use "Default" for LANGUAGE_PROCESS_OR_USER_DEFAULTEike Rathke2021-11-102-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no, specifically not in Writer, handling of the LCID 0x0400 LANGUAGE_PROCESS_OR_USER_DEFAULT language/locale concept other than the number formatter mapping it to LANGUAGE_SYSTEM. Use the LANGUAGE_SYSTEM "Default" string in UI (status bar, status menu, language list) but keep the LCID, and don't append the resolved locale string as it is also displayed both in the Font Western and CJK listboxes. This ends up as two list entries, like * Default - English (UK) first entry * Default last entry of which the second would be selected. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124449 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 0f3c19ee61ec371aa32d9f51c3555d3ea8ae9eeb) Conflicts: svtools/source/misc/langtab.cxx Change-Id: I8d9e4171bee6bbe9d1c9dcfb7a5fa8fc92ea1a2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124204 Tested-by: Jenkins Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124450 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
* More targeted suppression of bogus GCC -Werror=stringop-overflow=Stephan Bergmann2021-11-103-3/+54
| | | | | | | | | | | | | | | ...given that <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87296#c5> "[8/9/10/11 Regression] -Wstringop-overflow false positive due to using MEM_REF type of &MEM" is declared fixed now on GCC 11 trunk. (Moving -Wno-stringop-overflow from gb_CFLAGS_WERROR to gb_CXXFLAGS_COMMON is done for no other reason than to harmonize this with the code for the similar HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED.) Change-Id: I3468138c9bbda28f754d4162cb9c059796bd3932 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111029 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* lok: hide useless insert image button in sidebarSzymon Kłos2021-11-101-8/+8
| | | | | | | | | | | do this also in draw, not only in impress Change-Id: Iaaf2349cfb98b801957b71bd4504f0e9efbfba4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124840 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124902 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
* Bump version to 21.06.6.1co-21.06.6-1Andras Timar2021-11-101-1/+1
| | | | Change-Id: Ic49366632debf2c7b603e6a81d6ae41316065bde
* tdf#136111 fix scaling problem on chart driven by a macroAndras Timar2021-11-103-2/+21
| | | | | | | Change-Id: I9a55bcfceb9259f0d5dc944c00a34b3e4a891e0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124940 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
* sw: Wrong ZOrder after import for images anchored to non-1nd pageTomaž Vajngerl2021-11-105-2/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | Importing a document that has images anchored to the non-1st page, can result in images having the wrong the wrong Z index (ZOrder). If there are overlapping objects in the document, this can become a problem. The issue is with the call to SwRootFrame::RemoveMasterObjs, which removed the "master objects" - SwFlyDrawObj* castable objects. Normally the SwFlyDrawObj* objects on the page are wrapped and replaced by SwVirtFlyDrawObj*, but when the call to the RemoveMasterObjs was made, this hasn't happen yet to all the objects (objects that were not on the 1st page). The fix is to move the RemoveMasterObjs call to a different place, where we processed all the pages, so we can safely remove the remaining master objects on the page. Change-Id: I7d2f31614d269c22a82e7e5dea960f3d0844a5d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124597 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 8b7dbd220dbdfd286de2d770503dae8bf6d2e53e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124686 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
* sw: try grouping undo actions of IME-edited textMiklos Vajna2021-11-096-2/+65
| | | | | | | | | | | | | | | | | | | | | | This is a problem since commit e7760d428bc82ccfcae14f1907b78f9f1013b88c (Fix tdf#87500 - Freeze with English/Japanese mixture undo., 2015-09-08), that started not grouping IME-edited text completely. This means that in case you go via SwEditWin::Command() instead of SwEditWin::KeyInput() to type a 4 characters word, then it'll create 4 undo actions. Fix the problem by tracking who was the last caller of sw::DocumentContentOperationsManager::InsertString(), so we can only disable grouping switching between IME and non-IME, and we can have grouping for a series of IME input. (cherry picked from commit 6680e51716e383c68bb1ec9cc0a05d698d3b6a3d) Change-Id: I31bd02db4fe653ab63e41a77c75b8bebfc749ff1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124834 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* tdf#139205: Keep hierarchical structure of localized default styles in CalcKevin Suo2021-11-082-2/+7
| | | | | | | | | | | | | | | | | The default cell styles (when creating a new Calc document), as returned by orcus parsing, are built-in English names, as defined in sc/res/xml/styles.xml. These names can be localized. On non-English UI, all these (localized) styles names will be forced to use the localized "Default" as their parent because there is no such non-localized parents in the localized style tree on UI. In this patch, I added SC_DLLPUBLIC to ScStyleNameConversion::ProgrammaticToDisplayName, then used this function to convert the parent style name to the (localized) UI name. Change-Id: I3689211a10c60a5e7b2b273b6c15a4da92f0d633 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124556 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Eike Rathke <erack@redhat.com>
* [cp] --disable-skia, there's not that much point in building that for LinuxAndras Timar2021-11-051-0/+1
| | | | Change-Id: I0ccd3e6b544609dcdb6e78ef846adaa0f4d93768
* sc: EMBED_SOURCE: extend copy to clip area...Dennis Francis2021-11-041-1/+19
| | | | | | | | | | | | | | to include the draw objects in the sheet read from system clipboard. This is needed because GetCellArea() computes the "last row" and "last column" only based on the cell contents and not the drawing layer contents. So copying a "empty cells" range that has images in it and pasting it will not include any images without this fix. Change-Id: I56ffb14e881a1aecc5b43590ea4fb3fc1c35ace8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124629 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
* sc: EMBED_SOURCE: also include objects on copy to clipDennis Francis2021-11-041-1/+2
| | | | | | | | | | | | This is to match the behaviour of copy-pasting with the internal clipboard. If user copies a range that contains some images then on pasting these images are also included when using internal clipboard document. Change-Id: I61a6e71bd6afcace51230d1e7e7539e88404cbe5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124628 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
* sc: fix clip cell range for clip with no contentDennis Francis2021-11-041-0/+6
| | | | | | | | | | | | | | | | | | The problem was observed in LOK mode with the following step: 1. Select and copy a sheet area with no content. 2. Paste this into another document. => You get an error dialog saying "Protected cells cannot be modified". The issue here is in ScViewFunc::PasteDataFormat, rSrcDoc.GetDataStart() gives the correct cell indices of the clip selection, but GetCellArea() truncates the range to empty range as there is no content. Since these functions are used in many places which might depend on this behaviour, it seems right to fix it just for this usecase. Change-Id: Ibc85a8d7dd33b377a37298ea9a2a7ebb55eccf1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124627 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
* xmlsec: fix OOXML signing with multiple certs, extend the testTomaž Vajngerl2021-11-033-119/+154
| | | | | | | | | | | | | | | | | | | | | | Signing OOXML with 3 or more times didn't work as other ids ("idPackageObject", "idOfficeObject", ...) were not uniqe. This change makes those ids unique by appending the signature id. The signature ID is now generated for OOXML too, while previously it was a hardcoded string ("idPackageSignature"). The test for signing multiple OOXML was written before, but didn't catch the issues because it didn't assert the status of the document after loading it again. This is which is now fixed (and also added changed for the ODF test case). Change-Id: Ifa20ea17498b117a4c57f6eddf82f8e83bc640bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124571 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit f2e1e4ff085962a08a5d7738325b383c07afcbbd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124598 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
* Use JSDialogBuilder for "Find and Replace" dialog.Gökay ŞATIR2021-11-031-0/+1
| | | | | | | | Signed-off-by: Gökay ŞATIR <gokaysatir@gmail.com> Change-Id: I31307601f067c9b303854899258139678ddbba57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124586 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
* fix comparison when searching cacheLuboš Luňák2021-10-291-1/+1
| | | | | | | | | | | This made the cache always fail and re-cache, making CJK text layout slower over time. A mistake from ef513fd4b049b214a03fbe6e that converted !strcmp() to != instead of ==. Change-Id: Ib70579cd36d7b1df062e4d067e03f5c65e34b142 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124203 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* jsdialogs: use for MessageDialogsSzymon Kłos2021-10-291-2/+2
| | | | | | | Change-Id: Ie82558356cd9669f21afefd1ee88d769bf28eb8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124270 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
* tdf#145312 xmlsecurity: prevent from crash when cannot receive pdfium annotationSzymon Kłos2021-10-291-0/+5
| | | | | | | Change-Id: I6adc2cb0a07eb08a50c610958983493f4f8031ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124145 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
generated by cgit (git 2.34.1) at 2024-05-13 07:08:37 +0000