Skip to content

C
core
Kaydet (Commit) a83c6301 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

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

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

Change-Id: I21237f804266e1f119bcf51f957ff4f22a64e3b2
üst 0b58adfe
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 145 deletions
officecfg/registry/schema/org/openoffice/Setup.xcs
Dosyayı görüntüle @ a83c6301
...@@ -354,61 +354,17 @@ ...@@ -354,61 +354,17 @@
<desc>Specifies the installation location, locales and the available <desc>Specifies the installation location, locales and the available
factories for creating documents.</desc> factories for creating documents.</desc>
</info> </info>
<prop
oor:name="ooSetupInstallPath" oor:type="xs:string"
oor:nillable="false">
<!-- OldPath: Service User/[username] -->
<!-- OldLocation: userdb.ini -->
<info>
<deprecated/>
<author>AS/BEI</author>
<desc>Specifies the path to where the user data is installed. User
data can only be installed in a valid directory.</desc>
</info>
<value/>
<!-- JB: Empty default inserted into empty property node. Remove if NIL
was intended -->
</prop>
<prop
oor:name="ooSetupInstallURL" oor:type="xs:string"
oor:nillable="false">
<!-- OldPath: Service User/[username] -->
<!-- OldLocation: userdb.ini -->
<info>
<deprecated/>
<author>AS/BEI</author>
<desc>Specifies the user install path as a URL. The path must match
the UCB configuration.</desc>
</info>
<value/>
<!-- JB: Empty default inserted into empty property node. Remove if NIL
was intended -->
</prop>
<prop <prop
oor:name="ooSetupInstCompleted" oor:type="xs:boolean" oor:name="ooSetupInstCompleted" oor:type="xs:boolean"
oor:nillable="false"> oor:nillable="false">
<!-- OldPath: Service User/[username] --> <!-- OldPath: Service User/[username] -->
<!-- OldLocation: userdb.ini --> <!-- OldLocation: userdb.ini -->
<info> <info>
<deprecated/>
<author>IS/BEI</author> <author>IS/BEI</author>
<desc>Indicates if the user data is copied successfully.</desc> <desc>Indicates if the user data is copied successfully.</desc>
</info> </info>
<value>false</value> <value>false</value>
</prop> </prop>
<prop oor:name="ooSetupLocales" oor:type="oor:string-list">
<!-- OldLocation: setup.inf-->
<!-- UIHints: setup -->
<!--The default list must be deleted, as soon as the setup writes the
values (#79254).-->
<info>
<deprecated>This list value was replaced by the Installedlanguages
set.</deprecated>
<author>PB / IS</author>
<desc>Specifies the application languages that are installed, if a
multilingual version is used.</desc>
</info>
</prop>
<set oor:name="InstalledLocales" oor:node-type="InstalledLocale"> <set oor:name="InstalledLocales" oor:node-type="InstalledLocale">
<info> <info>
<author>JB / IS</author> <author>JB / IS</author>
...@@ -416,21 +372,6 @@ ...@@ -416,21 +372,6 @@
multilingual version is used.</desc> multilingual version is used.</desc>
</info> </info>
</set> </set>
<prop
oor:name="ooSetupShowIntro" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: Common/Show-Intro -->
<!-- OldLocation: soffice.ini -->
<!-- UIHints: Tools - Options - General - View -->
<info>
<deprecated>This feature is controlled by an entry in the soffice.ini
or the -nologo command line parameter.</deprecated>
<author>CD</author>
<desc>Specifies whether the splash screen is displayed during
startup.</desc>
</info>
<value>true</value>
</prop>
<prop <prop
oor:name="ooSetupConnectionURL" oor:type="xs:string" oor:name="ooSetupConnectionURL" oor:type="xs:string"
oor:nillable="false"> oor:nillable="false">
...@@ -445,24 +386,6 @@ ...@@ -445,24 +386,6 @@
<!-- JB: Empty default inserted into empty property node. Remove if NIL <!-- JB: Empty default inserted into empty property node. Remove if NIL
was intended --> was intended -->
</prop> </prop>
<prop oor:name="LicenseAcceptDate" oor:type="xs:string">
<info>
<author>LO</author>
<desc>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.</desc>
</info>
</prop>
<prop
oor:name="FirstStartWizardCompleted" oor:type="xs:boolean"
oor:nillable="false">
<info>
<author>LO</author>
<desc>is set to true, when the FirstStartWizard has been
completed</desc>
</info>
<value>false</value>
</prop>
<prop <prop
oor:name="MigrationCompleted" oor:type="xs:boolean" oor:name="MigrationCompleted" oor:type="xs:boolean"
oor:nillable="false"> oor:nillable="false">
...@@ -587,23 +510,6 @@ ...@@ -587,23 +510,6 @@
<value/> <value/>
</prop> </prop>
</group> </group>
<group oor:name="Configuration">
<info>
<author>JB</author>
<desc>Contains settings that control configuration data access.</desc>
</info>
<prop
oor:name="TransferUserSettingsOnce" oor:type="xs:boolean"
oor:nillable="false">
<info>
<deprecated>This feature is not supported any more since
OOo 2.0</deprecated>
<author>JB</author>
<desc>Deprecated</desc>
</info>
<value>true</value>
</prop>
</group>
<group oor:name="Migration"> <group oor:name="Migration">
<info> <info>
<desc>Contains settings that control the migration process for certain <desc>Contains settings that control the migration process for certain
......
qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
Dosyayı görüntüle @ a83c6301
...@@ -48,14 +48,6 @@ public class _XLayerHandler extends MultiMethodTest { ...@@ -48,14 +48,6 @@ public class _XLayerHandler extends MultiMethodTest {
new Type(java.lang.String.class), false); new Type(java.lang.String.class), false);
oObj.setPropertyValue(new Boolean(false)); oObj.setPropertyValue(new Boolean(false));
oObj.endProperty(); 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.overrideNode("Factories", (short) 0, false);
oObj.addOrReplaceNode("com.sun.star.chart.ChartDocument", oObj.addOrReplaceNode("com.sun.star.chart.ChartDocument",
(short) 0); (short) 0);
...@@ -215,12 +207,6 @@ public class _XLayerHandler extends MultiMethodTest { ...@@ -215,12 +207,6 @@ public class _XLayerHandler extends MultiMethodTest {
expected += ("overrideProperty(ooSetupInstCompleted,0,Type[string],false);" + ls); expected += ("overrideProperty(ooSetupInstCompleted,0,Type[string],false);" + ls);
expected += ("setPropertyValue(false);" + ls); expected += ("setPropertyValue(false);" + ls);
expected += ("endProperty();" + 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 += ("overrideNode(Factories,0,false);" + ls);
expected += ("addOrReplace(com.sun.star.chart.ChartDocument,0);" + ls); expected += ("addOrReplace(com.sun.star.chart.ChartDocument,0);" + ls);
expected += ("overrideProperty(ooSetupFactoryEmptyDocumentURL,0,Type[string],false);" + ls); expected += ("overrideProperty(ooSetupFactoryEmptyDocumentURL,0,Type[string],false);" + ls);
......
qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
Dosyayı görüntüle @ a83c6301
...@@ -43,16 +43,6 @@ public class _XUpdateHandler extends MultiMethodTest { ...@@ -43,16 +43,6 @@ public class _XUpdateHandler extends MultiMethodTest {
false); false);
xLayerHandler.setPropertyValue(new Boolean(false)); xLayerHandler.setPropertyValue(new Boolean(false));
xLayerHandler.endProperty(); 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.overrideNode("Factories", (short) 0, false);
xLayerHandler.addOrReplaceNode("com.sun.star.chart.ChartDocument", xLayerHandler.addOrReplaceNode("com.sun.star.chart.ChartDocument",
(short) 0); (short) 0);
...@@ -216,7 +206,6 @@ public class _XUpdateHandler extends MultiMethodTest { ...@@ -216,7 +206,6 @@ public class _XUpdateHandler extends MultiMethodTest {
oObj.setPropertyValue("newValue"); oObj.setPropertyValue("newValue");
oObj.setPropertyValueForLocale("newValue-US", "de-DE"); oObj.setPropertyValueForLocale("newValue-US", "de-DE");
oObj.endProperty(); oObj.endProperty();
oObj.removeProperty("ooSetupShowIntro");
oObj.modifyNode("org.openoffice.Setup", (short) 0, (short) 0, true); oObj.modifyNode("org.openoffice.Setup", (short) 0, (short) 0, true);
oObj.removeNode("whatever"); oObj.removeNode("whatever");
oObj.resetProperty("prop"); oObj.resetProperty("prop");
......
unotools/source/config/startoptions.cxx
Dosyayı görüntüle @ a83c6301
...@@ -32,16 +32,12 @@ using namespace ::rtl ; ...@@ -32,16 +32,12 @@ using namespace ::rtl ;
using namespace ::osl ; using namespace ::osl ;
using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::uno ;
#define DEFAULT_SHOWINTRO sal_True
#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office" )) #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 PROPERTYNAME_CONNECTIONURL OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupConnectionURL" ))
#define PROPERTYHANDLE_SHOWINTRO 0 #define PROPERTYHANDLE_CONNECTIONURL 0
#define PROPERTYHANDLE_CONNECTIONURL 1
#define PROPERTYCOUNT 2 #define PROPERTYCOUNT 1
class SvtStartOptions_Impl : public ConfigItem class SvtStartOptions_Impl : public ConfigItem
{ {
...@@ -120,7 +116,6 @@ class SvtStartOptions_Impl : public ConfigItem ...@@ -120,7 +116,6 @@ class SvtStartOptions_Impl : public ConfigItem
private: private:
sal_Bool m_bShowIntro ; /// cache "ShowIntro" of Start section
OUString m_sConnectionURL ; /// cache "Connection" of Start section OUString m_sConnectionURL ; /// cache "Connection" of Start section
}; };
...@@ -130,8 +125,6 @@ class SvtStartOptions_Impl : public ConfigItem ...@@ -130,8 +125,6 @@ class SvtStartOptions_Impl : public ConfigItem
SvtStartOptions_Impl::SvtStartOptions_Impl() SvtStartOptions_Impl::SvtStartOptions_Impl()
// Init baseclasses first // Init baseclasses first
: ConfigItem ( ROOTNODE_START ) : ConfigItem ( ROOTNODE_START )
// Init member then.
, m_bShowIntro ( DEFAULT_SHOWINTRO )
{ {
// Use our static list of configuration keys to get his values. // Use our static list of configuration keys to get his values.
Sequence< OUString > seqNames = impl_GetPropertyNames(); Sequence< OUString > seqNames = impl_GetPropertyNames();
...@@ -152,12 +145,6 @@ SvtStartOptions_Impl::SvtStartOptions_Impl() ...@@ -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" ); DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nInvalid property value for property detected!\n" );
switch( nProperty ) 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 : { 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\"?" ); 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; seqValues[nProperty] >>= m_sConnectionURL;
...@@ -196,12 +183,6 @@ void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ...@@ -196,12 +183,6 @@ void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames
sal_Int32 nCount = seqPropertyNames.getLength(); sal_Int32 nCount = seqPropertyNames.getLength();
for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
{ {
if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWINTRO )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtStartOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\Start\\ShowIntro\"?" );
seqValues[nProperty] >>= m_bShowIntro;
}
else
if( seqPropertyNames[nProperty] == PROPERTYNAME_CONNECTIONURL ) 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\"?" ); 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() ...@@ -226,10 +207,6 @@ void SvtStartOptions_Impl::Commit()
{ {
switch( nProperty ) switch( nProperty )
{ {
case PROPERTYHANDLE_SHOWINTRO : {
seqValues[nProperty] <<= m_bShowIntro;
}
break;
case PROPERTYHANDLE_CONNECTIONURL : { case PROPERTYHANDLE_CONNECTIONURL : {
seqValues[nProperty] <<= m_sConnectionURL; seqValues[nProperty] <<= m_sConnectionURL;
} }
...@@ -256,7 +233,6 @@ Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames() ...@@ -256,7 +233,6 @@ Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames()
// Build list of configuration key names. // Build list of configuration key names.
const OUString pProperties[] = const OUString pProperties[] =
{ {
PROPERTYNAME_SHOWINTRO ,
PROPERTYNAME_CONNECTIONURL , PROPERTYNAME_CONNECTIONURL ,
}; };
// Initialize return sequence with these list ... // Initialize return sequence with these list ...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment