merged in re/DEV300_next towards DEV300_m74

4 files changed, 6 insertions, 25 deletions

diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java
index 076c8633c1c4..103fdc5848a2 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.java
+++ b/wizards/com/sun/star/wizards/common/Configuration.java
@@ -365,12 +365,6 @@ public abstract class Configuration
         }
     }
 
-    public static XNameAccess getChildNodebyIndex(Object _oNode, int _index)
-    {
-        XNameAccess xNameAccessNode = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, _oNode);
-        return getChildNodebyIndex(xNameAccessNode, _index);
-    }
-
     public static XNameAccess getChildNodebyIndex(XNameAccess _xNameAccess, int _index)
     {
         try
diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java
index c39bf5a65f4c..ea74b33f09ad 100644
--- a/wizards/com/sun/star/wizards/table/CGCategory.java
+++ b/wizards/com/sun/star/wizards/table/CGCategory.java
@@ -56,12 +56,14 @@ public class CGCategory
         xMSF = _xMSF;
     }
 
-    public void initialize(int _index)
+    public void initialize(String category)
     {
         try
         {
             oconfigView = Configuration.getConfigurationRoot(xMSF, CGROOTPATH, false);  //business/Tables
-            xNameAccessCurBusinessNode = Configuration.getChildNodebyIndex(oconfigView, _index);
+            xNameAccessCurBusinessNode = Configuration.getChildNodebyName(
+                UnoRuntime.queryInterface(XNameAccess.class, oconfigView),
+                category);
         }
         catch (Exception e)
         {
diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java
index ff7be38e9193..d26e58783aba 100644
--- a/wizards/com/sun/star/wizards/table/FieldDescription.java
+++ b/wizards/com/sun/star/wizards/table/FieldDescription.java
@@ -39,8 +39,6 @@ import com.sun.star.wizards.common.Properties;
 
 public class FieldDescription
 {
-
-    int category;
     private String tablename = "";
 //  String fieldname;
     private String keyname;
@@ -60,7 +58,6 @@ public class FieldDescription
     {
         xMSF = _xMSF;
         aLocale = _aLocale;
-        category = _curscenarioselector.getCategory();
         tablename = _curscenarioselector.getTableName();
         Name = _fieldname;
         keyname = _keyname;
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index d603ad18793e..4f985c18e055 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -165,19 +165,6 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
         initializeCategory(BUSINESS);
     }
 
-    public int getCategory()
-    {
-        if (optBusiness.getState())
-        {
-            curcategory = BUSINESS;
-        }
-        else
-        {
-            curcategory = PRIVATE;
-        }
-        return curcategory;
-    }
-
     public void selectCategory()
     {
         if (optBusiness.getState())
@@ -194,7 +181,8 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
     {
         try
         {
-            oCGCategory.initialize(_iCategory);
+            oCGCategory.initialize(
+                _iCategory == PRIVATE ? "private" : "business");
             xTableListBox.removeItems((short) 0, xTableListBox.getItemCount());
             xTableListBox.addItems(oCGCategory.getTableNames(), (short) _iCategory);
             initializeTable(0);