summaryrefslogtreecommitdiff
path: root/unotools/source/config/startoptions.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-30 08:52:25 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-30 08:54:55 +0100
commita83c6301d856d7f63ef3c9a9b372220da58e5ffb (patch)
treea7a7b5d94ae6f9a57b06e4ed35868ae69fee6df1 /unotools/source/config/startoptions.cxx
parent0b58adfe5293d5a072a3e770a58355ffb55aa596 (diff)
Remove deprecated and unused entries from /org.openoffice.Setup
...but ooSetupInstCompleted is apparently not (yet) deprecated. Change-Id: I21237f804266e1f119bcf51f957ff4f22a64e3b2
Diffstat (limited to 'unotools/source/config/startoptions.cxx')
-rw-r--r--unotools/source/config/startoptions.cxx28
1 files changed, 2 insertions, 26 deletions
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<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 )
{
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 ...