diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index ec91fff35831..c2a505c91a57 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -354,61 +354,17 @@
Specifies the installation location, locales and the available
factories for creating documents.
-
-
-
-
-
- AS/BEI
- Specifies the path to where the user data is installed. User
- data can only be installed in a valid directory.
-
-
-
-
-
-
-
-
-
- AS/BEI
- Specifies the user install path as a URL. The path must match
- the UCB configuration.
-
-
-
-
-
IS/BEI
Indicates if the user data is copied successfully.
false
-
-
-
-
-
- This list value was replaced by the Installedlanguages
- set.
- PB / IS
- Specifies the application languages that are installed, if a
- multilingual version is used.
-
-
JB / IS
@@ -416,21 +372,6 @@
multilingual version is used.
-
-
-
-
-
- This feature is controlled by an entry in the soffice.ini
- or the -nologo command line parameter.
- CD
- Specifies whether the splash screen is displayed during
- startup.
-
- true
-
@@ -445,24 +386,6 @@
-
-
- LO
- The xsd:datetime (YYYY-MM-DDTHH:MM:SS) on which the user has
- accepted the license. If the current installation has a license that
- is newer then this date, the license has to be accepted again.
-
-
-
-
- LO
- is set to true, when the FirstStartWizard has been
- completed
-
- false
-
@@ -587,23 +510,6 @@
-
-
- JB
- Contains settings that control configuration data access.
-
-
-
- This feature is not supported any more since
- OOo 2.0
- JB
- Deprecated
-
- true
-
-
Contains settings that control the migration process for certain
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");
diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx
index a3c0a8c56243..9233091bb3c0 100644
--- a/unotools/source/config/startoptions.cxx
+++ b/unotools/source/config/startoptions.cxx
@@ -32,16 +32,12 @@ using namespace ::rtl ;
using namespace ::osl ;
using namespace ::com::sun::star::uno ;
-#define DEFAULT_SHOWINTRO sal_True
-
#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office" ))
-#define PROPERTYNAME_SHOWINTRO OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupShowIntro" ))
#define PROPERTYNAME_CONNECTIONURL OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupConnectionURL" ))
-#define PROPERTYHANDLE_SHOWINTRO 0
-#define PROPERTYHANDLE_CONNECTIONURL 1
+#define PROPERTYHANDLE_CONNECTIONURL 0
-#define PROPERTYCOUNT 2
+#define PROPERTYCOUNT 1
class SvtStartOptions_Impl : public ConfigItem
{
@@ -120,7 +116,6 @@ class SvtStartOptions_Impl : public ConfigItem
private:
- sal_Bool m_bShowIntro ; /// cache "ShowIntro" of Start section
OUString m_sConnectionURL ; /// cache "Connection" of Start section
};
@@ -130,8 +125,6 @@ class SvtStartOptions_Impl : public ConfigItem
SvtStartOptions_Impl::SvtStartOptions_Impl()
// Init baseclasses first
: ConfigItem ( ROOTNODE_START )
- // Init member then.
- , m_bShowIntro ( DEFAULT_SHOWINTRO )
{
// Use our static list of configuration keys to get his values.
Sequence< OUString > seqNames = impl_GetPropertyNames();
@@ -152,12 +145,6 @@ SvtStartOptions_Impl::SvtStartOptions_Impl()
DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nInvalid property value for property detected!\n" );
switch( nProperty )
{
- case PROPERTYHANDLE_SHOWINTRO : {
- DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nWho has changed the value type of \"Office.Common\\Start\\ShowIntro\"?" );
- seqValues[nProperty] >>= m_bShowIntro;
- }
- break;
-
case PROPERTYHANDLE_CONNECTIONURL : {
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_STRING), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nWho has changed the value type of \"Office.Common\\Start\\Connection\"?" );
seqValues[nProperty] >>= m_sConnectionURL;
@@ -196,12 +183,6 @@ void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames
sal_Int32 nCount = seqPropertyNames.getLength();
for( sal_Int32 nProperty=0; nProperty>= m_bShowIntro;
- }
- else
if( seqPropertyNames[nProperty] == PROPERTYNAME_CONNECTIONURL )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_STRING), "SvtStartOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\Start\\Connection\"?" );
@@ -226,10 +207,6 @@ void SvtStartOptions_Impl::Commit()
{
switch( nProperty )
{
- case PROPERTYHANDLE_SHOWINTRO : {
- seqValues[nProperty] <<= m_bShowIntro;
- }
- break;
case PROPERTYHANDLE_CONNECTIONURL : {
seqValues[nProperty] <<= m_sConnectionURL;
}
@@ -256,7 +233,6 @@ Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames()
// Build list of configuration key names.
const OUString pProperties[] =
{
- PROPERTYNAME_SHOWINTRO ,
PROPERTYNAME_CONNECTIONURL ,
};
// Initialize return sequence with these list ...