diff options
Diffstat (limited to 'unotools/source/config/internaloptions.cxx')
| -rw-r--r-- | unotools/source/config/internaloptions.cxx | 292 |
1 files changed, 146 insertions, 146 deletions
diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx index d1501a612128..8ff1f4e4ba7a 100644 --- a/unotools/source/config/internaloptions.cxx +++ b/unotools/source/config/internaloptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,39 +43,39 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::std ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::std ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_INTERNAL OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal" )) -#define DEFAULT_SLOTCFG sal_False -#define DEFAULT_SENDCRASHMAIL sal_False +#define ROOTNODE_INTERNAL OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal" )) +#define DEFAULT_SLOTCFG sal_False +#define DEFAULT_SENDCRASHMAIL sal_False #define DEFAULT_USEMAILUI sal_True -#define DEFAULT_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("")) +#define DEFAULT_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("")) -#define FIXPROPERTYNAME_SLOTCFG OUString(RTL_CONSTASCII_USTRINGPARAM("Slot" )) -#define FIXPROPERTYNAME_SENDCRASHMAIL OUString(RTL_CONSTASCII_USTRINGPARAM("SendCrashMail" )) +#define FIXPROPERTYNAME_SLOTCFG OUString(RTL_CONSTASCII_USTRINGPARAM("Slot" )) +#define FIXPROPERTYNAME_SENDCRASHMAIL OUString(RTL_CONSTASCII_USTRINGPARAM("SendCrashMail" )) #define FIXPROPERTYNAME_USEMAILUI OUString(RTL_CONSTASCII_USTRINGPARAM("UseMailUI" )) -#define FIXPROPERTYNAME_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTempURL" )) +#define FIXPROPERTYNAME_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTempURL" )) //#define FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryClose")) //#define FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryBackToWebtop")) //#define FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryNewWebtop")) //#define FIXPROPERTYNAME_REMOVEMENUENTRYLOGOUT OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryLogout")) -#define FIXPROPERTYHANDLE_SLOTCFG 0 -#define FIXPROPERTYHANDLE_SENDCRASHMAIL 1 +#define FIXPROPERTYHANDLE_SLOTCFG 0 +#define FIXPROPERTYHANDLE_SENDCRASHMAIL 1 #define FIXPROPERTYHANDLE_USEMAILUI 2 -#define FIXPROPERTYHANDLE_CURRENTTEMPURL 3 +#define FIXPROPERTYHANDLE_CURRENTTEMPURL 3 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE 3 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP 4 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP 5 @@ -83,42 +83,42 @@ using namespace ::com::sun::star::beans ; #define FIXPROPERTYCOUNT 4 /* -#define PROPERTYNAME_RECOVERYLIST OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList" )) -#define PROPERTYNAME_URL OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL" )) -#define PROPERTYNAME_FILTER OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName" )) -#define PROPERTYNAME_TEMPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL" )) - -#define OFFSET_URL 0 -#define OFFSET_FILTER 1 -#define OFFSET_TEMPNAME 2 +#define PROPERTYNAME_RECOVERYLIST OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList" )) +#define PROPERTYNAME_URL OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL" )) +#define PROPERTYNAME_FILTER OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName" )) +#define PROPERTYNAME_TEMPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL" )) + +#define OFFSET_URL 0 +#define OFFSET_FILTER 1 +#define OFFSET_TEMPNAME 2 */ -#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) -#define FIXR OUString(RTL_CONSTASCII_USTRINGPARAM("r" )) +#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) +#define FIXR OUString(RTL_CONSTASCII_USTRINGPARAM("r" )) //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /* struct tIMPL_RecoveryEntry { - OUString sURL ; - OUString sFilter ; - OUString sTempName ; + OUString sURL ; + OUString sFilter ; + OUString sTempName ; tIMPL_RecoveryEntry() { - sURL = OUString(); - sFilter = OUString(); - sTempName = OUString(); + sURL = OUString(); + sFilter = OUString(); + sTempName = OUString(); } - tIMPL_RecoveryEntry( const OUString& sNewURL , - const OUString& sNewFilter , - const OUString& sNewTempName ) + tIMPL_RecoveryEntry( const OUString& sNewURL , + const OUString& sNewFilter , + const OUString& sNewTempName ) { - sURL = sNewURL ; - sFilter = sNewFilter ; - sTempName = sNewTempName ; + sURL = sNewURL ; + sFilter = sNewFilter ; + sTempName = sNewTempName ; } }; @@ -127,7 +127,7 @@ typedef deque< tIMPL_RecoveryEntry > tIMPL_RecoveryStack; class SvtInternalOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -137,39 +137,39 @@ class SvtInternalOptions_Impl : public ConfigItem sal_Bool m_bRemoveMenuEntryNewWebtop; sal_Bool m_bRemoveMenuEntryLogout; sal_Bool m_bSlotCFG ; /// cache "Slot" of Internal section - sal_Bool m_bSendCrashMail ; /// cache "SendCrashMail" of Internal section + sal_Bool m_bSendCrashMail ; /// cache "SendCrashMail" of Internal section sal_Bool m_bUseMailUI; - OUString m_aCurrentTempURL ; - // tIMPL_RecoveryStack m_aRecoveryList ; /// cache "RecoveryList" of Internal section + OUString m_aCurrentTempURL ; + // tIMPL_RecoveryStack m_aRecoveryList ; /// cache "RecoveryList" of Internal section //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtInternalOptions_Impl(); ~SvtInternalOptions_Impl(); //--------------------------------------------------------------------------------------------------------- - // overloaded methods of baseclass + // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short called for notify of configmanager - @descr These method is called from the ConfigManager before application ends or from the + @short called for notify of configmanager + @descr These method is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. You must update your internal values. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& ) @@ -178,35 +178,35 @@ class SvtInternalOptions_Impl : public ConfigItem } /*-****************************************************************************************************//** - @short write changes to configuration - @descr These method writes the changed values into the sub tree + @short write changes to configuration + @descr These method writes the changed values into the sub tree and should always called in our destructor to guarantee consistency of config data. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Commit(); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ sal_Bool IsRemoveMenuEntryClose() const { return m_bRemoveMenuEntryClose; } @@ -217,46 +217,46 @@ class SvtInternalOptions_Impl : public ConfigItem sal_Bool CrashMailEnabled () const { return m_bSendCrashMail; } sal_Bool MailUIEnabled () const { return m_bUseMailUI; } - OUString GetCurrentTempURL() const { return m_aCurrentTempURL; } - void SetCurrentTempURL( const OUString& aNewCurrentTempURL ); + OUString GetCurrentTempURL() const { return m_aCurrentTempURL; } + void SetCurrentTempURL( const OUString& aNewCurrentTempURL ); /* - void PushRecoveryItem ( const OUString& sURL , - const OUString& sFilter , - const OUString& sTempName ); - void PopRecoveryItem ( OUString& sURL , - OUString& sFilter , - OUString& sTempName ); - sal_Bool IsRecoveryListEmpty ( ) const; + void PushRecoveryItem ( const OUString& sURL , + const OUString& sFilter , + const OUString& sTempName ); + void PopRecoveryItem ( OUString& sURL , + OUString& sFilter , + OUString& sTempName ); + sal_Bool IsRecoveryListEmpty ( ) const; */ //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of fix key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of fix key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. We return well known key names only - because the "UserData" node is handled in a special way! - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ Sequence< OUString > impl_GetPropertyNames(); }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtInternalOptions_Impl::SvtInternalOptions_Impl() // Init baseclasses first @@ -266,24 +266,24 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() , 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_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!) - // "Slot" - // "SendCrashMail" - // "RecoveryList/r1/URL" - // "RecoveryList/r1/Filter" - // "RecoveryList/r1/TempName" - // "RecoveryList/r2/URL" - // "RecoveryList/r2/Filter" - // "RecoveryList/r2/TempName" - // "RecoveryList/.." - Sequence< OUString > seqNames = impl_GetPropertyNames() ; - Sequence< Any > seqValues = GetProperties( seqNames ) ; + // "Slot" + // "SendCrashMail" + // "RecoveryList/r1/URL" + // "RecoveryList/r1/Filter" + // "RecoveryList/r1/TempName" + // "RecoveryList/r2/URL" + // "RecoveryList/r2/Filter" + // "RecoveryList/r2/TempName" + // "RecoveryList/.." + Sequence< OUString > seqNames = impl_GetPropertyNames() ; + Sequence< Any > seqValues = GetProperties( seqNames ) ; // Safe impossible cases. // We need values from ALL configuration keys. @@ -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 ; + 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 ; + seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL ] >>= m_aCurrentTempURL ; // seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] >>= m_bRemoveMenuEntryClose ; // seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] >>= m_bRemoveMenuEntryBackToWebtop ; // seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] >>= m_bRemoveMenuEntryNewWebtop ; @@ -306,16 +306,16 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() // 3 subkeys for every item! // Attention: Start at next element after last fixed entry! We must ignore "Slot" and "SendCrashMail" ... tIMPL_RecoveryEntry aEntry; - sal_uInt32 nCount = seqValues.getLength() ; - sal_uInt32 nPosition = FIXPROPERTYCOUNT ; + sal_uInt32 nCount = seqValues.getLength() ; + sal_uInt32 nPosition = FIXPROPERTYCOUNT ; while( nPosition<nCount ) { - seqValues[nPosition] >>= aEntry.sURL ; + seqValues[nPosition] >>= aEntry.sURL ; ++nPosition; - seqValues[nPosition] >>= aEntry.sFilter ; + seqValues[nPosition] >>= aEntry.sFilter ; ++nPosition; - seqValues[nPosition] >>= aEntry.sTempName ; + seqValues[nPosition] >>= aEntry.sTempName ; ++nPosition; m_aRecoveryList.push_front( aEntry ); } @@ -326,7 +326,7 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtInternalOptions_Impl::~SvtInternalOptions_Impl() { @@ -337,7 +337,7 @@ SvtInternalOptions_Impl::~SvtInternalOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtInternalOptions_Impl::Commit() { @@ -356,9 +356,9 @@ void SvtInternalOptions_Impl::Commit() // Write set of dynamic properties then. ClearNodeSet( PROPERTYNAME_RECOVERYLIST ); - tIMPL_RecoveryEntry aItem ; - OUString sNode ; - Sequence< PropertyValue > seqPropertyValues( 3 ) ; // Every node in set has 3 sub-nodes!( url, filter, tempname ) + tIMPL_RecoveryEntry aItem ; + OUString sNode ; + Sequence< PropertyValue > seqPropertyValues( 3 ) ; // Every node in set has 3 sub-nodes!( url, filter, tempname ) // Copy list entries to save-list and write it to configuration. @@ -368,12 +368,12 @@ void SvtInternalOptions_Impl::Commit() aItem = m_aRecoveryList.top(); m_aRecoveryList.pop(); sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER; - seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; - seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; - seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; - seqPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ; - seqPropertyValues[OFFSET_FILTER ].Value <<= aItem.sFilter ; - seqPropertyValues[OFFSET_TEMPNAME ].Value <<= aItem.sTempName ; + seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; + seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; + seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; + seqPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ; + seqPropertyValues[OFFSET_FILTER ].Value <<= aItem.sFilter ; + seqPropertyValues[OFFSET_TEMPNAME ].Value <<= aItem.sTempName ; SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues ); } @@ -384,12 +384,12 @@ void SvtInternalOptions_Impl::Commit() aItem = *iRecovery; sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER; - seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; - seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; - seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; - seqPropertyValues[OFFSET_URL ].Value <<= iRecovery->sURL ; - seqPropertyValues[OFFSET_FILTER ].Value <<= iRecovery->sFilter ; - seqPropertyValues[OFFSET_TEMPNAME ].Value <<= iRecovery->sTempName ; + seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; + seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; + seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; + seqPropertyValues[OFFSET_URL ].Value <<= iRecovery->sURL ; + seqPropertyValues[OFFSET_FILTER ].Value <<= iRecovery->sFilter ; + seqPropertyValues[OFFSET_TEMPNAME ].Value <<= iRecovery->sTempName ; SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues ); } @@ -397,7 +397,7 @@ void SvtInternalOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTempURL ) { @@ -407,7 +407,7 @@ void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTemp } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() { @@ -423,9 +423,9 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() // Add names of fix properties to list. seqProperties[FIXPROPERTYHANDLE_SLOTCFG ] = FIXPROPERTYNAME_SLOTCFG ; - seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL ] = FIXPROPERTYNAME_SENDCRASHMAIL ; + seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL ] = FIXPROPERTYNAME_SENDCRASHMAIL ; seqProperties[FIXPROPERTYHANDLE_USEMAILUI ] = FIXPROPERTYNAME_USEMAILUI ; - seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL ] = FIXPROPERTYNAME_CURRENTTEMPURL ; + seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL ] = FIXPROPERTYNAME_CURRENTTEMPURL ; // seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] = FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE; // seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] = FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP; // seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] = FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP; @@ -437,11 +437,11 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() // nPosition is the start point of an list item, nItem an index into right list of node names! for( sal_Int32 nItem=0; nItem<nRecoveryCount; ++nItem ) { - seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL ; + seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL ; ++nPosition; - seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER ; + seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER ; ++nPosition; - seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME ; + seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME ; ++nPosition; } */ @@ -450,15 +450,15 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// initialize static member -// DON'T DO IT IN YOUR HEADER! -// see definition for further informations +// initialize static member +// DON'T DO IT IN YOUR HEADER! +// see definition for further informations //***************************************************************************************************************** -SvtInternalOptions_Impl* SvtInternalOptions::m_pDataContainer = NULL ; -sal_Int32 SvtInternalOptions::m_nRefCount = 0 ; +SvtInternalOptions_Impl* SvtInternalOptions::m_pDataContainer = NULL ; +sal_Int32 SvtInternalOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtInternalOptions::SvtInternalOptions() { @@ -477,7 +477,7 @@ SvtInternalOptions::SvtInternalOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtInternalOptions::~SvtInternalOptions() { @@ -495,7 +495,7 @@ SvtInternalOptions::~SvtInternalOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions::SlotCFGEnabled() const { @@ -504,7 +504,7 @@ sal_Bool SvtInternalOptions::SlotCFGEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions::CrashMailEnabled() const { @@ -513,7 +513,7 @@ sal_Bool SvtInternalOptions::CrashMailEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions::MailUIEnabled() const { @@ -561,7 +561,7 @@ void SvtInternalOptions::SetCurrentTempURL( const OUString& aNewCurrentTempURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtInternalOptions::GetOwnStaticMutex() { |