sc/source/ui/view/gridwin.cxx | 27 +++++++++++++++++---------- static/CustomTarget_emscripten_fs_image.mk | 1 + vcl/jsdialog/enabled.cxx | 1 + 3 files changed, 19 insertions(+), 10 deletions(-)
New commits: commit cb2979ac45a0a085ac33cfdf074f4cd2dd810dbe Author: Balazs Varga <[email protected]> AuthorDate: Wed Nov 5 20:02:16 2025 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Wed Jan 7 17:14:52 2026 +0100 Table styles: fix crash in online after selecting table area TODO: draw rectangle around table area and show auto fill rectangle in Online. Change-Id: Idb71c2e6eb426ca9141ceba5b5cbac7801bd15be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193688 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196756 Tested-by: Balazs Varga <[email protected]> Reviewed-by: Balazs Varga <[email protected]> diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index c00c190e871e..836309319465 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -6979,6 +6979,7 @@ void ScGridWindow::UpdateSelectionOverlay() void ScGridWindow::DeleteDatabaseOverlay() { + mpDBExpandRect.reset(); mpOODatabase.reset(); } @@ -7026,16 +7027,22 @@ void ScGridWindow::UpdateDatabaseOverlay() // #i70788# get the OverlayManager safely rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection( - sdr::overlay::OverlayType::NoFill, - aDBColor, - std::move(aRanges), - true, true)); - - xOverlayManager->add(*pOverlay); - std::unique_ptr<sdr::overlay::OverlayObjectList> pOverlayList = DrawFillMarker(aCurrRange.aEnd.Col(), aCurrRange.aEnd.Row(), mpDBExpandRect); - mpOODatabase.swap(pOverlayList); - mpOODatabase->append(std::move(pOverlay)); + if (xOverlayManager.is()) + { + std::unique_ptr<sdr::overlay::OverlayObject> pOverlay(new sdr::overlay::OverlaySelection( + sdr::overlay::OverlayType::NoFill, + aDBColor, + std::move(aRanges), + true, true)); + + xOverlayManager->add(*pOverlay); + std::unique_ptr<sdr::overlay::OverlayObjectList> pOverlayList = DrawFillMarker(aCurrRange.aEnd.Col(), aCurrRange.aEnd.Row(), mpDBExpandRect); + if (pOverlayList) + { + mpOODatabase.swap(pOverlayList); + mpOODatabase->append(std::move(pOverlay)); + } + } } } commit f9b83e050ac2165f35bd558fcecf55c2b1756c90 Author: Balazs Varga <[email protected]> AuthorDate: Wed Nov 5 08:42:04 2025 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Wed Jan 7 17:14:42 2026 +0100 Table style: add the missing .ui files to jsdialog and wasm Add new .ui file to jsdialog and wasm Change-Id: Ifd7b0654eff398639e46f69830002ebb85d52394 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193687 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196755 Reviewed-by: Balazs Varga <[email protected]> Tested-by: Balazs Varga <[email protected]> diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index 5860d4158882..2fca3b748f1b 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -1359,6 +1359,7 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/showsheetdialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebaralignment.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebarcellappearance.ui \ + $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebardatabase.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebarnumberformat.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/simplerefdialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/solverdlg.ui \ diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index b53979c60107..d5052c3fbd9d 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -416,6 +416,7 @@ constexpr auto SidebarList { u"modules/scalc/ui/functionpanel.ui" }, { u"modules/scalc/ui/sidebaralignment.ui" }, { u"modules/scalc/ui/sidebarcellappearance.ui" }, + { u"modules/scalc/ui/sidebardatabase.ui" }, { u"modules/scalc/ui/sidebarnumberformat.ui" }, // schart { u"modules/schart/ui/sidebaraxis.ui" },
