officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 2 sc/inc/document.hxx | 2 sc/inc/table.hxx | 2 sc/source/ui/sidebar/ScPanelFactory.cxx | 1 sc/uiconfig/scalc/ui/sidebardatabase.ui | 225 +++++------ 5 files changed, 123 insertions(+), 109 deletions(-)
New commits: commit b5590a73e67c829c0c5a41a9b250a9fdbe82bc29 Author: Balazs Varga <[email protected]> AuthorDate: Fri Oct 31 14:13:23 2025 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Wed Jan 7 17:14:27 2026 +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]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196754 diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 590e09dfab71..1fff76c3b0cf 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2253,7 +2253,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 f31eb0df6bb2..5c3586990923 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -1033,7 +1033,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); commit f4b2ce5db1a3b97dbbd9ebf6508a08a58980bb4f Author: Balazs Varga <[email protected]> AuthorDate: Thu Oct 30 21:11:18 2025 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Wed Jan 7 17:14:15 2026 +0100 Table Styles: fix some ui problems on the sidebar Fix scrollbar problem. Bit nicer sidebar UI and change the name of the panel to Table Style Options. Change-Id: If94062419c1b7462e5039129724a1f06090b5dc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193228 Tested-by: Balazs Varga <[email protected]> Reviewed-by: Balazs Varga <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193685 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196753 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 2a9e2da5769b..a4742b39ef77 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1529,7 +1529,7 @@ <node oor:name="ScDatabasePropertyPanel" oor:op="replace"> <prop oor:name="Title" oor:type="xs:string"> - <value xml:lang="en-US">Database Range</value> + <value xml:lang="en-US">Table Style Options</value> </prop> <prop oor:name="Id" oor:type="xs:string"> <value>ScDatabasePropertyPanel</value> diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index c68311106249..92f7ece12c21 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -98,7 +98,6 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( else if (rsResourceURL.endsWith("/DatabasePropertyPanel")) { xPanel = ScDatabasePropertyPanel::Create( pParent, xFrame, pBindings ); - nMinimumSize = 0; } if (xPanel) diff --git a/sc/uiconfig/scalc/ui/sidebardatabase.ui b/sc/uiconfig/scalc/ui/sidebardatabase.ui index 393cb22d631e..55942dd17e6c 100644 --- a/sc/uiconfig/scalc/ui/sidebardatabase.ui +++ b/sc/uiconfig/scalc/ui/sidebardatabase.ui @@ -6,119 +6,134 @@ <object class="GtkGrid" id="DatabasePropertyPanel"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-top">2</property> + <property name="margin-bottom">2</property> <child> - <object class="GtkCheckButton" id="chk_header_row"> - <property name="label" translatable="yes" context="sidebardatabase|show_header_row_checkbox">Show Header Row</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chk_first_column"> - <property name="label" translatable="yes" context="sidebardatabase|first_column_formatting_checkbox">First Column</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chk_last_column"> - <property name="label" translatable="yes" context="sidebardatabase|last_column_formatting_checkbox">Last Column</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chk_banded_cols"> - <property name="label" translatable="yes" context="sidebardatabase|banded_columns_formatting_checkbox">Banded Columns</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chk_banded_rows"> - <property name="label" translatable="yes" context="sidebardatabase|banded_rows_formatting_checkbox">Banded Rows</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator"> + <!-- n-columns=2 n-rows=5 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can-focus">False</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chk_filter_buttons"> - <property name="label" translatable="yes" context="sidebardatabase|show_filter_buttons_checkbox">Show Filter Buttons</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> + <property name="row-spacing">2</property> + <property name="column-spacing">2</property> + <child> + <object class="GtkCheckButton" id="chk_header_row"> + <property name="label" translatable="yes" context="sidebardatabase|show_header_row_checkbox">Show Header Row</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chk_total_row"> + <property name="label" translatable="yes" context="sidebardatabase|show_total_row_checkbox">Show Total Row</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chk_filter_buttons"> + <property name="label" translatable="yes" context="sidebardatabase|show_filter_buttons_checkbox">Show Filter Buttons</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chk_banded_rows"> + <property name="label" translatable="yes" context="sidebardatabase|banded_rows_formatting_checkbox">Banded Rows</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chk_banded_cols"> + <property name="label" translatable="yes" context="sidebardatabase|banded_columns_formatting_checkbox">Banded Columns</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chk_first_column"> + <property name="label" translatable="yes" context="sidebardatabase|first_column_formatting_checkbox">First Column</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chk_last_column"> + <property name="label" translatable="yes" context="sidebardatabase|last_column_formatting_checkbox">Last Column</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chk_total_row"> - <property name="label" translatable="yes" context="sidebardatabase|show_total_row_checkbox">Show Total Row</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </interface>
