[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source

Efe Gürkan YALAMAN efeyalaman at gmail.com
Wed Jul 31 12:02:58 PDT 2013


 cui/source/options/optaboutconfig.cxx |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 48ad992534d2995a39fc122c6511f75b8dc688d1
Author: Efe Gürkan YALAMAN <efeyalaman at gmail.com>
Date:   Wed Jul 31 22:01:07 2013 +0300

    Hardcoded 3 toplevel configuration names for merging to master
    
    Change-Id: Ic4271291f6f0adc66a69f5d9cd1b10c3393503cd

diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 7f890a1..71a04d1 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -95,9 +95,21 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
    m_pDefaultBtn->Enable(sal_False);
    m_pEditBtn->Enable(sal_False);
 
-   Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath, sal_False );
+   OUString array[ 3 ] = {
+           "/org.openoffice.Office.Common",
+           "/org.openoffice.Office.Math",
+           "/org.openoffice.Office.Addons" };
 
-   FillItems( xConfigAccess, sRootNodePath );
+    for (sal_Int16 nInd = 0; nInd < 3 ; ++nInd )
+    {
+        sRootNodePath = array[nInd];
+        Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath, sal_False );
+        FillItems( xConfigAccess, sRootNodePath );
+    }
+
+   //Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath, sal_False );
+
+   //FillItems( xConfigAccess, sRootNodePath );
 }
 
 void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUString sPath)


More information about the Libreoffice-commits mailing list