include/vcl/toolkit/treelistbox.hxx | 9 +-------- vcl/source/treelist/treelistbox.cxx | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-)
New commits: commit 39d011376b9bcf020bcb9e05121bb0dfb01f8822 Author: Caolán McNamara <[email protected]> AuthorDate: Wed May 11 20:35:30 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu May 12 09:54:22 2022 +0200 merge SetNodeBitmaps and SetNodeDefaultImages Change-Id: I31a9cc0fc9f97d564f9c8eac0c483892ae3c774f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134210 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index e280e9043ce3..d5633df7049e 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -530,7 +530,6 @@ public: void EnableCheckButton( SvLBoxButtonData* ); void SetCheckButtonData( SvLBoxButtonData* ); - void SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp ); /** Returns the default image which clients should use for expanded nodes, to have a consistent user interface experience in the whole product. @@ -544,13 +543,7 @@ public: /** Sets default bitmaps for collapsed and expanded nodes. */ - void SetNodeDefaultImages( ) - { - SetNodeBitmaps( - GetDefaultCollapsedNodeImage( ), - GetDefaultExpandedNodeImage( ) - ); - } + void SetNodeDefaultImages(); virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = nullptr, bool bChildrenOnDemand = false, diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 3e231d257f93..7c093a6f6a61 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -1808,10 +1808,10 @@ const Image& SvTreeListBox::GetDefaultCollapsedNodeImage( ) return SvImpLBox::GetDefaultCollapsedNodeImage( ); } -void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp ) +void SvTreeListBox::SetNodeDefaultImages() { - SetExpandedNodeBmp( rExpandedNodeBmp ); - SetCollapsedNodeBmp( rCollapsedNodeBmp ); + SetExpandedNodeBmp(GetDefaultExpandedNodeImage()); + SetCollapsedNodeBmp(GetDefaultCollapsedNodeImage()); SetTabs(); }
