Remove deprecated and unused entries from /org.openoffice.Setup

...but ooSetupInstCompleted is apparently not (yet) deprecated.

Change-Id: I21237f804266e1f119bcf51f957ff4f22a64e3b2

2 files changed, 1 insertions, 26 deletions

diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
index 4b824ef30bc4..45deb0a4a19d 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
@@ -48,14 +48,6 @@ public class _XLayerHandler extends MultiMethodTest {
                                   new Type(java.lang.String.class), false);
             oObj.setPropertyValue(new Boolean(false));
             oObj.endProperty();
-            oObj.overrideProperty("ooSetupShowIntro", (short) 0,
-                                  new Type(java.lang.String.class), false);
-            oObj.setPropertyValue(new Boolean(true));
-            oObj.endProperty();
-            oObj.overrideProperty("ooSetupLocales", (short) 0,
-                                  new Type(java.lang.String.class), false);
-            oObj.setPropertyValue("en-US");
-            oObj.endProperty();
             oObj.overrideNode("Factories", (short) 0, false);
             oObj.addOrReplaceNode("com.sun.star.chart.ChartDocument",
                                   (short) 0);
@@ -215,12 +207,6 @@ public class _XLayerHandler extends MultiMethodTest {
         expected += ("overrideProperty(ooSetupInstCompleted,0,Type[string],false);" + ls);
         expected += ("setPropertyValue(false);" + ls);
         expected += ("endProperty();" + ls);
-        expected += ("overrideProperty(ooSetupShowIntro,0,Type[string],false);" + ls);
-        expected += ("setPropertyValue(true);" + ls);
-        expected += ("endProperty();" + ls);
-        expected += ("overrideProperty(ooSetupLocales,0,Type[string],false);" + ls);
-        expected += ("setPropertyValue(en-US);" + ls);
-        expected += ("endProperty();" + ls);
         expected += ("overrideNode(Factories,0,false);" + ls);
         expected += ("addOrReplace(com.sun.star.chart.ChartDocument,0);" + ls);
         expected += ("overrideProperty(ooSetupFactoryEmptyDocumentURL,0,Type[string],false);" + ls);
@@ -254,4 +240,4 @@ public class _XLayerHandler extends MultiMethodTest {
 
         return expected;
     }
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
index c1e0f773b4c9..8f1daf4b5a39 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
@@ -43,16 +43,6 @@ public class _XUpdateHandler extends MultiMethodTest {
                                            false);
             xLayerHandler.setPropertyValue(new Boolean(false));
             xLayerHandler.endProperty();
-            xLayerHandler.overrideProperty("ooSetupShowIntro", (short) 0,
-                                           new Type(java.lang.String.class),
-                                           false);
-            xLayerHandler.setPropertyValue(new Boolean(true));
-            xLayerHandler.endProperty();
-            xLayerHandler.overrideProperty("ooSetupLocales", (short) 0,
-                                           new Type(java.lang.String.class),
-                                           false);
-            xLayerHandler.setPropertyValue("en-US");
-            xLayerHandler.endProperty();
             xLayerHandler.overrideNode("Factories", (short) 0, false);
             xLayerHandler.addOrReplaceNode("com.sun.star.chart.ChartDocument",
                                            (short) 0);
@@ -216,7 +206,6 @@ public class _XUpdateHandler extends MultiMethodTest {
             oObj.setPropertyValue("newValue");
             oObj.setPropertyValueForLocale("newValue-US", "de-DE");
             oObj.endProperty();
-            oObj.removeProperty("ooSetupShowIntro");
             oObj.modifyNode("org.openoffice.Setup", (short) 0, (short) 0, true);
             oObj.removeNode("whatever");
             oObj.resetProperty("prop");