summaryrefslogtreecommitdiff
path: root/unotools/source/config/internaloptions.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-13 13:20:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-13 13:20:49 +0100
commitb40c288be44d3eec41d30ac445a1e6b6e9a17777 (patch)
treee4414d6f023909928e3ad8c6c640dd83f557d1c1 /unotools/source/config/internaloptions.cxx
parent47123eb0a5123eb6bec1f235543ee46bfe0a6518 (diff)
only want to know if the type changes
Diffstat (limited to 'unotools/source/config/internaloptions.cxx')
-rw-r--r--unotools/source/config/internaloptions.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx
index f95b4d7ea85a..60601f9dea3e 100644
--- a/unotools/source/config/internaloptions.cxx
+++ b/unotools/source/config/internaloptions.cxx
@@ -262,14 +262,14 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
// Init baseclasses first
: ConfigItem ( ROOTNODE_INTERNAL, CONFIG_MODE_IMMEDIATE_UPDATE )
// Init member then.
- , m_bRemoveMenuEntryClose ( sal_False )
- , m_bRemoveMenuEntryBackToWebtop ( sal_False )
- , m_bRemoveMenuEntryNewWebtop ( sal_False )
- , m_bRemoveMenuEntryLogout ( sal_False )
- , m_bSlotCFG ( DEFAULT_SLOTCFG )
- , m_bSendCrashMail ( DEFAULT_SENDCRASHMAIL )
- , m_bUseMailUI ( DEFAULT_USEMAILUI )
- , m_aCurrentTempURL ( DEFAULT_CURRENTTEMPURL )
+ , m_bRemoveMenuEntryClose(sal_False)
+ , m_bRemoveMenuEntryBackToWebtop(sal_False)
+ , m_bRemoveMenuEntryNewWebtop(sal_False)
+ , m_bRemoveMenuEntryLogout(sal_False)
+ , m_bSlotCFG(DEFAULT_SLOTCFG)
+ , m_bSendCrashMail(DEFAULT_SENDCRASHMAIL)
+ , m_bUseMailUI(DEFAULT_USEMAILUI)
+ , m_aCurrentTempURL(DEFAULT_CURRENTTEMPURL)
{
// Use our list of configuration keys to get his values.
// structure of internal section: (first 2 entries are fixed - all other are member of a set!)
@@ -291,12 +291,12 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl()
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nI miss some values of configuration keys!\n" );
// Read fixed values first!
- DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\Slot\"?" );
- DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\SendCrashMail\"?" );
- seqValues[FIXPROPERTYHANDLE_SLOTCFG ] >>= m_bSlotCFG ;
- seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL ] >>= m_bSendCrashMail ;
- seqValues[FIXPROPERTYHANDLE_USEMAILUI ] >>= m_bUseMailUI ;
- seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL ] >>= m_aCurrentTempURL ;
+ DBG_ASSERT(!seqValues[FIXPROPERTYHANDLE_SLOTCFG].hasValue() || (seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass() == TypeClass_BOOLEAN), "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\Slot\"?");
+ DBG_ASSERT(!seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].hasValue() || !(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\SendCrashMail\"?");
+ seqValues[FIXPROPERTYHANDLE_SLOTCFG] >>= m_bSlotCFG;
+ seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL] >>= m_bSendCrashMail;
+ seqValues[FIXPROPERTYHANDLE_USEMAILUI] >>= m_bUseMailUI;
+ seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL] >>= m_aCurrentTempURL;
}
//*****************************************************************************************************************