sc/inc/document.hxx | 2 +- sc/inc/table.hxx | 2 +- static/CustomTarget_emscripten_fs_image.mk | 1 + vcl/jsdialog/enabled.cxx | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 2c55c39355e9d775b2d260633644bae979b1efea Author: Balazs Varga <[email protected]> AuthorDate: Wed Nov 5 08:42:04 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Nov 17 19:04:36 2025 +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]> diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index d28e63f5747b..024c82f1eabd 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -1062,6 +1062,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 21d3edb44fb9..565e309fe8ec 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -421,6 +421,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" }, commit 41635819d4d44117203bc27af76a0efc523eac34 Author: Balazs Varga <[email protected]> AuthorDate: Fri Oct 31 14:13:23 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Nov 17 19:04:25 2025 +0100 Table Styles: fix unit test builds failer because of missing function parameteres. Change-Id: I3f1cf9eb1705c8a408d079a1edcece7bffe3afbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193266 Reviewed-by: Balazs Varga <[email protected]> Tested-by: Balazs Varga <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193686 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index b6e5c9a7fbf0..7ed215ca8565 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2265,7 +2265,7 @@ public: void Reorder( const sc::ReorderParam& rParam ); void PrepareQuery( SCTAB nTab, ScQueryParam& rQueryParam ); - SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub, bool bKeepTotals ); + SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub, bool bKeepTotals = false ); SC_DLLPUBLIC bool CreateQueryParam( const ScRange& rRange, ScQueryParam& rQueryParam ); OUString GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 9fdd7501bfbc..92a6e76d4bbd 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -1043,7 +1043,7 @@ public: // For ValidQuery() see ScQueryEvalutor class. void TopTenQuery( ScQueryParam& ); void PrepareQuery( ScQueryParam& rQueryParam ); - SCSIZE Query(const ScQueryParam& rQueryParam, bool bKeepSub, bool bKeepTotals); + SCSIZE Query(const ScQueryParam& rQueryParam, bool bKeepSub, bool bKeepTotals = false); bool CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, ScFilterEntries& rFilterEntries, bool bFiltering = false);
