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

[Caolán McNamara (via logerrit)]

 cui/source/customize/cfgutil.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dcad3c08b10ca6ef6ff01a43316d6dafcd0170b8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 12 15:29:43 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 12 21:13:13 2019 +0100

    theChild->getName() already available as uiName
    
    Change-Id: I2792b2ac4f0d17dfc2fe68eeacb4dee2173fe5d2
    Reviewed-on: https://gerrit.libreoffice.org/85068
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 51b41faf2e26..b464ff53f4e4 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -519,8 +519,8 @@ void CuiConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip
                 OUString uiName = theChild->getName();
                 if ( bIsRootNode )
                 {
-                    if (  ! (theChild->getName() == user  || theChild->getName() == share ||
-                             theChild->getName() == currentDocTitle ) )
+                    if (  ! (uiName == user  || uiName == share ||
+                             uiName == currentDocTitle ) )
                     {
                         bDisplay=false;
                     }
commit f2c6faa72c60f1438340173f5a6dc5533bce55ba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 12 15:28:08 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 12 21:12:45 2019 +0100

    children[n] already available as theChild
    
    Change-Id: I3eeb072ff393033fb681956b4ac7fe1c71745a0d
    Reviewed-on: https://gerrit.libreoffice.org/85067
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1d94255e73eb..51b41faf2e26 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -536,17 +536,17 @@ void CuiConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip
                         }
                     }
                 }
-                if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
+                if (theChild->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
                 {
 //                  We call acquire on the XBrowseNode so that it does not
 //                  get autodestructed and become invalid when accessed later.
                     theChild->acquire();
 
                     bool bChildOnDemand = false;
-                    if ( !bCheapChildrenOnDemand && children[n]->hasChildNodes() )
+                    if ( !bCheapChildrenOnDemand && theChild->hasChildNodes() )
                     {
                         Sequence< Reference< browse::XBrowseNode > > grandchildren =
-                            children[n]->getChildNodes();
+                            theChild->getChildNodes();
 
                         for ( sal_Int32 m = 0; m < grandchildren.getLength(); ++m )
                         {