diff options
Diffstat (limited to 'unotools/source/config')
| -rw-r--r-- | unotools/source/config/cmdoptions.cxx | 68 | ||||
| -rw-r--r-- | unotools/source/config/compatibility.cxx | 78 | ||||
| -rw-r--r-- | unotools/source/config/confignode.cxx | 16 | ||||
| -rw-r--r-- | unotools/source/config/configvaluecontainer.cxx | 26 | ||||
| -rw-r--r-- | unotools/source/config/dynamicmenuoptions.cxx | 70 | ||||
| -rw-r--r-- | unotools/source/config/eventcfg.cxx | 16 | ||||
| -rw-r--r-- | unotools/source/config/extendedsecurityoptions.cxx | 56 | ||||
| -rw-r--r-- | unotools/source/config/fontcfg.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/fontoptions.cxx | 76 | ||||
| -rw-r--r-- | unotools/source/config/historyoptions.cxx | 62 | ||||
| -rw-r--r-- | unotools/source/config/itemholder1.hxx | 10 | ||||
| -rw-r--r-- | unotools/source/config/lingucfg.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/localisationoptions.cxx | 56 | ||||
| -rw-r--r-- | unotools/source/config/moduleoptions.cxx | 88 | ||||
| -rw-r--r-- | unotools/source/config/printwarningoptions.cxx | 56 | ||||
| -rw-r--r-- | unotools/source/config/securityoptions.cxx | 26 | ||||
| -rw-r--r-- | unotools/source/config/syslocaleoptions.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/viewoptions.cxx | 100 |
18 files changed, 407 insertions, 407 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index f9e2df578b60..e02b0f315938 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -121,7 +121,7 @@ class SvtCommandOptions_Impl : public ConfigItem SvtCommandOptions_Impl(); ~SvtCommandOptions_Impl(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -137,7 +137,7 @@ class SvtCommandOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& lPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -152,7 +152,7 @@ class SvtCommandOptions_Impl : public ConfigItem virtual void Commit(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! @descr These class is used as static member of "SvtDynamicMenuOptions" ... => The code exist only for one time and isn't duplicated for every instance! @@ -171,7 +171,7 @@ class SvtCommandOptions_Impl : public ConfigItem private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of key names of our configuration management which represent oue module tree @descr These methods return the current list of key names! We need it to get needed values from our configuration management and support dynamical menu item lists! @@ -191,9 +191,9 @@ class SvtCommandOptions_Impl : public ConfigItem SvtFrameVector m_lFrames; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtCommandOptions_Impl::SvtCommandOptions_Impl() // Init baseclasses first : ConfigItem( ROOTNODE_CMDOPTIONS ) @@ -230,9 +230,9 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() EnableNotification( aNotifySeq, true ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtCommandOptions_Impl::~SvtCommandOptions_Impl() { // We must save our current values .. if user forget it! @@ -242,9 +242,9 @@ SvtCommandOptions_Impl::~SvtCommandOptions_Impl() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) { MutexGuard aGuard( SvtCommandOptions::GetOwnStaticMutex() ); @@ -284,17 +284,17 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCommandOptions_Impl::Commit() { OSL_FAIL( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const { if ( eOption == SvtCommandOptions::CMDOPTION_DISABLED ) @@ -303,9 +303,9 @@ bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) return false; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const { switch( eCmdOption ) @@ -321,9 +321,9 @@ bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, co return false; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) { // check if frame already exists inside list @@ -335,9 +335,9 @@ void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno:: m_lFrames.push_back(xWeak); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() { // First get ALL names of current existing list items in configuration! @@ -363,17 +363,17 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() return lDisabledItems; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtCommandOptions_Impl* SvtCommandOptions::m_pDataContainer = NULL ; sal_Int32 SvtCommandOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtCommandOptions::SvtCommandOptions() { // Global access, must be guarded (multithreading!). @@ -388,9 +388,9 @@ SvtCommandOptions::SvtCommandOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtCommandOptions::~SvtCommandOptions() { // Global access, must be guarded (multithreading!) @@ -406,27 +406,27 @@ SvtCommandOptions::~SvtCommandOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtCommandOptions::HasEntries( CmdOption eOption ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->HasEntries( eOption ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->Lookup( eCmdOption, aCommandURL ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -438,9 +438,9 @@ namespace class theCommandOptionsMutex : public rtl::Static<osl::Mutex, theCommandOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtCommandOptions::GetOwnStaticMutex() { return theCommandOptionsMutex::get(); diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 1c6b49efddae..c56b579e611f 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -31,9 +31,9 @@ #include <algorithm> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::std; using namespace ::utl; @@ -76,9 +76,9 @@ using namespace ::com::sun::star::beans; #define OFFSET_CONSIDERWRAPPINGSTYLE 11 #define OFFSET_EXPANDWORDSPACE 12 -//_________________________________________________________________________________________________________________ + // private declarations! -//_________________________________________________________________________________________________________________ + /*-**************************************************************************************************************** @descr struct to hold information about one compatibility entry @@ -233,7 +233,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem // overloaded methods of baseclass - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -249,7 +249,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& lPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -268,7 +268,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem // public interface - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short base implementation of public interface for "SvtCompatibilityOptions"! @descr These class is used as static member of "SvtCompatibilityOptions" ... => The code exist only for one time and isn't duplicated for every instance! @@ -315,7 +315,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of key names of our configuration management which represent one module tree @descr These methods return the current list of key names! We need it to get needed values from our configuration management and support dynamical menu item lists! @@ -330,7 +330,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem Sequence< OUString > impl_GetPropertyNames( Sequence< OUString >& rItems ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short expand the list for all well known properties to destination @descr - @attention - @@ -357,9 +357,9 @@ class SvtCompatibilityOptions_Impl : public ConfigItem SvtCompatibilityEntry m_aDefOptions; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() // Init baseclasses first : ConfigItem( ROOTNODE_OPTIONS ) @@ -414,9 +414,9 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl() { // We must save our current values .. if user forget it! @@ -452,17 +452,17 @@ void SvtCompatibilityOptions_Impl::SetDefault( OUString sName, bool bValue ) m_aDefOptions.SetExpandWordSpace( bValue ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& ) { DBG_ASSERT( false, "SvtCompatibilityOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCompatibilityOptions_Impl::Commit() { // Write all properties! @@ -509,18 +509,18 @@ void SvtCompatibilityOptions_Impl::Commit() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCompatibilityOptions_Impl::Clear() { m_aOptions.Clear(); SetModified(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() const { Sequence< Sequence< PropertyValue > > lReturn; @@ -528,9 +528,9 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() co return lReturn; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName, const OUString& _sModule, @@ -567,9 +567,9 @@ void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName, SetModified(); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequence< OUString >& rItems ) { // First get ALL names of current existing list items in configuration! @@ -581,9 +581,9 @@ Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen return lProperties; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( const Sequence< OUString >& lSource, Sequence< OUString >& lDestination ) { @@ -637,17 +637,17 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( } } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtCompatibilityOptions_Impl* SvtCompatibilityOptions::m_pDataContainer = NULL; sal_Int32 SvtCompatibilityOptions::m_nRefCount = 0; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtCompatibilityOptions::SvtCompatibilityOptions() { // Global access, must be guarded (multithreading!). @@ -662,9 +662,9 @@ SvtCompatibilityOptions::SvtCompatibilityOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtCompatibilityOptions::~SvtCompatibilityOptions() { // Global access, must be guarded (multithreading!) @@ -680,9 +680,9 @@ SvtCompatibilityOptions::~SvtCompatibilityOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCompatibilityOptions::Clear() { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -694,9 +694,9 @@ void SvtCompatibilityOptions::SetDefault( OUString sName, bool bValue ) m_pDataContainer->SetDefault( sName, bValue ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtCompatibilityOptions::AppendItem( const OUString& sName, const OUString& sModule, bool bUsePrtMetrics, @@ -796,9 +796,9 @@ namespace class theCompatibilityOptionsMutex : public rtl::Static<osl::Mutex, theCompatibilityOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtCompatibilityOptions::GetOwnStaticMutex() { return theCompatibilityOptionsMutex::get(); diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 9032043ea408..a3c3f5061141 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -36,10 +36,10 @@ #include <rtl/strbuf.hxx> #endif -//........................................................................ + namespace utl { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -48,9 +48,9 @@ namespace utl using namespace ::com::sun::star::container; using namespace ::com::sun::star::configuration; - //======================================================================== + //= OConfigurationNode - //======================================================================== + OConfigurationNode::OConfigurationNode(const Reference< XInterface >& _rxNode ) :m_bEscapeNames(false) @@ -479,9 +479,9 @@ namespace utl m_xContainerAccess.clear(); } - //======================================================================== + //= helper - //======================================================================== + namespace { @@ -611,8 +611,8 @@ namespace utl return OConfigurationTreeRoot(); } -//........................................................................ + } // namespace utl -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index d03646a5d05a..1697af6ceda8 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -28,17 +28,17 @@ #include <rtl/strbuf.hxx> #endif -//......................................................................... + namespace utl { -//......................................................................... + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - //===================================================================== + //= NodeValueAccessor - //===================================================================== + enum LocationType { ltSimplyObjectInstance, @@ -162,9 +162,9 @@ namespace utl } } - //===================================================================== + //= functors on NodeValueAccessor instances - //===================================================================== + /// base class for functors syncronizing between exchange locations and config sub nodes struct SubNodeAccess : public ::std::unary_function< NodeValueAccessor, void > @@ -207,9 +207,9 @@ namespace utl typedef std::vector<NodeValueAccessor> NodeValueAccessors; - //===================================================================== + //= OConfigurationValueContainerImpl - //===================================================================== + struct OConfigurationValueContainerImpl { Reference< XComponentContext > xORB; // the service factory @@ -225,9 +225,9 @@ namespace utl } }; - //===================================================================== + //= OConfigurationValueContainer - //===================================================================== + OConfigurationValueContainer::OConfigurationValueContainer( const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety, @@ -247,7 +247,7 @@ namespace utl { DBG_ASSERT( !m_pImpl->aConfigRoot.isValid(), "OConfigurationValueContainer::implConstruct: already initialized!" ); - // ................................. + // create the configuration node we're about to work with m_pImpl->aConfigRoot = OConfigurationTreeRoot::createWithComponentContext( m_pImpl->xORB, @@ -344,8 +344,8 @@ namespace utl lcl_copyData( _rAccessor, m_pImpl->aConfigRoot.getNodeValue( _rAccessor.getPath() ), m_pImpl->rMutex ); } -//......................................................................... + } // namespace utl -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index c0cbe066b365..74a3a48b9db2 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -224,7 +224,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem SvtDynamicMenuOptions_Impl(); ~SvtDynamicMenuOptions_Impl(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -240,7 +240,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& lPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -255,7 +255,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem virtual void Commit(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short base implementation of public interface for "SvtDynamicMenuOptions"! @descr These class is used as static member of "SvtDynamicMenuOptions" ... => The code exist only for one time and isn't duplicated for every instance! @@ -272,7 +272,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of key names of our configuration management which represent oue module tree @descr These methods return the current list of key names! We need it to get needed values from our configuration management and support dynamical menu item lists! @@ -288,7 +288,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem Sequence< OUString > impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short sort given source list and expand it for all well known properties to destination @descr We must support sets of entries with count inside the name .. but some of them could be missing! e.g. s1-s2-s3-s0-u1-s6-u5-u7 @@ -342,9 +342,9 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem SvtDynMenu m_aHelpBookmarksMenu ; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() // Init baseclasses first : ConfigItem( ROOTNODE_MENUS ) @@ -367,25 +367,25 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() // Copy values from list in right order to ouer internal member. // Attention: List for names and values have an internal construction pattern! - // + // first "New" menu ... // Name Value // /New/1/URL "private:factory/swriter" // /New/1/Title "Neues Writer Dokument" // /New/1/ImageIdentifier "icon_writer" // /New/1/TargetName "_blank" - // + // /New/2/URL "private:factory/scalc" // /New/2/Title "Neues Calc Dokument" // /New/2/ImageIdentifier "icon_calc" // /New/2/TargetName "_blank" - // + // second "Wizard" menu ... // /Wizard/1/URL "file://b" // /Wizard/1/Title "MalWas" // /Wizard/1/ImageIdentifier "icon_?" // /Wizard/1/TargetName "_self" - // + // ... and so on ... sal_uInt32 nItem = 0 ; @@ -450,9 +450,9 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() */ } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() { // We must save our current values .. if user forget it! @@ -462,17 +462,17 @@ SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) { DBG_ASSERT( false, "SvtDynamicMenuOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtDynamicMenuOptions_Impl::Commit() { OSL_FAIL( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" ); @@ -559,9 +559,9 @@ void SvtDynamicMenuOptions_Impl::Commit() */ } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDynamicMenuType eMenu ) const { Sequence< Sequence< PropertyValue > > lReturn; @@ -585,9 +585,9 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDyna return lReturn; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount ) { // First get ALL names of current existing list items in configuration! @@ -610,9 +610,9 @@ Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt return lProperties; } -//***************************************************************************************************************** + // private helper -//***************************************************************************************************************** + class CountWithPrefixSort { public: @@ -640,9 +640,9 @@ class SelectByPrefix } }; -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource , Sequence< OUString >& lDestination , const OUString& sSetNode ) @@ -689,17 +689,17 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence } } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtDynamicMenuOptions_Impl* SvtDynamicMenuOptions::m_pDataContainer = NULL ; sal_Int32 SvtDynamicMenuOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtDynamicMenuOptions::SvtDynamicMenuOptions() { // Global access, must be guarded (multithreading!). @@ -714,9 +714,9 @@ SvtDynamicMenuOptions::SvtDynamicMenuOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtDynamicMenuOptions::~SvtDynamicMenuOptions() { // Global access, must be guarded (multithreading!) @@ -732,9 +732,9 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMenuType eMenu ) const { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -746,9 +746,9 @@ namespace class theDynamicMenuOptionsMutex : public rtl::Static<osl::Mutex, theDynamicMenuOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtDynamicMenuOptions::GetOwnStaticMutex() { return theDynamicMenuOptionsMutex::get(); diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index b161d66b79bb..850578f5cd28 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -120,9 +120,9 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl() EnableNotification( aNotifySeq, true ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + GlobalEventConfig_Impl::~GlobalEventConfig_Impl() { // We must save our current values .. if user forget it! @@ -140,9 +140,9 @@ OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) return OUString(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& ) { MutexGuard aGuard( GlobalEventConfig::GetOwnStaticMutex() ); @@ -161,9 +161,9 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& ) } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void GlobalEventConfig_Impl::Commit() { //DF need to check it this is correct?? @@ -191,9 +191,9 @@ void GlobalEventConfig_Impl::Commit() } } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void GlobalEventConfig_Impl::initBindingInfo() { // Get ALL names of current existing list items in configuration! diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index acdf7adad215..fb890c3e70fb 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -65,7 +65,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem SvtExtendedSecurityOptions_Impl(); ~SvtExtendedSecurityOptions_Impl(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -81,7 +81,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& seqPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -99,7 +99,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode(); private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of 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. @@ -114,7 +114,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem static Sequence< OUString > GetPropertyNames(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short Fills the hash map with all extensions known to be secure @descr These methods fills the given hash map object with all extensions known to be secure. @@ -136,9 +136,9 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem ExtensionHashMap m_aExtensionHashMap; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() // Init baseclasses first : ConfigItem ( ROOTNODE_SECURITY ) @@ -186,9 +186,9 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() EnableNotification( seqNotifyNames ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() { // We must save our current values .. if user forget it! @@ -198,17 +198,17 @@ SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& ) { // Not implemented } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtExtendedSecurityOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. @@ -230,17 +230,17 @@ void SvtExtendedSecurityOptions_Impl::Commit() PutProperties( seqNames, seqValues ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::GetOpenHyperlinkMode() { return m_eOpenHyperlinkMode; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aHashMap ) { // Get sequence with secure extensions from configuration @@ -273,9 +273,9 @@ void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aH } } -//***************************************************************************************************************** + // private method (currently not used) -//***************************************************************************************************************** + Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() { // Build list of configuration key names. @@ -289,17 +289,17 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() return seqPropertyNames; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtExtendedSecurityOptions_Impl* SvtExtendedSecurityOptions::m_pDataContainer = NULL ; sal_Int32 SvtExtendedSecurityOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() { // Global access, must be guarded (multithreading!). @@ -315,9 +315,9 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() { // Global access, must be guarded (multithreading!) @@ -333,9 +333,9 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode() { MutexGuard aGuard( GetInitMutex() ); @@ -347,9 +347,9 @@ namespace class theExtendedSecurityOptionsMutex : public rtl::Static<osl::Mutex, theExtendedSecurityOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtExtendedSecurityOptions::GetInitMutex() { return theExtendedSecurityOptionsMutex::get(); diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 9a4b94996539..f3a78382f73b 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -431,7 +431,7 @@ FontSubstConfiguration::~FontSubstConfiguration() /* * FontSubstConfigItem::getMapName */ -// ======================================================================= + static const char* const aImplKillLeadingList[] = { @@ -748,7 +748,7 @@ static bool ImplFindAndErase( OUString& rName, const char* pStr ) return true; } -// ======================================================================= + void FontSubstConfiguration::getMapName( const OUString& rOrgName, OUString& rShortName, OUString& rFamilyName, FontWeight& rWeight, diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index c249f67a790e..99cc3284a3d4 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -52,7 +52,7 @@ class SvtFontOptions_Impl : public ConfigItem SvtFontOptions_Impl(); ~SvtFontOptions_Impl(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -68,7 +68,7 @@ class SvtFontOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& seqPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -83,7 +83,7 @@ class SvtFontOptions_Impl : public ConfigItem virtual void Commit(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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! @@ -104,7 +104,7 @@ class SvtFontOptions_Impl : public ConfigItem private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of 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. @@ -126,9 +126,9 @@ class SvtFontOptions_Impl : public ConfigItem bool m_bFontWYSIWYG ; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtFontOptions_Impl::SvtFontOptions_Impl() // Init baseclasses first : ConfigItem ( ROOTNODE_FONT ) @@ -178,9 +178,9 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() EnableNotification( seqNames ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtFontOptions_Impl::~SvtFontOptions_Impl() { // We must save our current values .. if user forget it! @@ -190,9 +190,9 @@ SvtFontOptions_Impl::~SvtFontOptions_Impl() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { // Use given list of updated properties to get his values from configuration directly! @@ -227,9 +227,9 @@ void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtFontOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. @@ -258,43 +258,43 @@ void SvtFontOptions_Impl::Commit() PutProperties( seqNames, seqValues ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtFontOptions_Impl::IsFontHistoryEnabled() const { return m_bFontHistory; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtFontOptions_Impl::EnableFontHistory( bool bState ) { m_bFontHistory = bState; SetModified(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const { return m_bFontWYSIWYG; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState ) { m_bFontWYSIWYG = bState; SetModified(); } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() { // Build list of configuration key names. @@ -310,17 +310,17 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() return seqPropertyNames; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtFontOptions_Impl* SvtFontOptions::m_pDataContainer = NULL ; sal_Int32 SvtFontOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtFontOptions::SvtFontOptions() { // Global access, must be guarded (multithreading!). @@ -336,9 +336,9 @@ SvtFontOptions::SvtFontOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtFontOptions::~SvtFontOptions() { // Global access, must be guarded (multithreading!) @@ -354,36 +354,36 @@ SvtFontOptions::~SvtFontOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtFontOptions::IsFontHistoryEnabled() const { MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsFontHistoryEnabled(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtFontOptions::EnableFontHistory( bool bState ) { MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->EnableFontHistory( bState ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtFontOptions::IsFontWYSIWYGEnabled() const { MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsFontWYSIWYGEnabled(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtFontOptions::EnableFontWYSIWYG( bool bState ) { MutexGuard aGuard( impl_GetOwnStaticMutex() ); @@ -395,9 +395,9 @@ namespace class theFontOptionsMutex : public rtl::Static<osl::Mutex, theFontOptionsMutex> {}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtFontOptions::impl_GetOwnStaticMutex() { return theFontOptionsMutex::get(); diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index c633d4544a17..124cee608287 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -69,10 +69,10 @@ namespace { const char s_sThumbnail[] = "Thumbnail"; } -//***************************************************************************************************************** + // class SvtHistoryOptions_Impl // redesigned -//***************************************************************************************************************** + class SvtHistoryOptions_Impl { public: @@ -94,9 +94,9 @@ private: css::uno::Reference< css::container::XNameAccess > m_xCommonXCU; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() { try @@ -124,17 +124,17 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtHistoryOptions_Impl::~SvtHistoryOptions_Impl() { } -//***************************************************************************************************************** + // public method // Attention: We return the max. size of our internal lists - That is the capacity not the size! -//***************************************************************************************************************** + sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) { css::uno::Reference< css::beans::XPropertySet > xListAccess(m_xCommonXCU, css::uno::UNO_QUERY); @@ -172,7 +172,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) return nSize; } -//***************************************************************************************************************** + void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt32 nSize ) { css::uno::Reference< css::container::XNameAccess > xList; @@ -230,10 +230,10 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt } } -//***************************************************************************************************************** + // public method // Clear specified history list -//***************************************************************************************************************** + void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) { css::uno::Reference< css::container::XNameAccess > xListAccess; @@ -302,10 +302,10 @@ static bool lcl_fileOpenable(const OUString &rURL) return false; } -//***************************************************************************************************************** + // public method // get a sequence list from the items -//***************************************************************************************************************** + Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryType eHistory ) { impl_truncateList (eHistory, GetSize (eHistory)); @@ -403,10 +403,10 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT return seqReturn; } -//***************************************************************************************************************** + // public method // implements a deque in XML -//***************************************************************************************************************** + void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory, const OUString& sURL, const OUString& sFilter, const OUString& sTitle, const OUString& sPassword, const OUString& sThumbnail) @@ -562,17 +562,17 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory, } } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtHistoryOptions_Impl* SvtHistoryOptions::m_pDataContainer = NULL ; sal_Int32 SvtHistoryOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtHistoryOptions::SvtHistoryOptions() { // Global access, must be guarded (multithreading!). @@ -588,9 +588,9 @@ SvtHistoryOptions::SvtHistoryOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtHistoryOptions::~SvtHistoryOptions() { // Global access, must be guarded (multithreading!) @@ -606,36 +606,36 @@ SvtHistoryOptions::~SvtHistoryOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_uInt32 SvtHistoryOptions::GetSize( EHistoryType eHistory ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetSize( eHistory ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtHistoryOptions::Clear( EHistoryType eHistory ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->Clear( eHistory ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + Sequence< Sequence< PropertyValue > > SvtHistoryOptions::GetList( EHistoryType eHistory ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->GetList( eHistory ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtHistoryOptions::AppendItem(EHistoryType eHistory, const OUString& sURL, const OUString& sFilter, const OUString& sTitle, const OUString& sPassword, const OUString& sThumbnail) @@ -649,9 +649,9 @@ namespace class theHistoryOptionsMutex : public rtl::Static<osl::Mutex, theHistoryOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtHistoryOptions::GetOwnStaticMutex() { return theHistoryOptionsMutex::get(); diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index c2922f740409..c5c41ede523a 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -27,13 +27,13 @@ class ItemHolder1 : private ItemHolderMutexBase , public ::cppu::WeakImplHelper1< css::lang::XEventListener > { - //........................................... + // member private: TItems m_lItems; - //........................................... + // c++ interface public: @@ -41,14 +41,14 @@ class ItemHolder1 : private ItemHolderMutexBase virtual ~ItemHolder1(); static void holdConfigItem(EItem eItem); - //........................................... + // uno interface public: virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); - //........................................... + // helper private: @@ -58,7 +58,7 @@ class ItemHolder1 : private ItemHolderMutexBase void impl_deleteItem(TItemInfo& rItem); }; -//----------------------------------------------- + // namespaces #undef css diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 353d4cbc984f..5e910d6bd4f3 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -792,7 +792,7 @@ bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const return bReadOnly; } -////////////////////////////////////////////////////////////////////// + static SvtLinguConfigItem *pCfgItem = 0; static sal_Int32 nCfgItemRefCount = 0; @@ -1217,6 +1217,6 @@ bool SvtLinguConfig::HasGrammarChecker() const return bRes; } -////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index 4726ccd5aeba..e060a0b23861 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -51,7 +51,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem SvtLocalisationOptions_Impl(); ~SvtLocalisationOptions_Impl(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -67,7 +67,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& seqPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -82,7 +82,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem virtual void Commit(); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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! @@ -100,7 +100,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem private: - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of 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. @@ -121,9 +121,9 @@ class SvtLocalisationOptions_Impl : public ConfigItem sal_Int32 m_nDialogScale ; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() // Init baseclasses first : ConfigItem ( ROOTNODE_LOCALISATION ) @@ -167,9 +167,9 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() EnableNotification( seqNames ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() { // We must save our current values .. if user forget it! @@ -179,9 +179,9 @@ SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { // Use given list of updated properties to get his values from configuration directly! @@ -212,9 +212,9 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert NotifyListeners(0); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtLocalisationOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. @@ -240,17 +240,17 @@ void SvtLocalisationOptions_Impl::Commit() PutProperties( seqNames, seqValues ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const { return m_bAutoMnemonic; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const { return m_nDialogScale; @@ -270,17 +270,17 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() return seqPropertyNames; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtLocalisationOptions_Impl* SvtLocalisationOptions::m_pDataContainer = NULL ; sal_Int32 SvtLocalisationOptions::m_nRefCount = 0 ; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtLocalisationOptions::SvtLocalisationOptions() { // Global access, must be guarded (multithreading!). @@ -296,9 +296,9 @@ SvtLocalisationOptions::SvtLocalisationOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtLocalisationOptions::~SvtLocalisationOptions() { // Global access, must be guarded (multithreading!) @@ -314,18 +314,18 @@ SvtLocalisationOptions::~SvtLocalisationOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtLocalisationOptions::IsAutoMnemonic() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsAutoMnemonic(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Int32 SvtLocalisationOptions::GetDialogScale() const { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -337,9 +337,9 @@ namespace class theLocalisationOptionsMutex : public rtl::Static<osl::Mutex, theLocalisationOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtLocalisationOptions::GetOwnStaticMutex() { return theLocalisationOptionsMutex::get(); diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 7b8b6bc862cd..edcd930fd6b4 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -39,7 +39,7 @@ #include "itemholder1.hxx" -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr These values are used to define necessary keys from our configuration management to support all functionality of these implementation. It's a fast way to make changes if some keys change his name or location! @@ -84,7 +84,7 @@ #define FACTORYCOUNT 10 -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr This struct hold information about one factory. We declare a complete array which can hold infos for all well known factories. Values of enum "EFactory" (see header!) are directly used as index! So we can support a fast access on these information. @@ -285,7 +285,7 @@ struct FactoryInfo typedef FactoryInfo FactoryInfoList[FACTORYCOUNT]; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short IMPL data container for wrapper class SvtModulOptions! @descr These class is used as a static data container of class SvtModuleOptions. The hold it by using a refcount and make it threadsafe by using an osl mutex. So we don't must do anything for that. @@ -354,7 +354,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem bool m_bReadOnlyStatesWellKnown; }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short default ctor @descr We open our configuration here and read all necessary values from it. These values are cached till everyone call Commit(). Then we write changed ones back to cfg. @@ -386,7 +386,7 @@ SvtModuleOptions_Impl::SvtModuleOptions_Impl() EnableNotification( lFactories ); } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short default dtor @descr If any values of our cache was modified we should write it back to configuration. @@ -409,7 +409,7 @@ SvtModuleOptions_Impl::~SvtModuleOptions_Impl() } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @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 our @@ -433,7 +433,7 @@ void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< OUString >& ) OSL_FAIL( "SvtModuleOptions_Impl::Notify()\nNot implemented yet!\n" ); } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @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. @@ -486,7 +486,7 @@ void SvtModuleOptions_Impl::Commit() } } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short access method to get internal values @descr These methods implement easy access to our internal values. You give us right enum value to specify which module interest you ... we return right information. @@ -587,7 +587,7 @@ bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule return aRet; } -//***************************************************************************************************************** + OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFactory ) const { OUString sName; @@ -600,7 +600,7 @@ OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFact return sName; } -//***************************************************************************************************************** + OUString SvtModuleOptions::GetFactoryShortName(SvtModuleOptions::EFactory eFactory) { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. @@ -639,7 +639,7 @@ OUString SvtModuleOptions::GetFactoryShortName(SvtModuleOptions::EFactory eFacto return sShortName; } -//***************************************************************************************************************** + OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const { OUString sFile; @@ -652,7 +652,7 @@ OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EF return sFile; } -//***************************************************************************************************************** + OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. @@ -690,7 +690,7 @@ OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EF return sURL; } -//***************************************************************************************************************** + OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory ) const { OUString sDefaultFilter; @@ -701,7 +701,7 @@ OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFact } return sDefaultFilter; } -//***************************************************************************************************************** + bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const { bool bRet = false; @@ -712,7 +712,7 @@ bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory return bRet; } -//***************************************************************************************************************** + sal_Int32 SvtModuleOptions_Impl::GetFactoryIcon( SvtModuleOptions::EFactory eFactory ) const { sal_Int32 nIcon = 0; @@ -725,7 +725,7 @@ sal_Int32 SvtModuleOptions_Impl::GetFactoryIcon( SvtModuleOptions::EFactory eFac return nIcon; } -//***************************************************************************************************************** + void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , const OUString& sTemplate ) { @@ -736,7 +736,7 @@ void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions:: } } -//***************************************************************************************************************** + void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory, const OUString& sFilter ) { @@ -747,7 +747,7 @@ void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFa } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short return list of key names of ouer configuration management which represent our module tree @descr You give use a list of current existing set node names .. and we expand it for all well known properties which are necessary for this implementation. @@ -782,7 +782,7 @@ css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const return lPropNames; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short helper to classify given factory by name @descr Every factory has his own long and short name. So we can match right enum value for internal using. @@ -865,7 +865,7 @@ bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtMod return bState; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short read factory configuration @descr Give us a list of pure factory names (long names!) which can be used as direct set node names ... and we read her property values and fill internal list. @@ -939,7 +939,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa } } -//***************************************************************************************************************** + void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() { if (m_bReadOnlyStatesWellKnown) @@ -974,15 +974,15 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() m_bReadOnlyStatesWellKnown = true; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtModuleOptions_Impl* SvtModuleOptions::m_pDataContainer = NULL ; sal_Int32 SvtModuleOptions::m_nRefCount = 0 ; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short standard constructor and destructor @descr This will initialize an instance with default values. We initialize/deinitialize our static data container and create a static mutex, which is used for threadsafe code in further time of this object. @@ -1007,7 +1007,7 @@ SvtModuleOptions::SvtModuleOptions() } } -//***************************************************************************************************************** + SvtModuleOptions::~SvtModuleOptions() { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); @@ -1019,7 +1019,7 @@ SvtModuleOptions::~SvtModuleOptions() } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short access to configuration data @descr This methods allow read/write access to configuration values. They are threadsafe. All calls are forwarded to impl-data-container. See there for further information! @@ -1038,48 +1038,48 @@ bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const return m_pDataContainer->IsModuleInstalled( eModule ); } -//***************************************************************************************************************** + OUString SvtModuleOptions::GetFactoryName( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryName( eFactory ); } -//***************************************************************************************************************** + OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryStandardTemplate( eFactory ); } -//***************************************************************************************************************** + OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryEmptyDocumentURL( eFactory ); } -//***************************************************************************************************************** + OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryDefaultFilter( eFactory ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsDefaultFilterReadonly( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->MakeReadonlyStatesAvailable(); return m_pDataContainer->IsDefaultFilterReadonly( eFactory ); } -//***************************************************************************************************************** + sal_Int32 SvtModuleOptions::GetFactoryIcon( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryIcon( eFactory ); } -//***************************************************************************************************************** + bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , EFactory& eFactory ) { @@ -1087,7 +1087,7 @@ bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , return SvtModuleOptions_Impl::ClassifyFactoryByName( sName, eFactory ); } -//***************************************************************************************************************** + void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFactory , const OUString& sTemplate ) { @@ -1095,7 +1095,7 @@ void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFacto m_pDataContainer->SetFactoryStandardTemplate( eFactory, sTemplate ); } -//***************************************************************************************************************** + void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, const OUString& sFilter ) { @@ -1103,54 +1103,54 @@ void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, m_pDataContainer->SetFactoryDefaultFilter( eFactory, sFilter ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsMath() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SMATH ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsChart() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SCHART ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsCalc() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SCALC ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsDraw() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SDRAW ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsWriter() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SWRITER ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsImpress() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SIMPRESS ); } -//***************************************************************************************************************** + bool SvtModuleOptions::IsBasicIDE() const { return true; } -//***************************************************************************************************************** + bool SvtModuleOptions::IsDataBase() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); @@ -1161,7 +1161,7 @@ namespace { class theModuleOptionsMutex : public rtl::Static<osl::Mutex, theModuleOptionsMutex> {}; } -/*-****************************************************************************************************//** +/*-**************************************************************************************************** @short return a reference to a static mutex @descr These class is threadsafe. We create a static mutex only for one time and use it to protect our refcount and container diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 425cf3a8f5fc..2334b796b889 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -107,9 +107,9 @@ private: bool m_bModifyDocumentOnPrintingAllowed; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : ConfigItem( ROOTNODE_START ), m_bPaperSize( false ), @@ -171,18 +171,18 @@ SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl() { if( IsModified() ) Commit(); } -//***************************************************************************************************************** + // Commit -//***************************************************************************************************************** + void SvtPrintWarningOptions_Impl::Commit() { Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); @@ -220,9 +220,9 @@ void SvtPrintWarningOptions_Impl::Notify( const Sequence< OUString >& ) { } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() { // Build list of configuration key names. @@ -241,17 +241,17 @@ Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() return seqPropertyNames; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtPrintWarningOptions_Impl* SvtPrintWarningOptions::m_pDataContainer = NULL; sal_Int32 SvtPrintWarningOptions::m_nRefCount = 0; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtPrintWarningOptions::SvtPrintWarningOptions() { // Global access, must be guarded (multithreading!). @@ -266,9 +266,9 @@ SvtPrintWarningOptions::SvtPrintWarningOptions() } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtPrintWarningOptions::~SvtPrintWarningOptions() { // Global access, must be guarded (multithreading!) @@ -284,54 +284,54 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtPrintWarningOptions::IsPaperSize() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsPaperSize(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtPrintWarningOptions::IsPaperOrientation() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsPaperOrientation(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtPrintWarningOptions::IsTransparency() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsTransparency(); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtPrintWarningOptions::SetPaperSize( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetPaperSize( bState ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtPrintWarningOptions::SetPaperOrientation( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetPaperOrientation( bState ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtPrintWarningOptions::SetTransparency( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); @@ -358,9 +358,9 @@ namespace class thePrintWarningOptionsMutex : public rtl::Static<osl::Mutex, thePrintWarningOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + Mutex& SvtPrintWarningOptions::GetOwnStaticMutex() { return thePrintWarningOptionsMutex::get(); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 314cede137a1..e7668bf18745 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -34,9 +34,9 @@ #include "itemholder1.hxx" -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::utl ; using namespace ::rtl ; @@ -100,9 +100,9 @@ using namespace ::com::sun::star::uno ; #define CFG_READONLY_DEFAULT false -//_________________________________________________________________________________________________________________ + // private declarations! -//_________________________________________________________________________________________________________________ + class SvtSecurityOptions_Impl : public ConfigItem { @@ -123,7 +123,7 @@ class SvtSecurityOptions_Impl : public ConfigItem // overloaded methods of baseclass - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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 @@ -139,7 +139,7 @@ class SvtSecurityOptions_Impl : public ConfigItem virtual void Notify( const Sequence< OUString >& seqPropertyNames ); - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @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. @@ -174,7 +174,7 @@ class SvtSecurityOptions_Impl : public ConfigItem bool SetOption ( SvtSecurityOptions::EOption eOption, bool bValue ) ; bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const ; - /*-****************************************************************************************************//** + /*-**************************************************************************************************** @short return list of key names of ouer configuration management which represent our module tree @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. @@ -242,9 +242,9 @@ class SvtSecurityOptions_Impl : public ConfigItem void SetBasicMode ( EBasicSecurityMode eMode ) ; }; -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() :ConfigItem ( ROOTNODE_SECURITY ) ,m_seqSecureURLs ( DEFAULT_SECUREURL ) @@ -306,9 +306,9 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() EnableNotification( seqNames ); } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl() { if( IsModified() ) @@ -992,11 +992,11 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames() return seqPropertyNames; } -//***************************************************************************************************************** + // initialize static member // DON'T DO IT IN YOUR HEADER! // see definition for further information -//***************************************************************************************************************** + SvtSecurityOptions_Impl* SvtSecurityOptions::m_pDataContainer = NULL ; sal_Int32 SvtSecurityOptions::m_nRefCount = 0 ; diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 0aec1c473d1e..0457c4277ec7 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -520,7 +520,7 @@ void SvtSysLocaleOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNa NotifyListeners( nHint ); } -// ==================================================================== + SvtSysLocaleOptions::SvtSysLocaleOptions() { diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 7589c3f56d32..c180c8d50522 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -68,9 +68,9 @@ sMsg.appendAscii("\"" ); \ } -//_________________________________________________________________________________________________________________ + // initialization! -//_________________________________________________________________________________________________________________ + SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Dialogs = NULL ; sal_Int32 SvtViewOptions::m_nRefCount_Dialogs = 0 ; @@ -81,11 +81,11 @@ sal_Int32 SvtViewOptions::m_nRefCount_TabPages = 0 SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Windows = NULL ; sal_Int32 SvtViewOptions::m_nRefCount_Windows = 0 ; -//_________________________________________________________________________________________________________________ + // private declarations! -//_________________________________________________________________________________________________________________ -/*-************************************************************************************************************//** + +/*-************************************************************************************************************ @descr declare one configuration item These struct hold information about one view item. But not all member are used for all entries! User must decide which information are useful and which not. We are a container iztem only and doesn't @@ -239,7 +239,7 @@ typedef ::boost::unordered_map< OUString , IMPL_TStringHashCode , ::std::equal_to< OUString > > IMPL_TViewHash; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr Implement base data container for view options elements. Every item support ALL possible configuration information. But not every superclass should use them! Because some view types don't @@ -295,11 +295,11 @@ class SvtViewOptionsBase_Impl #endif }; -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @descr Implement the base data container. *//*-*************************************************************************************************************/ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short ctor @descr We use it to open right configuration file and let configuration objects fill her caches. Then we read all existing entries from right list and cached it inside our object too. @@ -339,7 +339,7 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const OUString& sList ) } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short dtor @descr clean up something @@ -368,7 +368,7 @@ SvtViewOptionsBase_Impl::~SvtViewOptionsBase_Impl() #endif // DEBUG_VIEWOPTIONS } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short checks for already existing entries @descr If user don't know, if an entry already exist - he can get this information by calling this method. @@ -396,7 +396,7 @@ bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) return bExists; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short delete entry @descr Use it to delete set entry by given name. @@ -431,7 +431,7 @@ bool SvtViewOptionsBase_Impl::Delete( const OUString& sName ) return bDeleted; } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short read/write access to cache view items and her properties @descr Follow methods support read/write access to all cache view items. @@ -464,7 +464,7 @@ OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName ) return sWindowState; } -//***************************************************************************************************************** + void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , const OUString& sState ) { @@ -486,7 +486,7 @@ void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , } } -//***************************************************************************************************************** + css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserData( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS @@ -526,7 +526,7 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat return css::uno::Sequence< css::beans::NamedValue >(); } -//***************************************************************************************************************** + void SvtViewOptionsBase_Impl::SetUserData( const OUString& sName , const css::uno::Sequence< css::beans::NamedValue >& lData ) { @@ -562,7 +562,7 @@ void SvtViewOptionsBase_Impl::SetUserData( const OUString& } } -//***************************************************************************************************************** + css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , const OUString& sItem ) { @@ -593,7 +593,7 @@ css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , return aItem; } -//***************************************************************************************************************** + void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , const OUString& sItem , const css::uno::Any& aValue ) @@ -624,7 +624,7 @@ void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , } } -//***************************************************************************************************************** + sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS @@ -649,7 +649,7 @@ sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) return nID; } -//***************************************************************************************************************** + void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , sal_Int32 nID ) { @@ -671,7 +671,7 @@ void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , } } -//***************************************************************************************************************** + SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS @@ -701,7 +701,7 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUStri return eState; } -//***************************************************************************************************************** + void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , bool bVisible ) { @@ -723,7 +723,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , } } -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short create new set node with default values on disk @descr To create a new UserData item - the super node of these property must already exist! You can call this method to create these new entry with default values and change UserData then. @@ -759,9 +759,9 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet return xNode; } -//***************************************************************************************************************** + // constructor -//***************************************************************************************************************** + SvtViewOptions::SvtViewOptions( EViewType eType , const OUString& sViewName ) : m_eViewType ( eType ) @@ -822,9 +822,9 @@ SvtViewOptions::SvtViewOptions( EViewType eType , } } -//***************************************************************************************************************** + // destructor -//***************************************************************************************************************** + SvtViewOptions::~SvtViewOptions() { // Global access, must be guarded (multithreading!) @@ -880,9 +880,9 @@ SvtViewOptions::~SvtViewOptions() } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtViewOptions::Exists() const { // Ready for multithreading @@ -911,9 +911,9 @@ bool SvtViewOptions::Exists() const return bExists; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtViewOptions::Delete() { // Ready for multithreading @@ -942,9 +942,9 @@ bool SvtViewOptions::Delete() return bState; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + OUString SvtViewOptions::GetWindowState() const { // Ready for multithreading @@ -973,9 +973,9 @@ OUString SvtViewOptions::GetWindowState() const return sState; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtViewOptions::SetWindowState( const OUString& sState ) { // Ready for multithreading @@ -1002,9 +1002,9 @@ void SvtViewOptions::SetWindowState( const OUString& sState ) } } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + sal_Int32 SvtViewOptions::GetPageID() const { // Ready for multithreading @@ -1020,9 +1020,9 @@ sal_Int32 SvtViewOptions::GetPageID() const return nID; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtViewOptions::SetPageID( sal_Int32 nID ) { // Ready for multithreading @@ -1036,9 +1036,9 @@ void SvtViewOptions::SetPageID( sal_Int32 nID ) m_pDataContainer_TabDialogs->SetPageID( m_sViewName, nID ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtViewOptions::IsVisible() const { // Ready for multithreading @@ -1055,9 +1055,9 @@ bool SvtViewOptions::IsVisible() const return bState; } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + void SvtViewOptions::SetVisible( bool bState ) { // Ready for multithreading @@ -1071,9 +1071,9 @@ void SvtViewOptions::SetVisible( bool bState ) m_pDataContainer_Windows->SetVisible( m_sViewName, bState ); } -//***************************************************************************************************************** + // public method -//***************************************************************************************************************** + bool SvtViewOptions::HasVisible() const { // Ready for multithreading @@ -1090,7 +1090,7 @@ bool SvtViewOptions::HasVisible() const return bState; } -//***************************************************************************************************************** + css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const { // Ready for multithreading @@ -1119,7 +1119,7 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const return lData; } -//***************************************************************************************************************** + void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedValue >& lData ) { // Ready for multithreading @@ -1146,7 +1146,7 @@ void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedVal } } -//***************************************************************************************************************** + css::uno::Any SvtViewOptions::GetUserItem( const OUString& sName ) const { // Ready for multithreading @@ -1175,7 +1175,7 @@ css::uno::Any SvtViewOptions::GetUserItem( const OUString& sName ) const return aItem; } -//***************************************************************************************************************** + void SvtViewOptions::SetUserItem( const OUString& sName , const css::uno::Any& aValue ) { @@ -1208,9 +1208,9 @@ namespace class theViewOptionsMutex : public rtl::Static<osl::Mutex, theViewOptionsMutex>{}; } -//***************************************************************************************************************** + // private method -//***************************************************************************************************************** + ::osl::Mutex& SvtViewOptions::GetOwnStaticMutex() { return theViewOptionsMutex::get(); |