[Libreoffice-commits] core.git: cui/source

[Jim Raykowski]

 cui/source/customize/CommandCategoryListBox.cxx |   13 ++-----------
 cui/source/customize/cfg.cxx                    |    3 +++
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit bf5739d70d2d4ae258592c3fd19ac18d8767c51a
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Sun Jan 21 21:44:38 2018 -0900

    tdf#115129 change customize function tree expand collapse behavior
    
    Change-Id: I6c20957fe3f95a8e63b30e5c733b99f71c193972
    Reviewed-on: https://gerrit.libreoffice.org/48290
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Muhammet Kara <muhammet.kara at pardus.org.tr>

diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index 1c93de9bd7cf..bc0d3d6c80b4 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -354,9 +354,7 @@ void CommandCategoryListBox::categorySelected(  const VclPtr<SfxConfigFunctionLi
                             continue;
                         }
 
-                        SvTreeListEntry* pMacroGroup = pFunctionListBox->InsertEntry(
-                                          sUIName,
-                                            Image( BitmapEx(RID_CUIBMP_EXPANDED) ), Image( BitmapEx(RID_CUIBMP_COLLAPSED) ) );
+                        SvTreeListEntry* pMacroGroup = pFunctionListBox->InsertEntry( sUIName );
                         m_aGroupInfo.push_back(
                             o3tl::make_unique<SfxGroupInfo_Impl>(
                                 SfxCfgKind::GROUP_SCRIPTCONTAINER, 0 ) );
@@ -393,9 +391,7 @@ void CommandCategoryListBox::categorySelected(  const VclPtr<SfxConfigFunctionLi
                     continue;
                 }
 
-                SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(
-                    pIt.sLabel, // Name of the style family
-                    Image( BitmapEx(RID_CUIBMP_EXPANDED) ), Image( BitmapEx(RID_CUIBMP_COLLAPSED) ) );
+                SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pIt.sLabel ); // Name of the style family
 
                 m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0 ) );
                 SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get();
@@ -488,11 +484,6 @@ void CommandCategoryListBox::addChildren(
             m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER,
                                                                          0, static_cast<void *>( child.get())));
             pNewEntry->SetUserData( m_aGroupInfo.back().get() );
-
-
-
-            pFunctionListBox->SetExpandedEntryBmp(pNewEntry, Image( BitmapEx(RID_CUIBMP_EXPANDED) ) );
-            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, Image( BitmapEx(RID_CUIBMP_COLLAPSED) ) );
             pNewEntry->EnableChildrenOnDemand();
 
             addChildren(pNewEntry, child, pFunctionListBox, filterTerm);
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5e4e6dffc7fb..2d41063947a6 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1177,6 +1177,9 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
     //      .ui file to get rid of the extra VCLContainer, and all these manual
     //      sizing and widget creation tricks.
     m_pFunctions->set_width_request(aSize.Width() * 1.45);
+    m_pFunctions->SetNodeDefaultImages();
+    m_pFunctions->SetStyle( m_pFunctions->GetStyle() | WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                            WB_HASLINES | WB_HASLINESATROOT | WB_CLIPCHILDREN | WB_HSCROLL );
 
     // Make the middle buttons bigger
     m_pAddCommandButton->set_height_request( m_pAddCommandButton->GetOptimalSize().Height() * 1.5 );