diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /framework | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
95 files changed, 1156 insertions, 1156 deletions
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 2c1d8d555a6b..b5cdfc9627f5 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -32,13 +32,13 @@ namespace framework { -//----------------------------------------------- + AcceleratorCache::AcceleratorCache() : ThreadHelpBase(&Application::GetSolarMutex()) { } -//----------------------------------------------- + AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) : ThreadHelpBase(&Application::GetSolarMutex()) { @@ -46,14 +46,14 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) m_lKey2Commands = rCopy.m_lKey2Commands; } -//----------------------------------------------- + AcceleratorCache::~AcceleratorCache() { // Dont save anything automaticly here. // The user has to do that explicitly! } -//----------------------------------------------- + void AcceleratorCache::takeOver(const AcceleratorCache& rCopy) { // SAFE -> ---------------------------------- @@ -66,14 +66,14 @@ void AcceleratorCache::takeOver(const AcceleratorCache& rCopy) // <- SAFE ---------------------------------- } -//----------------------------------------------- + AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy) { takeOver(rCopy); return *this; } -//----------------------------------------------- + sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const { // SAFE -> ---------------------------------- @@ -83,7 +83,7 @@ sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const // <- SAFE ---------------------------------- } -//----------------------------------------------- + sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const { // SAFE -> ---------------------------------- @@ -93,7 +93,7 @@ sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const // <- SAFE ---------------------------------- } -//----------------------------------------------- + AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const { TKeyList lKeys; @@ -117,7 +117,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const return lKeys; } -//----------------------------------------------- + void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand) { @@ -135,7 +135,7 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , // <- SAFE ---------------------------------- } -//----------------------------------------------- + AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const { TKeyList lKeys; @@ -155,7 +155,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sC return lKeys; } -//----------------------------------------------- + OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const { OUString sCommand; @@ -175,7 +175,7 @@ OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const return sCommand; } -//----------------------------------------------- + void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) { // SAFE -> ---------------------------------- @@ -202,7 +202,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) // <- SAFE ---------------------------------- } -//----------------------------------------------- + void AcceleratorCache::removeCommand(const OUString& sCommand) { // SAFE -> ---------------------------------- diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index bbccd5578b55..8baaea10af91 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -73,7 +73,7 @@ namespace framework return sKeyBuffer.makeStringAndClear(); } -//----------------------------------------------- + XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xContext (xContext ) @@ -82,13 +82,13 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un { } -//----------------------------------------------- + XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration() { SAL_WARN_IF(m_pWriteCache, "fwk", "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration(): Changes not flushed. Ignore it ..."); } -//----------------------------------------------- + css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException) { @@ -102,7 +102,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- + OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -120,7 +120,7 @@ OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const c // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -153,7 +153,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -171,7 +171,7 @@ throw(css::container::NoSuchElementException, // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -198,7 +198,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ) @@ -237,7 +237,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g return lPreferredOnes; } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -263,7 +263,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException) @@ -308,7 +308,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() } } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException) @@ -336,7 +336,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() m_aPresetHandler.commitUserChanges(); } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException) @@ -360,7 +360,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R // TODO inform listener about success, so it can flush the root and sub storage of this stream! } -//----------------------------------------------- + ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException) { @@ -370,7 +370,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R // <- SAFE ---------------------------------- } -//----------------------------------------------- + ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException) { @@ -386,14 +386,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R return !(xOut.is()); } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } -//----------------------------------------------- + ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -401,21 +401,21 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Refer return sal_False; } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { @@ -428,28 +428,28 @@ throw(css::uno::RuntimeException) reload(); } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me"); } -//----------------------------------------------- + // IStorageListener void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/) { reload(); } -//----------------------------------------------- + void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream) { // SAFE -> ---------------------------------- @@ -498,7 +498,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c // <- SAFE ---------------------------------- } -//----------------------------------------------- + void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream) { // SAFE -> ---------------------------------- @@ -551,7 +551,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c // <- SAFE ---------------------------------- } -//----------------------------------------------- + AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested) { // SAFE -> ---------------------------------- @@ -576,7 +576,7 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA // <- SAFE ---------------------------------- } -//----------------------------------------------- + OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const { OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get(); @@ -592,7 +592,7 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const * *******************************************************************************/ -//----------------------------------------------- + XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xContext (xContext ) @@ -605,12 +605,12 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un css::uno::UNO_QUERY ); } -//----------------------------------------------- + XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration() { } -//----------------------------------------------- + css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException) { @@ -631,7 +631,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- + OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -655,7 +655,7 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -742,7 +742,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -785,7 +785,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -820,7 +820,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- + AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const AcceleratorCache::TKeyList& lKeys) { AcceleratorCache::TKeyList::const_iterator pIt; @@ -839,7 +839,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator return lKeys.end(); } -//----------------------------------------------- + css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ) @@ -882,7 +882,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g return lPreferredOnes; } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -914,7 +914,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException) @@ -955,7 +955,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException) @@ -984,7 +984,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store() // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException) @@ -1051,28 +1051,28 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R aWriter.flush(); } -//----------------------------------------------- + ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException) { return sal_False; } -//----------------------------------------------- + ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException) { return sal_False; } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } -//----------------------------------------------- + ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -1080,21 +1080,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Refer return sal_False; } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { @@ -1116,21 +1116,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() } } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me"); } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException) { @@ -1182,34 +1182,34 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: } } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/) throw(css::uno::RuntimeException) { } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::dispose() throw(css::uno::RuntimeException) { // nop } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) throw(css::uno::RuntimeException) { // nop } -//----------------------------------------------- + void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) throw(css::uno::RuntimeException) { // nop } -//----------------------------------------------- + void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg ) { AcceleratorCache aReadCache = AcceleratorCache(); @@ -1318,7 +1318,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const m_aSecondaryReadCache.takeOver(aReadCache); } -//----------------------------------------------- + void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/) { if (bPreferred) @@ -1411,7 +1411,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c ::comphelper::ConfigurationHelper::flush(m_xCfg); } -//----------------------------------------------- + void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1458,7 +1458,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand)); } -//----------------------------------------------- + void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1484,7 +1484,7 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw xContainer->removeByName(sKey); } -//----------------------------------------------- + void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1555,7 +1555,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe } } -//----------------------------------------------- + AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested) { // SAFE -> ---------------------------------- @@ -1604,7 +1604,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer // <- SAFE ---------------------------------- } -//----------------------------------------------- + OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const { OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get(); diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index bf58b4cfa873..adb14034efb1 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -55,7 +55,7 @@ class DocumentAcceleratorConfiguration : public DocumentAcceleratorConfiguration { private: - //---------------------------------- + /** points to the root storage of the outside document, where we can read/save our configuration data. */ css::uno::Reference< css::embed::XStorage > m_xDocumentRoot; @@ -110,7 +110,7 @@ private: void impl_ts_clearCache(); }; -//----------------------------------------------- + DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments) @@ -136,13 +136,13 @@ DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( impl_ts_fillCache(); } -//----------------------------------------------- + DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration() { m_aPresetHandler.removeStorageListener(this); } -//----------------------------------------------- + void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::RuntimeException) { @@ -162,7 +162,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer impl_ts_fillCache(); } -//----------------------------------------------- + sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -172,7 +172,7 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() // <- SAFE ---------------------------------- } -//----------------------------------------------- + void DocumentAcceleratorConfiguration::impl_ts_fillCache() { // SAFE -> ---------------------------------- @@ -213,7 +213,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache() {} } -//----------------------------------------------- + void DocumentAcceleratorConfiguration::impl_ts_clearCache() { m_aPresetHandler.forgetCachedStorages(); diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 72f4234d71be..762dd15d500e 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -125,7 +125,7 @@ void GlobalAcceleratorConfiguration::fillCache() {} } -//----------------------------------------------- + // // XComponent.dispose(), #i120029#, to release the cyclic reference // diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index b0606f52a5a0..a74955d43e5e 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -27,7 +27,7 @@ namespace framework { -//_______________________________________________ + // helper KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = @@ -140,7 +140,7 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = {0 , "" } // mark the end of this array! }; -//----------------------------------------------- + KeyMapping::KeyMapping() { sal_Int32 i = 0; @@ -156,12 +156,12 @@ KeyMapping::KeyMapping() } } -//----------------------------------------------- + KeyMapping::~KeyMapping() { } -//----------------------------------------------- + sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) throw(css::lang::IllegalArgumentException) { @@ -181,7 +181,7 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier) return (sal_uInt16)nCode; } -//----------------------------------------------- + OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) { Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode); @@ -192,7 +192,7 @@ OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) return OUString::number(nCode); } -//----------------------------------------------- + sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ) { diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index e507b41ec402..84c2cb19658f 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -168,7 +168,7 @@ void ModuleAcceleratorConfiguration::fillCache() {} } -//----------------------------------------------- + // // XComponent.dispose(), #i120029#, to release the cyclic reference // diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 25006679d1e8..bc12a8e1bda7 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -49,43 +49,43 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; namespace framework { -//----------------------------------------------- + OUString PresetHandler::PRESET_DEFAULT() { return OUString("default"); } -//----------------------------------------------- + OUString PresetHandler::TARGET_CURRENT() { return OUString("current"); } -//----------------------------------------------- + OUString PresetHandler::RESOURCETYPE_MENUBAR() { return OUString("menubar"); } -//----------------------------------------------- + OUString PresetHandler::RESOURCETYPE_TOOLBAR() { return OUString("toolbar"); } -//----------------------------------------------- + OUString PresetHandler::RESOURCETYPE_ACCELERATOR() { return OUString("accelerator"); } -//----------------------------------------------- + OUString PresetHandler::RESOURCETYPE_STATUSBAR() { return OUString("statusbar"); } -//----------------------------------------------- + PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase (&Application::GetSolarMutex() ) , m_xContext (xContext ) @@ -95,7 +95,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentCont { } -//----------------------------------------------- + PresetHandler::PresetHandler(const PresetHandler& rCopy) : ThreadHelpBase (&Application::GetSolarMutex() ) , m_aLanguageTag( rCopy.m_aLanguageTag) @@ -116,7 +116,7 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy) m_sRelPathUser = rCopy.m_sRelPathUser; } -//----------------------------------------------- + PresetHandler::~PresetHandler() { m_xWorkingStorageShare.clear(); @@ -143,7 +143,7 @@ PresetHandler::~PresetHandler() m_lDocumentStorages.forgetCachedStorages(); } -//----------------------------------------------- + void PresetHandler::forgetCachedStorages() { // SAFE -> ---------------------------------- @@ -260,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag return xStorage; } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageUser() { css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage(); @@ -308,7 +308,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag return xStorage; } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShare() { // SAFE -> ---------------------------------- @@ -317,7 +317,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShar // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser() { // SAFE -> ---------------------------------- @@ -326,7 +326,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& /*xChild*/) { // SAFE -> ---------------------------------- @@ -338,7 +338,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking); } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(const css::uno::Reference< css::embed::XStorage >& /*xChild*/) { // SAFE -> ---------------------------------- @@ -350,7 +350,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser( return m_aSharedStorages->m_lStoragesUser.getParentStorage(xWorking); } -//----------------------------------------------- + void PresetHandler::connectToResource( PresetHandler::EConfigType eConfigType , const OUString& sResource , const OUString& sModule , @@ -557,7 +557,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } } -//----------------------------------------------- + void PresetHandler::copyPresetToTarget(const OUString& sPreset, const OUString& sTarget) { @@ -600,7 +600,7 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset, commitUserChanges(); } -//----------------------------------------------- + css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset, sal_Bool bUseNoLangGlobal) { @@ -622,7 +622,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString return xStream; } -//----------------------------------------------- + css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget , sal_Bool bCreateIfMissing) { @@ -663,7 +663,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString return xStream; } -//----------------------------------------------- + void PresetHandler::commitUserChanges() { // SAFE -> ---------------------------------- @@ -700,7 +700,7 @@ void PresetHandler::commitUserChanges() } } -//----------------------------------------------- + void PresetHandler::addStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- @@ -730,7 +730,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) } } -//----------------------------------------------- + void PresetHandler::removeStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- @@ -760,7 +760,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) } } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , sal_Bool bShare) @@ -780,7 +780,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring return xPath; } -//----------------------------------------------- + ::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue( const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag, @@ -811,7 +811,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring return pFound; } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors( OUString& sPath , sal_Int32 eMode , @@ -851,7 +851,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return xLocalePath; } -//----------------------------------------------- + ::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder) { css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY); @@ -880,7 +880,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return lSubFolders; } -//----------------------------------------------- + } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 50a302890161..7047b64a9300 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -48,20 +48,20 @@ namespace framework { -//----------------------------------------------- + StorageHolder::StorageHolder() : ThreadHelpBase( ) { } -//----------------------------------------------- + StorageHolder::~StorageHolder() { // TODO implement me // dispose/clear etcpp. } -//----------------------------------------------- + void StorageHolder::forgetCachedStorages() { // SAFE -> ---------------------------------- @@ -82,7 +82,7 @@ void StorageHolder::forgetCachedStorages() // <- SAFE ---------------------------------- } -//----------------------------------------------- + void StorageHolder::setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot) { // SAFE -> ---------------------------------- @@ -92,7 +92,7 @@ void StorageHolder::setRootStorage(const css::uno::Reference< css::embed::XStora // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() const { // SAFE -> ---------------------------------- @@ -101,7 +101,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() cons // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath , sal_Int32 nOpenMode) { @@ -186,7 +186,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri return xChild; } -//----------------------------------------------- + StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath) { OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); @@ -230,7 +230,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP return lStoragesOfPath; } -//----------------------------------------------- + void StorageHolder::commitPath(const OUString& sPath) { StorageHolder::TStorageList lStorages = getAllPathStorages(sPath); @@ -257,7 +257,7 @@ void StorageHolder::commitPath(const OUString& sPath) xCommit->commit(); } -//----------------------------------------------- + void StorageHolder::closePath(const OUString& rPath) { OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); @@ -307,7 +307,7 @@ void StorageHolder::closePath(const OUString& rPath) // <- SAFE ------------------------------ } -//----------------------------------------------- + void StorageHolder::notifyPath(const OUString& sPath) { OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); @@ -334,7 +334,7 @@ void StorageHolder::notifyPath(const OUString& sPath) // <- SAFE ------------------------------ } -//----------------------------------------------- + void StorageHolder::addStorageListener( IStorageListener* pListener, const OUString& sPath ) { @@ -356,7 +356,7 @@ void StorageHolder::addStorageListener( IStorageListener* pListener, // <- SAFE ------------------------------ } -//----------------------------------------------- + void StorageHolder::removeStorageListener( IStorageListener* pListener, const OUString& sPath ) { @@ -378,7 +378,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, // <- SAFE ------------------------------ } -//----------------------------------------------- + OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) { // SAFE -> ------------------------------ @@ -402,14 +402,14 @@ OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed:: // <- SAFE ------------------------------ } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild) { OUString sChildPath = getPathOfStorage(xChild); return getParentStorage(sChildPath); } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath) { // normed path = "a/b/c/" ... we search for "a/b/" @@ -453,7 +453,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons return css::uno::Reference< css::embed::XStorage >(); } -//----------------------------------------------- + void StorageHolder::operator=(const StorageHolder& rCopy) { // SAFE -> ---------------------------------- @@ -466,7 +466,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy) // <- SAFE ---------------------------------- } -//----------------------------------------------- + css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStorage , sal_Int32 eOpenMode , @@ -506,7 +506,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal return css::uno::Reference< css::embed::XStorage >(); } -//----------------------------------------------- + css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStream , sal_Int32 eOpenMode , @@ -546,7 +546,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback return css::uno::Reference< css::io::XStream >(); } -//----------------------------------------------- + OUString StorageHolder::impl_st_normPath(const OUString& sPath) { // path must start without "/" but end with "/"! @@ -568,7 +568,7 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath) return sNormedPath; } -//----------------------------------------------- + OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath) { OUStringList lToken; diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 5ca707a083b0..e0dca444282e 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -55,7 +55,7 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) : { } -// ----------------------------------------------------------------------- + void FwkTabControl::BroadcastEvent( sal_uLong nEvent ) { @@ -83,7 +83,7 @@ FwkTabPage::FwkTabPage( { } -// ----------------------------------------------------------------------- + FwkTabPage::~FwkTabPage() { @@ -91,7 +91,7 @@ FwkTabPage::~FwkTabPage() DeactivatePage(); } -// ----------------------------------------------------------------------- + void FwkTabPage::CreateDialog() { @@ -130,7 +130,7 @@ void FwkTabPage::CreateDialog() } } -// ----------------------------------------------------------------------- + sal_Bool FwkTabPage::CallMethod( const OUString& rMethod ) { @@ -149,7 +149,7 @@ sal_Bool FwkTabPage::CallMethod( const OUString& rMethod ) return bRet; } -// ----------------------------------------------------------------------- + void FwkTabPage::ActivatePage() { @@ -165,7 +165,7 @@ void FwkTabPage::ActivatePage() } } -// ----------------------------------------------------------------------- + void FwkTabPage::DeactivatePage() { @@ -175,7 +175,7 @@ void FwkTabPage::DeactivatePage() m_xPage->setVisible( sal_False ); } -// ----------------------------------------------------------------------- + void FwkTabPage::Resize() { @@ -204,14 +204,14 @@ FwkTabWindow::FwkTabWindow( Window* pParent ) : m_aTabCtrl.Show(); } -// ----------------------------------------------------------------------- + FwkTabWindow::~FwkTabWindow() { ClearEntryList(); } -// ----------------------------------------------------------------------- + void FwkTabWindow::ClearEntryList() { @@ -226,7 +226,7 @@ void FwkTabWindow::ClearEntryList() m_TabList.clear(); } -// ----------------------------------------------------------------------- + bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex ) { @@ -249,7 +249,7 @@ bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex ) return false; } -// ----------------------------------------------------------------------- + TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const { TabEntry* pEntry = NULL; @@ -269,7 +269,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const return pEntry; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) { @@ -293,7 +293,7 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl) { @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl) return 1; } -// ----------------------------------------------------------------------- + void FwkTabWindow::AddEventListener( const Link& rEventListener ) { @@ -313,7 +313,7 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener ) m_aTabCtrl.RemoveEventListener( rEventListener ); } -// ----------------------------------------------------------------------- + FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties ) { @@ -356,7 +356,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea return pEntry->m_pPage; } -// ----------------------------------------------------------------------- + void FwkTabWindow::ActivatePage( sal_Int32 nIndex ) { @@ -364,7 +364,7 @@ void FwkTabWindow::ActivatePage( sal_Int32 nIndex ) ActivatePageHdl( &m_aTabCtrl ); } -// ----------------------------------------------------------------------- + void FwkTabWindow::RemovePage( sal_Int32 nIndex ) { @@ -377,7 +377,7 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex ) } } -// ----------------------------------------------------------------------- + void FwkTabWindow::Resize() { Size aPageSize = GetSizePixel(); diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 30fd281d93c4..a5e1552c8b6e 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -41,7 +41,7 @@ ResMgr* FwlResId::GetResManager() return pResMgr; } -// ----------------------------------------------------------------------- + FwlResId::FwlResId( sal_uInt16 nId ) : ResId( nId, *FwlResId::GetResManager() ) diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 6bacf4ed174f..57eeb412cae1 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -720,9 +720,9 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, } -//_________________________________________________________________________________________________________________ + // vcl handler -//_________________________________________________________________________________________________________________ + IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) { diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 5f6ab50f5b8e..696a7518ded8 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -57,7 +57,7 @@ const char URL_CLOSEWIN[] = ".uno:CloseWin"; const char URL_CLOSEFRAME[] = ".uno:CloseFrame"; -//----------------------------------------------- + CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) @@ -81,12 +81,12 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent } } -//----------------------------------------------- + CloseDispatcher::~CloseDispatcher() { } -//----------------------------------------------- + void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException) @@ -94,7 +94,7 @@ void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } -//----------------------------------------------- + css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups() throw(css::uno::RuntimeException) { @@ -104,7 +104,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro return lGroups; } -//----------------------------------------------- + css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw(css::uno::RuntimeException) { @@ -129,21 +129,21 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: return css::uno::Sequence< css::frame::DispatchInformation >(); } -//----------------------------------------------- + void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException) { } -//----------------------------------------------- + void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException) { } -//----------------------------------------------- + void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) @@ -231,7 +231,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& m_aAsyncCallback.Post(0); } -//----------------------------------------------- + /** @short asynchronous callback @descr We start all actions inside this object asnychronoue. @@ -433,7 +433,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) return 0; } -//----------------------------------------------- + sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame , sal_Bool bAllowSuspend , sal_Bool bCloseAllOtherViewsToo, @@ -486,7 +486,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc return sal_True; } -//----------------------------------------------- + sal_Bool CloseDispatcher::implts_closeFrame() { // SAFE -> ---------------------------------- @@ -514,7 +514,7 @@ sal_Bool CloseDispatcher::implts_closeFrame() return sal_True; } -//----------------------------------------------- + sal_Bool CloseDispatcher::implts_establishBackingMode() { // SAFE -> ---------------------------------- @@ -545,7 +545,7 @@ sal_Bool CloseDispatcher::implts_establishBackingMode() return sal_True; } -//----------------------------------------------- + sal_Bool CloseDispatcher::implts_terminateApplication() { // SAFE -> ---------------------------------- @@ -559,7 +559,7 @@ sal_Bool CloseDispatcher::implts_terminateApplication() return xDesktop->terminate(); } -//----------------------------------------------- + void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , const css::uno::Any& aResult ) @@ -575,7 +575,7 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css xListener->dispatchFinished(aEvent); } -//----------------------------------------------- + css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) { diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index d1f385b9f926..e65b925a22d7 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -32,7 +32,7 @@ namespace framework{ -//_________________________________________________________________________________________________________________ + DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) : ThreadHelpBase(&Application::GetSolarMutex()) @@ -41,12 +41,12 @@ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Referen { } -//_________________________________________________________________________________________________________________ + DispatchInformationProvider::~DispatchInformationProvider() { } -//_________________________________________________________________________________________________________________ + css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups() throw (css::uno::RuntimeException) { @@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport return lGroups.getAsConstList(); } -//_________________________________________________________________________________________________________________ + css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException) { @@ -128,7 +128,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati return lReturn; } -//_________________________________________________________________________________________________________________ + css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > DispatchInformationProvider::implts_getAllSubProvider() { // SAFE -> ---------------------------------- diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 8a6327d3d914..8ef54766be83 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -185,27 +185,27 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt return NULL; } - //----------------------------------------------------------------------------------------------------- + // I) handle special cases which not right for using findFrame() first - //----------------------------------------------------------------------------------------------------- - //----------------------------------------------------------------------------------------------------- + + // I.I) "_blank" // It's not the right place to create a new task here - because we are queried for a dispatch object // only, which can handle such request. Such dispatcher should create the required task on demand. // Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly // here. Thats why we must "intercept" here. - //----------------------------------------------------------------------------------------------------- + if (sTargetFrameName==SPECIALTARGET_BLANK) { if (implts_isLoadableContent(aURL)) xDispatcher = implts_getOrCreateDispatchHelper( E_BLANKDISPATCHER, xDesktop ); } - //----------------------------------------------------------------------------------------------------- + // I.II) "_default" // This is a combination of search an empty task for recycling - or create a new one. - //----------------------------------------------------------------------------------------------------- + else if (sTargetFrameName==SPECIALTARGET_DEFAULT) { if (implts_isLoadableContent(aURL)) @@ -215,12 +215,12 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop ); } - //----------------------------------------------------------------------------------------------------- + // I.III) "_self", "", "_top" // The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ... // Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous // to use this target - but we can handle it in the same manner then "_self". - //----------------------------------------------------------------------------------------------------- + else if ( (sTargetFrameName==SPECIALTARGET_SELF) || (sTargetFrameName==SPECIALTARGET_TOP ) || @@ -230,12 +230,12 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = implts_searchProtocolHandler(aURL); } - //----------------------------------------------------------------------------------------------------- + // I.IV) no further special targets exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. // I said it b efore - it's allowed for dispatch() only. - //----------------------------------------------------------------------------------------------------- + else { sal_Int32 nRightFlags = nSearchFlags; @@ -257,7 +257,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt return xDispatcher; } -//_________________________________________________________________________________________________________________ + css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame , const css::util::URL& aURL , @@ -266,23 +266,23 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatch > xDispatcher; - //----------------------------------------------------------------------------------------------------- + // 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default target "". // But they are specified to use her own fix target. Detect such URLs here and use the correct target. - //----------------------------------------------------------------------------------------------------- + OUString sTargetName = sTargetFrameName; - //----------------------------------------------------------------------------------------------------- + // I) handle special cases which not right for using findFrame() first - //----------------------------------------------------------------------------------------------------- - //----------------------------------------------------------------------------------------------------- + + // I.I) "_blank", "_default" // It's not the right place to create a new task here. Only the desktop can do that. // Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly // here. Thats why we must "intercept" here. - //----------------------------------------------------------------------------------------------------- + if ( (sTargetName==SPECIALTARGET_BLANK ) || (sTargetName==SPECIALTARGET_DEFAULT) @@ -293,20 +293,20 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // it's a special target - ignore search flags } - //----------------------------------------------------------------------------------------------------- + // I.II) "_menubar" // Special mode on frame or task to receive the local menu. Not supported by findFrame() - //----------------------------------------------------------------------------------------------------- + else if (sTargetName==SPECIALTARGET_MENUBAR) { xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER, xFrame ); } - //----------------------------------------------------------------------------------------------------- + // I.IV) "_beamer" // Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI. // Only the sfx (means the controller) can create it it. - //----------------------------------------------------------------------------------------------------- + else if (sTargetName==SPECIALTARGET_BEAMER) { css::uno::Reference< css::frame::XDispatchProvider > xBeamer( xFrame->findFrame( SPECIALTARGET_BEAMER, css::frame::FrameSearchFlag::CHILDREN | css::frame::FrameSearchFlag::SELF ), css::uno::UNO_QUERY ); @@ -324,10 +324,10 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - //----------------------------------------------------------------------------------------------------- + // I.V) "_parent" // Our parent frame (if it exist) should handle this URL. - //----------------------------------------------------------------------------------------------------- + else if (sTargetName==SPECIALTARGET_PARENT) { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); @@ -336,11 +336,11 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0); } - //----------------------------------------------------------------------------------------------------- + // I.VI) "_top" // This request must be forwarded to any parent frame, till we reach a top frame. // If no parent exist, we can handle itself. - //----------------------------------------------------------------------------------------------------- + else if (sTargetName==SPECIALTARGET_TOP) { if (xFrame->isTop()) @@ -360,13 +360,13 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - //----------------------------------------------------------------------------------------------------- + // I.VII) "_self", "" // Our owner frame should handle this URL. But we can't do it for all of them. // So we ask the internal setted controller first. If he disagree we try to find a registered // protocol handler. If this failed too - we check for a loadable content and in case of true // we load it into the frame by returning specilized dispatch object. - //----------------------------------------------------------------------------------------------------- + else if ( (sTargetName==SPECIALTARGET_SELF) || (sTargetName.isEmpty()) @@ -421,12 +421,12 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame } } - //----------------------------------------------------------------------------------------------------- + // I.VI) no further special handlings exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. // I said it before - it's allowed for dispatch() only. - //----------------------------------------------------------------------------------------------------- + else { sal_Int32 nRightFlags = nSearchFlags; @@ -467,7 +467,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame return xDispatcher; } -//_________________________________________________________________________________________________________________ + /** @short search for a registered protocol handler and ask him for a dispatch object @@ -535,7 +535,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt return xDispatcher; } -//_________________________________________________________________________________________________________________ + /** @short get or create new dispatch helper @@ -646,7 +646,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat return xDispatchHelper; } -//_________________________________________________________________________________________________________________ + /** @short check URL for support by our used loader or handler diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 1b51d5c535e3..80d642d0962e 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -30,7 +30,7 @@ namespace framework{ -//_________________________________________________________________________________________________________________ + // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher , @@ -48,7 +48,7 @@ DEFINE_INIT_SERVICE(MailToDispatcher, } ) -//_________________________________________________________________________________________________________________ + /** @short standard ctor @@ -65,7 +65,7 @@ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XCompon { } -//_________________________________________________________________________________________________________________ + /** @short standard dtor @@ -76,7 +76,7 @@ MailToDispatcher::~MailToDispatcher() m_xContext = NULL; } -//_________________________________________________________________________________________________________________ + /** @short decide if this dispatch implementation can be used for requested URL or not @@ -97,7 +97,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis return xDispatcher; } -//_________________________________________________________________________________________________________________ + /** @short do the same like dispatch() but for multiple requests at the same time @@ -117,7 +117,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail return lDispatcher; } -//_________________________________________________________________________________________________________________ + /** @short dispatch URL with arguments @@ -140,7 +140,7 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& // No notification for status listener! } -//_________________________________________________________________________________________________________________ + /** @short dispatch with guaranteed notifications about success @@ -177,7 +177,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& } } -//_________________________________________________________________________________________________________________ + /** @short threadsafe helper for dispatch calls @@ -226,7 +226,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& return bSuccess; } -//_________________________________________________________________________________________________________________ + /** @short add/remove listener for state events @@ -245,7 +245,7 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs // not suported yet } -//_________________________________________________________________________________________________________________ + void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 65652772f1f4..bd4f2ccc104a 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -32,7 +32,7 @@ namespace framework{ #define PROTOCOL_VALUE "service:" #define PROTOCOL_LENGTH 8 -//_________________________________________________________________________________________________________________ + // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE(ServiceHandler , @@ -50,7 +50,7 @@ DEFINE_INIT_SERVICE(ServiceHandler, } ) -//_________________________________________________________________________________________________________________ + /** @short standard ctor @@ -67,7 +67,7 @@ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServ { } -//_________________________________________________________________________________________________________________ + /** @short standard dtor @@ -78,7 +78,7 @@ ServiceHandler::~ServiceHandler() m_xFactory = NULL; } -//_________________________________________________________________________________________________________________ + /** @short decide if this dispatch implementation can be used for requested URL or not @@ -99,7 +99,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa return xDispatcher; } -//_________________________________________________________________________________________________________________ + /** @short do the same like dispatch() but for multiple requests at the same time @@ -119,7 +119,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv return lDispatcher; } -//_________________________________________________________________________________________________________________ + /** @short dispatch URL with arguments @@ -141,7 +141,7 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL& // No notification for status listener! } -//_________________________________________________________________________________________________________________ + /** @short dispatch with guaranteed notifications about success @@ -179,7 +179,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& } } -//_________________________________________________________________________________________________________________ + /** @short threadsafe helper for dispatch calls @@ -256,7 +256,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con return xService; } -//_________________________________________________________________________________________________________________ + /** @short add/remove listener for state events @@ -275,7 +275,7 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css: // not suported yet } -//_________________________________________________________________________________________________________________ + void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 1c9e51185bd1..a7627ab17580 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -53,7 +53,7 @@ namespace framework{ namespace fpf = ::framework::pattern::frame; -//----------------------------------------------- + StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , const OUString& sTarget) @@ -65,12 +65,12 @@ StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno { } -//----------------------------------------------- + StartModuleDispatcher::~StartModuleDispatcher() { } -//----------------------------------------------- + void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException) @@ -78,7 +78,7 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } -//----------------------------------------------- + void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) @@ -98,35 +98,35 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U implts_notifyResultListener(xListener, nResult, css::uno::Any()); } -//----------------------------------------------- + css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups() throw(css::uno::RuntimeException) { return css::uno::Sequence< ::sal_Int16 >(); } -//----------------------------------------------- + css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/) throw(css::uno::RuntimeException) { return css::uno::Sequence< css::frame::DispatchInformation >(); } -//----------------------------------------------- + void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException) { } -//----------------------------------------------- + void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) throw(css::uno::RuntimeException) { } -//----------------------------------------------- + ::sal_Bool StartModuleDispatcher::implts_isBackingModePossible () { if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) @@ -160,7 +160,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere return bIsPossible; } -//----------------------------------------------- + ::sal_Bool StartModuleDispatcher::implts_establishBackingMode() { // SAFE -> ---------------------------------- @@ -182,7 +182,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere return sal_True; } -//----------------------------------------------- + void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, ::sal_Int16 nState , const css::uno::Any& aResult ) diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 717011ca8dde..cd6d9d83736a 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -36,7 +36,7 @@ namespace framework{ #define PROTOCOL_VALUE "systemexecute:" #define PROTOCOL_LENGTH 14 -//_________________________________________________________________________________________________________________ + // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec , @@ -54,7 +54,7 @@ DEFINE_INIT_SERVICE(SystemExec, } ) -//_________________________________________________________________________________________________________________ + SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) // Init baseclasses first @@ -64,14 +64,14 @@ SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext > { } -//_________________________________________________________________________________________________________________ + SystemExec::~SystemExec() { m_xContext = NULL; } -//_________________________________________________________________________________________________________________ + css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL , const OUString&, @@ -83,7 +83,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( return xDispatcher; } -//_________________________________________________________________________________________________________________ + css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) { @@ -99,7 +99,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst return lDispatcher; } -//_________________________________________________________________________________________________________________ + void SAL_CALL SystemExec::dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) @@ -107,7 +107,7 @@ void SAL_CALL SystemExec::dispatch( const css::util::URL& dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } -//_________________________________________________________________________________________________________________ + void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >&, @@ -147,7 +147,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& } } -//_________________________________________________________________________________________________________________ + void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw( css::uno::RuntimeException ) @@ -155,7 +155,7 @@ void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::fra // not suported yet } -//_________________________________________________________________________________________________________________ + void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw( css::uno::RuntimeException ) @@ -163,7 +163,7 @@ void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css:: // not suported yet } -//_________________________________________________________________________________________________________________ + void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, const sal_Int16 nState ) diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 44a381c48a1e..d19695d0bd69 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -38,7 +38,7 @@ namespace framework{ -//----------------------------------------------- + WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext , const css::uno::Reference< css::frame::XFrame >& xFrame) : ThreadHelpBase( ) @@ -49,14 +49,14 @@ WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno impl_startListening(); } -//----------------------------------------------- + WindowCommandDispatch::~WindowCommandDispatch() { impl_stopListening(); m_xContext.clear(); } -//----------------------------------------------- + void WindowCommandDispatch::impl_startListening() { ReadGuard aReadLock(m_aLock); @@ -100,7 +100,7 @@ void WindowCommandDispatch::impl_stopListening() } -//----------------------------------------------- + IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) { if ( ! pParam) @@ -145,7 +145,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) return 0L; } -//----------------------------------------------- + void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand) { // ignore all errors here. It's clicking a menu entry only ... diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 3fb7b8a90914..11c5685ca1c9 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -65,9 +65,9 @@ AddonMenu::~AddonMenu() } } -// ------------------------------------------------------------------------ -// ------------------------------------------------------------------------ + + // Check if command URL string has the unique prefix to identify addon popup menus sal_Bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) { @@ -85,7 +85,7 @@ AddonPopupMenu::~AddonPopupMenu() { } -// ------------------------------------------------------------------------ + static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame ) { @@ -101,7 +101,7 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame return xModel; } -// ------------------------------------------------------------------------ + sal_Bool AddonMenuManager::HasAddonMenuElements() { diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index a22ea22d821d..3ed1f1b6f7e7 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -38,9 +38,9 @@ #include <algorithm> #include <vector> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::std ; using namespace ::utl ; @@ -192,9 +192,9 @@ using namespace ::com::sun::star; #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -//_________________________________________________________________________________________________________________ + // private declarations! -//_________________________________________________________________________________________________________________ + /*-**************************************************************************************************************** @descr struct to hold information about one menu entry. @@ -205,21 +205,21 @@ namespace framework class AddonsOptions_Impl : public ConfigItem { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- + AddonsOptions_Impl(); ~AddonsOptions_Impl(); - //--------------------------------------------------------------------------------------------------------- + // overloaded methods of baseclass - //--------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short called for notify of configmanager @@ -252,9 +252,9 @@ class AddonsOptions_Impl : public ConfigItem virtual void Commit(); - //--------------------------------------------------------------------------------------------------------- + // public interface - //--------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short base implementation of public interface for "SvtDynamicMenuOptions"! @@ -282,9 +282,9 @@ class AddonsOptions_Impl : public ConfigItem const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const; void ReadConfigurationData(); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: enum ImageSize @@ -361,9 +361,9 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const; sal_Bool CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const; - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName ); diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 4d49b4ee4168..622fcaab13a7 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -88,7 +88,7 @@ sal_uInt16 BmkMenu_Impl::GetMID() return m_nMID; } -// ------------------------------------------------------------------------ + BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :AddonMenu(xFrame) diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index aae1aa421e5d..2aad958b80c5 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -175,7 +175,7 @@ void FrameListAnalyzer::impl_analyze() SAL_INFO("fwk", "FrameListAnalyzer::impl_analyze(): ZOMBIE!"); } - // ------------------------------------------------- + // a) Is it the special help task? // Return it separated from any return list. if ( @@ -187,7 +187,7 @@ void FrameListAnalyzer::impl_analyze() continue; } - // ------------------------------------------------- + // b) Or is includes this task the special backing component? // Return it separated from any return list. // But check if the reference task itself is the backing frame. @@ -210,7 +210,7 @@ void FrameListAnalyzer::impl_analyze() } } - // ------------------------------------------------- + // c) Or is it the a task, which uses the specified model? // Add it to the list of "model frames". if ((m_eDetectMode & E_MODEL) == E_MODEL) @@ -227,11 +227,11 @@ void FrameListAnalyzer::impl_analyze() } } - // ------------------------------------------------- + // d) Or is it the a task, which use another or no model at all? // Add it to the list of "other frames". But look for it's // visible state ... if it's allowed to do so. - // ------------------------------------------------- + sal_Bool bHidden = sal_False; if ((m_eDetectMode & E_HIDDEN) == E_HIDDEN ) { diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index 4316f8f1a545..e428fb5e600d 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -41,7 +41,7 @@ ResMgr* FwkResId::GetResManager() return pResMgr; } -// ----------------------------------------------------------------------- + FwkResId::FwkResId( sal_uInt16 nId ) : ResId( nId, *FwkResId::GetResManager() ) diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index c70b608ee3d8..61dc5bed6b97 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -63,25 +63,25 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st }; // class ContinuationFilterSelect -//--------------------------------------------------------------------------------------------------------- + // initialize continuation with right start values -//--------------------------------------------------------------------------------------------------------- + ContinuationFilterSelect::ContinuationFilterSelect() : m_sFilter( OUString() ) { } -//--------------------------------------------------------------------------------------------------------- + // handler should use it after selection to set user specified filter for transport -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException ) { m_sFilter = sFilter; } -//--------------------------------------------------------------------------------------------------------- + // read access to transported filter -//--------------------------------------------------------------------------------------------------------- + OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) { return m_sFilter; @@ -105,10 +105,10 @@ private: ContinuationFilterSelect* m_pFilter; }; -//--------------------------------------------------------------------------------------------------------- + // initialize instance with all necessary information // We use it without any further checks on our member then ...! -//--------------------------------------------------------------------------------------------------------- + RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) { OUString temp; @@ -126,39 +126,39 @@ RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL ) m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter ); } -//--------------------------------------------------------------------------------------------------------- + // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- + sal_Bool RequestFilterSelect_Impl::isAbort() const { return m_pAbort->wasSelected(); } -//--------------------------------------------------------------------------------------------------------- + // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- + OUString RequestFilterSelect_Impl::getFilter() const { return m_pFilter->getFilter(); } -//--------------------------------------------------------------------------------------------------------- + // handler call it to get type of request // Is hard coded to "please select filter" here. see ctor for further information. -//--------------------------------------------------------------------------------------------------------- + css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException ) { return m_aRequest; } -//--------------------------------------------------------------------------------------------------------- + // handler call it to get possible continuations // We support "abort/select_filter" only here. // After interaction we support read access on these continuations on our c++ interface to // return user decision. -//--------------------------------------------------------------------------------------------------------- + css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException ) { return m_lContinuations; @@ -177,19 +177,19 @@ RequestFilterSelect::~RequestFilterSelect() } -//--------------------------------------------------------------------------------------------------------- + // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! -//--------------------------------------------------------------------------------------------------------- + sal_Bool RequestFilterSelect::isAbort() const { return pImp->isAbort(); } -//--------------------------------------------------------------------------------------------------------- + // return user selected filter // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony! -//--------------------------------------------------------------------------------------------------------- + OUString RequestFilterSelect::getFilter() const { return pImp->getFilter(); diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 6ccd422bfeeb..70108d6cec9c 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -44,9 +44,9 @@ using namespace com::sun::star::container; namespace framework { -// ---------------------------------------------------------------------------- + // implementation helper ( menu => ActionTrigger ) -// ---------------------------------------------------------------------------- + sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet ) { @@ -238,9 +238,9 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC } -// ---------------------------------------------------------------------------- + // implementation helper ( ActionTrigger => menu ) -// ---------------------------------------------------------------------------- + Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException ) { diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index cec4c0a253a3..2e839c62ee9a 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -110,84 +110,84 @@ namespace framework bool m_documentDisposed; }; - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; // not interested in } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; m_nRelativeContextDepth = 0; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException) { (void)i_event; @@ -205,7 +205,7 @@ namespace framework namespace { - //-------------------------------------------------------------------------------------------------------------- + void lcl_init( DocumentUndoGuard_Data& i_data, const Reference< XInterface >& i_undoSupplierComponent ) { try @@ -223,7 +223,7 @@ namespace framework } } - //-------------------------------------------------------------------------------------------------------------- + void lcl_restore( DocumentUndoGuard_Data& i_data ) { try @@ -242,7 +242,7 @@ namespace framework //================================================================================================================== //= DocumentUndoGuard //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent ) :m_pData( new DocumentUndoGuard_Data ) { diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b02549db16b1..9588a0af6905 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -38,7 +38,7 @@ namespace framework{ -//----------------------------------------------- + TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext) : ::cppu::BaseMutex () , m_xContext (rxContext) @@ -52,12 +52,12 @@ TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext { } -//----------------------------------------------- + TitleHelper::~TitleHelper() { } -//----------------------------------------------- + void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner) { // SYNCHRONIZED -> @@ -90,7 +90,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO } } -//----------------------------------------------- + OUString SAL_CALL TitleHelper::getTitle() throw (css::uno::RuntimeException) { @@ -115,7 +115,7 @@ OUString SAL_CALL TitleHelper::getTitle() // <- SYNCHRONIZED } -//----------------------------------------------- + void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers) { // SYNCHRONIZED -> @@ -126,7 +126,7 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr // <- SYNCHRONIZED } -//----------------------------------------------- + void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) throw (css::uno::RuntimeException) { @@ -142,7 +142,7 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException) { @@ -150,7 +150,7 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } -//----------------------------------------------- + void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException) { @@ -158,7 +158,7 @@ void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< m_aListener.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } -//----------------------------------------------- + void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException) { @@ -176,7 +176,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv impl_updateTitle (); } -//----------------------------------------------- + void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException) { @@ -204,7 +204,7 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) impl_updateTitle (); } -//----------------------------------------------- + void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException) { @@ -232,7 +232,7 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven } } -//----------------------------------------------- + void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) throw (css::uno::RuntimeException) { @@ -268,7 +268,7 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void TitleHelper::impl_sendTitleChangedEvent () { // SYNCHRONIZED -> @@ -297,7 +297,7 @@ void TitleHelper::impl_sendTitleChangedEvent () } } -//----------------------------------------------- + void TitleHelper::impl_updateTitle (bool init) { // SYNCHRONIZED -> @@ -324,7 +324,7 @@ void TitleHelper::impl_updateTitle (bool init) } } -//----------------------------------------------- + void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel, bool init) { // SYNCHRONIZED -> @@ -395,7 +395,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController, bool init) { // SYNCHRONIZED -> @@ -461,7 +461,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: impl_sendTitleChangedEvent (); } -//----------------------------------------------- + void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame, bool init) { if ( ! xFrame.is ()) @@ -582,7 +582,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer&) } #endif -//----------------------------------------------- + void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel) { css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY); @@ -592,28 +592,28 @@ void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::f xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this)); } -//----------------------------------------------- + void TitleHelper::impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController) { css::uno::Reference< css::frame::XTitle > xSubTitle(xController->getModel (), css::uno::UNO_QUERY); impl_setSubTitle (xSubTitle); } -//----------------------------------------------- + void TitleHelper::impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame) { xFrame->addFrameActionListener(this ); impl_updateListeningForFrame (xFrame); } -//----------------------------------------------- + void TitleHelper::impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XTitle > xSubTitle(xFrame->getController (), css::uno::UNO_QUERY); impl_setSubTitle (xSubTitle); } -//----------------------------------------------- + void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle) { // SYNCHRONIZED -> @@ -640,7 +640,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl xNewBroadcaster->addTitleChangeListener (xThis); } -//----------------------------------------------- + OUString TitleHelper::impl_convertURL2Title(const OUString& sURL) { INetURLObject aURL (sURL); diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 793b6bd04f9e..129dfe517bd6 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -85,7 +85,7 @@ namespace framework const Reference< XUndoAction > m_xUndoAction; }; - //------------------------------------------------------------------------------------------------------------------ + UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction ) :SfxUndoAction() ,m_xUndoAction( i_undoAction ) @@ -93,7 +93,7 @@ namespace framework ENSURE_OR_THROW( m_xUndoAction.is(), "illegal undo action" ); } - //------------------------------------------------------------------------------------------------------------------ + UndoActionWrapper::~UndoActionWrapper() { try @@ -108,7 +108,7 @@ namespace framework } } - //------------------------------------------------------------------------------------------------------------------ + OUString UndoActionWrapper::GetComment() const { OUString sComment; @@ -123,19 +123,19 @@ namespace framework return sComment; } - //------------------------------------------------------------------------------------------------------------------ + void UndoActionWrapper::Undo() { m_xUndoAction->undo(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoActionWrapper::Redo() { m_xUndoAction->redo(); } - //------------------------------------------------------------------------------------------------------------------ + bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const { return false; @@ -195,7 +195,7 @@ namespace framework ::osl::Condition m_finishCondition; }; - //------------------------------------------------------------------------------------------------------------------ + //================================================================================================================== //= UndoManagerHelper_Impl @@ -329,7 +329,7 @@ namespace framework void impl_reset(); }; - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::disposing() { EventObject aEvent; @@ -344,7 +344,7 @@ namespace framework m_disposed = true; } - //------------------------------------------------------------------------------------------------------------------ + UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const { UndoManagerEvent aEvent; @@ -354,14 +354,14 @@ namespace framework return aEvent; } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_notifyModified() { const EventObject aEvent( getXUndoManager() ); m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvent ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::notify( OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) { @@ -377,7 +377,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ) { const EventObject aEvent( getXUndoManager() ); @@ -388,7 +388,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -402,7 +402,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -414,7 +414,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { if ( !i_action.is() ) @@ -434,7 +434,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -446,7 +446,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -458,7 +458,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -470,7 +470,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::lock() { // SYNCHRONIZED ---> @@ -484,7 +484,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::unlock() { // SYNCHRONIZED ---> @@ -501,7 +501,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock ) { // create the request, and add it to our queue @@ -563,7 +563,7 @@ namespace framework while ( true ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_enterUndoContext( const OUString& i_title, const bool i_hidden ) { // SYNCHRONIZED ---> @@ -595,7 +595,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_leaveUndoContext() { // SYNCHRONIZED ---> @@ -655,7 +655,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo ) { ::osl::Guard< ::framework::IMutex > aExternalGuard( i_externalLock.getGuardedMutex() ); @@ -703,7 +703,7 @@ namespace framework // So, we do not need to do this notification here ourself. } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_addUndoAction( const Reference< XUndoAction >& i_action ) { // SYNCHRONIZED ---> @@ -733,7 +733,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_clear() { // SYNCHRONIZED ---> @@ -756,7 +756,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_clearRedo() { // SYNCHRONIZED ---> @@ -779,7 +779,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_reset() { // SYNCHRONIZED ---> @@ -799,7 +799,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -810,7 +810,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment ) { UndoManagerEvent aEvent; @@ -821,7 +821,7 @@ namespace framework impl_notifyModified(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment ) { if ( m_bAPIActionRunning ) @@ -830,7 +830,7 @@ namespace framework notify( i_actionComment, &XUndoManagerListener::undoActionAdded ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::cleared() { if ( m_bAPIActionRunning ) @@ -839,7 +839,7 @@ namespace framework notify( &XUndoManagerListener::allActionsCleared ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clearedRedo() { if ( m_bAPIActionRunning ) @@ -848,7 +848,7 @@ namespace framework notify( &XUndoManagerListener::redoActionsCleared ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::resetAll() { if ( m_bAPIActionRunning ) @@ -857,7 +857,7 @@ namespace framework notify( &XUndoManagerListener::resetAll ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -870,7 +870,7 @@ namespace framework notify( i_comment, &XUndoManagerListener::enteredContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment ) { #if OSL_DEBUG_LEVEL > 0 @@ -885,7 +885,7 @@ namespace framework notify( i_comment, &XUndoManagerListener::leftContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionLeftAndMerged() { #if OSL_DEBUG_LEVEL > 0 @@ -900,7 +900,7 @@ namespace framework notify( &XUndoManagerListener::leftHiddenContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::listActionCancelled() { #if OSL_DEBUG_LEVEL > 0 @@ -915,7 +915,7 @@ namespace framework notify( &XUndoManagerListener::cancelledContext ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::undoManagerDying() { // TODO: do we need to care? Or is this the responsibility of our owner? @@ -924,42 +924,42 @@ namespace framework //================================================================================================================== //= UndoManagerHelper //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl ) :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) ) { } - //------------------------------------------------------------------------------------------------------------------ + UndoManagerHelper::~UndoManagerHelper() { } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::disposing() { m_pImpl->disposing(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( i_title, false, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( OUString(), true, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->leaveUndoContext( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -973,7 +973,7 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock ) { impl_processRequest( @@ -987,25 +987,25 @@ namespace framework ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { m_pImpl->addUndoAction( i_action, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::undo( IMutexGuard& i_instanceLock ) { m_pImpl->undo( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::redo( IMutexGuard& i_instanceLock ) { m_pImpl->redo( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool UndoManagerHelper::isUndoPossible() const { // SYNCHRONIZED ---> @@ -1017,7 +1017,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool UndoManagerHelper::isRedoPossible() const { // SYNCHRONIZED ---> @@ -1029,7 +1029,7 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + namespace { //.............................................................................................................. @@ -1077,61 +1077,61 @@ namespace framework } } - //------------------------------------------------------------------------------------------------------------------ + OUString UndoManagerHelper::getCurrentUndoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, true ); } - //------------------------------------------------------------------------------------------------------------------ + OUString UndoManagerHelper::getCurrentRedoActionTitle() const { return lcl_getCurrentActionTitle( *m_pImpl, false ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > UndoManagerHelper::getAllUndoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, true ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > UndoManagerHelper::getAllRedoActionTitles() const { return lcl_getAllActionTitles( *m_pImpl, false ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::clear( IMutexGuard& i_instanceLock ) { m_pImpl->clear( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock ) { m_pImpl->clearRedo( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::reset( IMutexGuard& i_instanceLock ) { m_pImpl->reset( i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::lock() { m_pImpl->lock(); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::unlock() { m_pImpl->unlock(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool UndoManagerHelper::isLocked() { // SYNCHRONIZED ---> @@ -1142,28 +1142,28 @@ namespace framework // <--- SYNCHRONIZED } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->addUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->removeUndoManagerListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::addModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) m_pImpl->addModifyListener( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::removeModifyListener( const Reference< XModifyListener >& i_listener ) { if ( i_listener.is() ) diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 1a1d9831c65f..f6124b96e943 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -31,13 +31,13 @@ PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Referen { } -//_________________________________________________________________________________________________________________ + PreventDuplicateInteraction::~PreventDuplicateInteraction() { } -//_________________________________________________________________________________________________________________ + void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler) { @@ -48,7 +48,7 @@ void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::tas // <- SAFE } -//_________________________________________________________________________________________________________________ + void PreventDuplicateInteraction::useDefaultUUIHandler() { @@ -66,7 +66,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler() // <- SAFE } -//_________________________________________________________________________________________________________________ + css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException) { @@ -80,7 +80,7 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u return ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >::queryInterface( aType ); } -//_________________________________________________________________________________________________________________ + void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) throw(css::uno::RuntimeException) @@ -136,7 +136,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css } } -//_________________________________________________________________________________________________________________ + ::sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw (css::uno::RuntimeException) @@ -195,7 +195,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css return false; } -//_________________________________________________________________________________________________________________ + void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo) { @@ -222,7 +222,7 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter // <- SAFE } -//_________________________________________________________________________________________________________________ + sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type& aInteraction, PreventDuplicateInteraction::InteractionInfo* pReturn ) const diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 3b81cbad5a9d..1be57a8b96ee 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -83,9 +83,9 @@ static const char CMD_PROTOCOL[] = ".uno:"; static const char ADDDIRECT_CMD[] = ".uno:AddDirect" ; static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ; -//_________________________________________________________________________________________________________________ + // using namespaces -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -151,7 +151,7 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, } -// ----------------------------------------------------------------------------- + // Base class implementation ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : @@ -222,7 +222,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT; } -// ----------------------------------------------------------------------------- + OReadMenuDocumentHandler::OReadMenuDocumentHandler( const Reference< XIndexContainer >& rMenuBarContainer ) @@ -305,7 +305,7 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) } -// ----------------------------------------------------------------------------- + OReadMenuBarHandler::OReadMenuBarHandler( const Reference< XIndexContainer >& rMenuBarContainer, @@ -455,7 +455,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) } -// ----------------------------------------------------------------------------- + OReadMenuHandler::OReadMenuHandler( @@ -541,7 +541,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) } -// ----------------------------------------------------------------------------- + OReadMenuPopupHandler::OReadMenuPopupHandler( diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index c2a63736c8a1..2a799f3b962d 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -485,9 +485,9 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString() } -//_________________________________________________________________________________________________________________ + // OWriteStatusBarDocumentHandler -//_________________________________________________________________________________________________________________ + OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( const Reference< XIndexAccess >& aStatusBarItems, @@ -570,9 +570,9 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw m_xWriteDocumentHandler->endDocument(); } -//_________________________________________________________________________________________________________________ + // protected member functions -//_________________________________________________________________________________________________________________ + void OWriteStatusBarDocumentHandler::WriteStatusBarItem( const OUString& rCommandURL, diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 7b69a975f925..19e94c9ac1e1 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -656,9 +656,9 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString() } -//_________________________________________________________________________________________________________________ + // OWriteToolBoxDocumentHandler -//_________________________________________________________________________________________________________________ + OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( const Reference< XIndexAccess >& rItemAccess, @@ -761,9 +761,9 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw m_xWriteDocumentHandler->endDocument(); } -//_________________________________________________________________________________________________________________ + // protected member functions -//_________________________________________________________________________________________________________________ + void OWriteToolBoxDocumentHandler::WriteToolBoxItem( const OUString& rCommandURL, diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index 87c682a1ddf6..ff3560425f43 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -22,7 +22,7 @@ namespace framework{ -//----------------------------------------------------------------------------- + /** * converts a sequence of PropertyValue to a sequence of NamedValue. */ @@ -38,7 +38,7 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa return lDestination; } -//----------------------------------------------------------------------------- + /** * converts a sequence of unicode strings into a vector of such items */ diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 7ef56a6490d9..c0805ffd7274 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -26,7 +26,7 @@ namespace framework{ -//----------------------------------------------------------------------------- + PropertySetHelper::PropertySetHelper( LockHelper* pExternalLock , TransactionManager* pExternalTransactionManager , sal_Bool bReleaseLockOnCall ) @@ -38,12 +38,12 @@ PropertySetHelper::PropertySetHelper( LockHelper* { } -//----------------------------------------------------------------------------- + PropertySetHelper::~PropertySetHelper() { } -//----------------------------------------------------------------------------- + void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster) { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -55,7 +55,7 @@ void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Refere // <- SAFE } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property& aProperty) throw(css::beans::PropertyExistException, css::uno::Exception ) @@ -73,7 +73,7 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property // <- SAFE } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::uno::Exception ) @@ -91,12 +91,12 @@ void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProper // <- SAFE } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::impl_enablePropertySet() { } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::impl_disablePropertySet() { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -115,7 +115,7 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet() // <- SAFE } -//----------------------------------------------------------------------------- + sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent) { /* Dont use the lock here! @@ -145,7 +145,7 @@ sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEven return sal_False; } -//----------------------------------------------------------------------------- + void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent) { /* Dont use the lock here! @@ -171,7 +171,7 @@ void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChan } } -//----------------------------------------------------------------------------- + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo() throw(css::uno::RuntimeException) { @@ -181,7 +181,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper:: return xInfo; } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, @@ -247,7 +247,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, impl_notifyChangeListener(aEvent); } -//----------------------------------------------------------------------------- + css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , @@ -270,7 +270,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProp return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle); } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -292,7 +292,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& m_lSimpleChangeListener.addInterface(sProperty, xListener); } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -314,7 +314,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& m_lSimpleChangeListener.removeInterface(sProperty, xListener); } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -336,7 +336,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& m_lVetoChangeListener.addInterface(sProperty, xListener); } -//----------------------------------------------------------------------------- + void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& sProperty, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, @@ -358,7 +358,7 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& m_lVetoChangeListener.removeInterface(sProperty, xListener); } -//----------------------------------------------------------------------------- + css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProperties() throw(css::uno::RuntimeException) { @@ -382,7 +382,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper // <- SAFE } -//----------------------------------------------------------------------------- + css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException ) @@ -400,7 +400,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUStrin // <- SAFE } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) throw(css::uno::RuntimeException) { diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index 3bf207806758..3dc4ee9c5737 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -20,9 +20,9 @@ #include <helper/networkdomain.hxx> #ifdef WNT -//_________________________________________________________________________________________________________________ + // Windows -//_________________________________________________________________________________________________________________ + #define UNICODE #if defined _MSC_VER @@ -51,9 +51,9 @@ static OUString GetUserDomain() return OUString(); } -//_________________________________________________________________________________________________________________ + // Windows -//_________________________________________________________________________________________________________________ + namespace framework { @@ -77,15 +77,15 @@ OUString NetworkDomain::GetNTDomainName() #include <errno.h> #include <osl/thread.h> -//_________________________________________________________________________________________________________________ + // Unix -//_________________________________________________________________________________________________________________ + #if defined( SOLARIS ) -//_________________________________________________________________________________________________________________ + // Solaris -//_________________________________________________________________________________________________________________ + #include <sys/systeminfo.h> #include <sal/alloca.h> @@ -129,9 +129,9 @@ static rtl_uString *getDomainName() #elif defined( LINUX ) /* endif SOLARIS */ -//_________________________________________________________________________________________________________________ + // Linux -//_________________________________________________________________________________________________________________ + #include <unistd.h> #include <string.h> @@ -170,9 +170,9 @@ static rtl_uString *getDomainName() #else /* LINUX */ -//_________________________________________________________________________________________________________________ + // Other Unix -//_________________________________________________________________________________________________________________ + static rtl_uString *getDomainName() { @@ -181,9 +181,9 @@ static rtl_uString *getDomainName() #endif -//_________________________________________________________________________________________________________________ + // Unix -//_________________________________________________________________________________________________________________ + namespace framework { @@ -206,9 +206,9 @@ OUString NetworkDomain::GetNTDomainName() #else /* UNIX */ -//_________________________________________________________________________________________________________________ + // Other operating systems (non-Windows and non-Unix) -//_________________________________________________________________________________________________________________ + namespace framework { diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 59372b03a8f0..ffb18b091011 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -56,7 +56,7 @@ ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XCompone { } -//________________________________ + /** @short last chance to close an open configuration access point @descr In case our user forgot to close this configuration point @@ -68,7 +68,7 @@ ConfigAccess::~ConfigAccess() close(); } -//________________________________ + /** @short return the internal mode of this instance @descr May be the outside user need any information about successfully opened @@ -84,7 +84,7 @@ ConfigAccess::EOpenMode ConfigAccess::getMode() const /* } SAFE */ } -//________________________________ + /** @short open the configuration access in the specified mode @descr We set the opened configuration access as our member. So any following method, @@ -153,7 +153,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode ) /* } SAFE */ } -//________________________________ + /** @short close the internal opened configuration access and flush all changes @descr It checks, if the given access is valid and react in the right way. @@ -180,7 +180,7 @@ void ConfigAccess::close() /* } SAFE */ } -//________________________________ + /** @short provides an access to the internal wrapped configuration access @descr It's not allowed to safe this c++ (!) reference outside. You have diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 9091ce27788a..1b64c385501d 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -116,7 +116,7 @@ Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(Runti aRet = OPropertySetHelper::queryInterface( _rType ); return aRet; } -//------------------------------------------------------------------------------ + Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException) { return comphelper::concatSequences( diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 39894a895854..5e5d3397ffde 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -186,9 +186,9 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons return xComponent; } -//_________________________________________________________________________________________________________________ + // debug methods -//_________________________________________________________________________________________________________________ + /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 1ef375529451..80b64c6fa646 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -140,9 +140,9 @@ void OComponentEnumeration::impl_resetObject() m_nPosition = 0 ; } -//_________________________________________________________________________________________________________________ + // debug methods -//_________________________________________________________________________________________________________________ + /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 9ee7777e6614..7c60eaae9b1e 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -144,18 +144,18 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int // All searchflags are supported by this implementation! // If some flags should not be supported - don't call me with this flags!!! - //_____________________________________________________________________________________________________________ + // Search with AUTO-flag is not supported yet! // We think about right implementation. SAL_WARN_IF( (nSearchFlags & FrameSearchFlag::AUTO), "fwk", "OFrames::queryFrames(): Search with AUTO-flag is not supported yet!" ); - //_____________________________________________________________________________________________________________ + // Search for ALL and GLOBAL is superflous! // We support all necessary flags, from which these two flags are derived. // ALL = PARENT + SELF + CHILDREN + SIBLINGS // GLOBAL = ALL + TASKS - //_____________________________________________________________________________________________________________ + // Add parent to list ... if any exist! if( nSearchFlags & FrameSearchFlag::PARENT ) { @@ -168,7 +168,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int } } - //_____________________________________________________________________________________________________________ + // Add owner to list if SELF is searched. if( nSearchFlags & FrameSearchFlag::SELF ) { @@ -177,7 +177,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int impl_appendSequence( seqFrames, seqSelf ); } - //_____________________________________________________________________________________________________________ + // Add SIBLINGS to list. if( nSearchFlags & FrameSearchFlag::SIBLINGS ) { @@ -197,7 +197,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int m_bRecursiveSearchProtection = sal_False; } - //_____________________________________________________________________________________________________________ + // If searched for children, step over all elements in container and collect the information. if ( nSearchFlags & FrameSearchFlag::CHILDREN ) { @@ -370,9 +370,9 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram seqDestination = seqResult; } -//_________________________________________________________________________________________________________________ + // debug methods -//_________________________________________________________________________________________________________________ + /*----------------------------------------------------------------------------------------------------------------- The follow methods checks the parameter for other functions. If a parameter or his value is non valid, diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index c7f588a8b13f..b3f7fc2a4cb7 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -18,7 +18,7 @@ */ -//_______________________________________________ + // include files of own module #include <helper/statusindicator.hxx> #include <threadhelp/readguard.hxx> diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 1188c2062a11..9610ba17710d 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -54,7 +54,7 @@ namespace framework{ sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar"; -//----------------------------------------------- + StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase ( ) , m_xContext (xContext ) @@ -65,13 +65,13 @@ StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::u { } -//----------------------------------------------- + StatusIndicatorFactory::~StatusIndicatorFactory() { impl_stopWakeUpThread(); } -//----------------------------------------------- + void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -111,7 +111,7 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css:: impl_createProgress(); } -//----------------------------------------------- + css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator() throw(css::uno::RuntimeException) { @@ -121,7 +121,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto return xIndicator; } -//----------------------------------------------- + void SAL_CALL StatusIndicatorFactory::update() throw(css::uno::RuntimeException) { @@ -132,7 +132,7 @@ void SAL_CALL StatusIndicatorFactory::update() // <- SAFE ---------------------------------- } -//----------------------------------------------- + void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText , sal_Int32 nRange) @@ -162,7 +162,7 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus impl_reschedule(sal_True); } -//----------------------------------------------- + void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild) { // SAFE -> ---------------------------------- @@ -193,7 +193,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus impl_reschedule(sal_True); } -//----------------------------------------------- + void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIndicator >& xChild) { // SAFE -> ---------------------------------- @@ -247,7 +247,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn impl_reschedule(sal_True); } -//----------------------------------------------- + void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ) { @@ -277,7 +277,7 @@ void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStat impl_reschedule(sal_True); } -//----------------------------------------------- + void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XStatusIndicator >& xChild , sal_Int32 nValue ) { @@ -310,7 +310,7 @@ void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XSt impl_reschedule(sal_False); } -//----------------------------------------------- + void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() { // SAFE -> ---------------------------------- @@ -403,7 +403,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() } -//----------------------------------------------- + void StatusIndicatorFactory::impl_createProgress() { // SAFE -> ---------------------------------- @@ -453,7 +453,7 @@ void StatusIndicatorFactory::impl_createProgress() // <- SAFE ---------------------------------- } -//----------------------------------------------- + void StatusIndicatorFactory::impl_showProgress() { // SAFE -> ---------------------------------- @@ -498,7 +498,7 @@ void StatusIndicatorFactory::impl_showProgress() } } -//----------------------------------------------- + void StatusIndicatorFactory::impl_hideProgress() { // SAFE -> ---------------------------------- @@ -524,7 +524,7 @@ void StatusIndicatorFactory::impl_hideProgress() } } -//----------------------------------------------- + void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) { // SAFE -> @@ -568,7 +568,7 @@ void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce) } } -//----------------------------------------------- + void StatusIndicatorFactory::impl_startWakeUpThread() { // SAFE -> @@ -586,7 +586,7 @@ void StatusIndicatorFactory::impl_startWakeUpThread() // <- SAFE } -//----------------------------------------------- + void StatusIndicatorFactory::impl_stopWakeUpThread() { // SAFE -> diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index ad07ad8a2b7e..4a2b2b2422f9 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -29,7 +29,7 @@ namespace framework { -//----------------------------------------------- + VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xParentWindow (xParentWindow ) @@ -43,12 +43,12 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWin static_cast< css::task::XStatusIndicator* >(this)); } -//----------------------------------------------- + VCLStatusIndicator::~VCLStatusIndicator() { } -//----------------------------------------------- + void SAL_CALL VCLStatusIndicator::start(const OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException) @@ -89,7 +89,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , // <- SAFE ---------------------------------- } -//----------------------------------------------- + void SAL_CALL VCLStatusIndicator::reset() throw(css::uno::RuntimeException) { @@ -103,7 +103,7 @@ void SAL_CALL VCLStatusIndicator::reset() // <- SOLAR SAFE ---------------------------- } -//----------------------------------------------- + void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException) { @@ -130,7 +130,7 @@ void SAL_CALL VCLStatusIndicator::end() // <- SOLAR SAFE ---------------------------- } -//----------------------------------------------- + void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException) { @@ -149,7 +149,7 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) // <- SOLAR SAFE ---------------------------- } -//----------------------------------------------- + void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException) { @@ -181,7 +181,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) // <- SOLAR SAFE ---------------------------- } -//----------------------------------------------- + void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , Window* pParentWindow) { diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 6cf080495a09..67977728290c 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -18,7 +18,7 @@ */ -//_______________________________________________ + // include files of own module #include <helper/wakeupthread.hxx> #include <threadhelp/readguard.hxx> diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 5ee17200f6de..41da0e2ddd38 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -41,7 +41,7 @@ namespace framework{ -//_________________________________________________________________________________________________________________ + QuietInteraction::QuietInteraction() : ThreadHelpBase ( &Application::GetSolarMutex() ) @@ -49,7 +49,7 @@ QuietInteraction::QuietInteraction() { } -//_________________________________________________________________________________________________________________ + void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException ) { @@ -138,7 +138,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI xAbort->select(); } -//_________________________________________________________________________________________________________________ + css::uno::Any QuietInteraction::getRequest() const { @@ -148,7 +148,7 @@ css::uno::Any QuietInteraction::getRequest() const /* } SAFE */ } -//_________________________________________________________________________________________________________________ + sal_Bool QuietInteraction::wasUsed() const { diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index af7e5afe9646..ff915e2032aa 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -18,14 +18,14 @@ */ -//_______________________________________________ + // include own header #include <jobs/helponstartup.hxx> #include <threadhelp/resetableguard.hxx> #include <loadenv/targethelper.hxx> #include <services.h> -//_______________________________________________ + // include others #include <comphelper/configurationhelper.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -34,7 +34,7 @@ #include <vcl/help.hxx> #include <rtl/ustrbuf.hxx> -//_______________________________________________ + // include interfaces #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -99,19 +99,19 @@ DEFINE_INIT_SERVICE(HelpOnStartup, } ) -//----------------------------------------------- + HelpOnStartup::HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase( ) , m_xContext (xContext) { } -//----------------------------------------------- + HelpOnStartup::~HelpOnStartup() { } -//----------------------------------------------- + // css.task.XJob css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) throw(css::lang::IllegalArgumentException, @@ -159,7 +159,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea return css::uno::Any(); } -//----------------------------------------------- + void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException) { @@ -177,7 +177,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) // <- SAFE } -//----------------------------------------------- + OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments) { ::comphelper::SequenceAsHashMap lArgs (lArguments); @@ -229,7 +229,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be return sModuleId; } -//----------------------------------------------- + OUString HelpOnStartup::its_getCurrentHelpURL() { // SAFE -> @@ -271,7 +271,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL() return sCurrentHelpURL; } -//----------------------------------------------- + ::sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL) { if (sHelpURL.isEmpty()) @@ -318,7 +318,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL() return sal_False; } -//----------------------------------------------- + OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) { // SAFE -> @@ -356,7 +356,7 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) return sHelpURL; } -//----------------------------------------------- + OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL, const OUString& sLocale , const OUString& sSystem ) diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 7e234a33e473..e89cde7fd1ea 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -36,7 +36,7 @@ namespace framework{ -//________________________________ + /** @short standard ctor @descr It initialize this new instance. But it set some generic parameters here only. @@ -65,7 +65,7 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont { } -//________________________________ + /** @short standard ctor @descr It initialize this new instance. But it set some generic parameters here only. @@ -94,7 +94,7 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont { } -//________________________________ + /** @short superflous! @descr Releasing of memory and reference must be done inside die() call. @@ -104,7 +104,7 @@ Job::~Job() { } -//________________________________ + /** @short set (or delete) a listener for sending dispatch result events @descr Because this object is used in a wrapped mode ... the original listener @@ -154,7 +154,7 @@ void Job::setJobData( const JobData& aData ) /* } SAFE */ } -//________________________________ + /** @short runs the job @descr It doesn't matter, if the job is an asynchronous or @@ -281,7 +281,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD die(); } -//________________________________ + /** @short kill this job @descr It doesn't matter if this request is called from inside or @@ -327,7 +327,7 @@ void Job::die() /* SAFE { */ } -//________________________________ + /** @short generates list of arguments for job execute @descr There exist a set of information, which can be needed by a job. @@ -428,7 +428,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c return lAllArgs; } -//________________________________ + /** @short analyze the given job result and change the job configuration @descr Note: Some results can be handled only, if this job has a valid configuration! @@ -494,7 +494,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult ) /* SAFE { */ } -//________________________________ + /** @short starts listening for office shutdown and closing of our given target frame (if it's a valid reference) @@ -574,7 +574,7 @@ void Job::impl_startListening() /* } SAFE */ } -//________________________________ + /** @short release listener connection for office shutdown @descr see description of impl_startListening() @@ -639,7 +639,7 @@ void Job::impl_stopListening() /* } SAFE */ } -//________________________________ + /** @short callback from any asynchronous executed job @@ -683,7 +683,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs /* } SAFE */ } -//________________________________ + /** @short prevent internal wrapped job against office termination @descr This event is broadcasted by the desktop instance and ask for an office termination. @@ -728,7 +728,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro } -//________________________________ + /** @short inform us about office termination @descr Instead of the method queryTermination(), here is no chance to disagree with that. @@ -748,7 +748,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr // Do nothing else here. Our internal resources was released ... } -//________________________________ + /** @short prevent internal wrapped job against frame closing @descr This event is broadcasted by the frame instance and ask for closing. @@ -833,7 +833,7 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent , /* } SAFE */ } -//________________________________ + /** @short inform us about frame closing @descr Instead of the method queryClosing(), here is no chance to disagree with that. @@ -848,7 +848,7 @@ void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno // Do nothing else here. Our internal resources was released ... } -//________________________________ + /** @short shouldn't be called normaly @descr But it doesn't matter, who called it. We have to kill our internal diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 603f9ae341b6..37a40e232221 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -53,7 +53,7 @@ JobData::JobData( const css::uno::Reference< css::uno::XComponentContext >& rxCo impl_reset(); } -//________________________________ + /** @short copy ctor @descr Sometimes such job data container must be moved from one using place @@ -69,7 +69,7 @@ JobData::JobData( const JobData& rCopy ) *this = rCopy; } -//________________________________ + /** @short operator for coping JobData instances @descr Sometimes such job data container must be moved from one using place @@ -96,7 +96,7 @@ void JobData::operator=( const JobData& rCopy ) /* } SAFE */ } -//________________________________ + /** @short let this instance die @descr There is no chance any longer to work. We have to @@ -107,7 +107,7 @@ JobData::~JobData() impl_reset(); } -//________________________________ + /** @short initalize this instance as a job with configuration @descr They given alias can be used to address some configuration data. @@ -178,7 +178,7 @@ void JobData::setAlias( const OUString& sAlias ) /* } SAFE */ } -//________________________________ + /** @short initalize this instance as a job without configuration @descr This job has no configuration data. We have to forget all old information @@ -202,7 +202,7 @@ void JobData::setService( const OUString& sService ) /* } SAFE */ } -//________________________________ + /** @short initialize this instance with new job values. @descr It reads automaticly all properties of the specified @@ -238,7 +238,7 @@ void JobData::setEvent( const OUString& sEvent , /* } SAFE */ } -//________________________________ + /** @short set the new job specific arguments @descr If a job finish his work, it can give us a new list of arguments (which @@ -294,7 +294,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& /* } SAFE */ } -//________________________________ + /** @short set a new excution result @descr Every executed job can have returned a result. @@ -323,7 +323,7 @@ void JobData::setResult( const JobResult& aResult ) /* } SAFE */ } -//________________________________ + /** @short set a new environment descriptor for this job @descr It must(!) be done everytime this container is initialized @@ -339,7 +339,7 @@ void JobData::setEnvironment( EEnvironment eEnvironment ) /* } SAFE */ } -//________________________________ + /** @short these functions provides access to our internal members @descr These member represent any information about the job @@ -353,7 +353,7 @@ JobData::EMode JobData::getMode() const /* } SAFE */ } -//________________________________ + JobData::EEnvironment JobData::getEnvironment() const { @@ -363,7 +363,7 @@ JobData::EEnvironment JobData::getEnvironment() const /* } SAFE */ } -//________________________________ + OUString JobData::getEnvironmentDescriptor() const { @@ -390,7 +390,7 @@ OUString JobData::getEnvironmentDescriptor() const return sDescriptor; } -//________________________________ + OUString JobData::getService() const { @@ -400,7 +400,7 @@ OUString JobData::getService() const /* } SAFE */ } -//________________________________ + OUString JobData::getEvent() const { @@ -410,7 +410,7 @@ OUString JobData::getEvent() const /* } SAFE */ } -//________________________________ + css::uno::Sequence< css::beans::NamedValue > JobData::getJobConfig() const { @@ -420,7 +420,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getJobConfig() const /* } SAFE */ } -//________________________________ + css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const { @@ -449,7 +449,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const return lConfig; } -//________________________________ + /** @short return information, if this job is part of the global configuration package org.openoffice.Office.Jobs @@ -469,7 +469,7 @@ sal_Bool JobData::hasConfig() const /* } SAFE */ } -//________________________________ + /** @short mark a job as non startable for further requests @descr We don't remove the configuration entry! We set a timestamp value only. @@ -517,7 +517,7 @@ void JobData::disableJob() /* } SAFE */ } -//________________________________ + /** */ sal_Bool isEnabled( const OUString& sAdminTime , @@ -543,7 +543,7 @@ sal_Bool isEnabled( const OUString& sAdminTime , ); } -//________________________________ + /** */ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -561,7 +561,7 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XC } } -//________________________________ + /** */ sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const @@ -585,7 +585,7 @@ sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const return sal_False; } -//________________________________ + /** */ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -656,7 +656,7 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno:: return lEnabledJobs; } -//________________________________ + /** @short reset all internal structures @descr If someone recycles this instance, he can switch from one diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 4cda0c03b20d..03cd4a9bea40 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -49,7 +49,7 @@ using namespace framework; namespace { -//_______________________________________ + /** @short implements a dispatch object for jobs @descr Such dispatch object will be used by the generic dispatch mechanism if @@ -78,7 +78,7 @@ private: /** name of module (writer, impress etc.) the frame is for */ OUString m_sModuleIdentifier; -//___________________________________ + // native interface methods public: @@ -141,7 +141,7 @@ public: const css::util::URL& aURL ) throw(css::uno::RuntimeException); }; -//________________________________ + /** @short standard ctor @descr It initialize this new instance. @@ -155,7 +155,7 @@ JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::uno::XComponent { } -//________________________________ + /** @short let this instance die @descr We have to release all used resources and free used memory. @@ -167,7 +167,7 @@ JobDispatch::~JobDispatch() m_xFrame.clear(); } -//________________________________ + /** @short implementation of XInitalization @descr A protocol handler can provide this functionality, if it wish to get additional information @@ -204,7 +204,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any > /* } SAFE */ } -//________________________________ + /** @short implementation of XDispatchProvider::queryDispatches() @descr Every protocol handler will be asked for his agreement, if an URL was queried @@ -235,7 +235,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch return xDispatch; } -//________________________________ + /** @short implementation of XDispatchProvider::queryDispatches() @descr It's an optimized access for remote, so you can ask for @@ -261,7 +261,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD return lDispatches; } -//________________________________ + /** @short implementation of XNotifyingDispatch::dispatchWithNotification() @descr It creates the job service implementation and call execute on it. @@ -305,7 +305,7 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL } } -//________________________________ + /** @short dispatch an event @descr We search all registered jobs for this event and execute it. @@ -388,7 +388,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString& } } -//________________________________ + /** @short dispatch a service @descr We use the given name only to create and if possible to initialize @@ -440,7 +440,7 @@ void JobDispatch::impl_dispatchService( /*IN*/ const OUString& pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs)); } -//________________________________ + /** @short dispatch an alias @descr We use this alias to locate a job inside the configuration @@ -491,7 +491,7 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString& pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs)); } -//________________________________ + /** @short implementation of XDispatch::dispatch() @descr Because the methods dispatch() and dispatchWithNotification() are different in her parameters @@ -511,7 +511,7 @@ void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL& dispatchWithNotification(aURL, lArgs, css::uno::Reference< css::frame::XDispatchResultListener >()); } -//________________________________ + /** @short not supported */ @@ -520,7 +520,7 @@ void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference< { } -//________________________________ + /** @short not supported */ diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index c595f5cd1c64..98ac5ae6163d 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -188,7 +188,7 @@ void JobExecutor::disposing() { } } -//________________________________ + /** @short implementation of XJobExecutor interface @@ -246,7 +246,7 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::Run } } -//________________________________ + void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException) { @@ -335,7 +335,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent } } -//________________________________ + void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException) { @@ -372,7 +372,7 @@ void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent // I'm not interested on changed items :-) } -//________________________________ + /** @short the used cfg changes notifier wish to be released in its reference. diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index f0336dfd969a..703cbc538d90 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -44,7 +44,7 @@ JobResult::JobResult() m_eParts = E_NOPART; } -//________________________________ + /** @short special ctor @descr It initialize this new instance with a pure job execution result @@ -129,7 +129,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) } } -//________________________________ + /** @short copy dtor @descr - @@ -144,7 +144,7 @@ JobResult::JobResult( const JobResult& rCopy ) m_aDispatchResult = rCopy.m_aDispatchResult ; } -//________________________________ + /** @short standard dtor @descr Free all internally used resources at the end of living. @@ -154,7 +154,7 @@ JobResult::~JobResult() // Nothing really to do here. } -//________________________________ + /** @short =operator @descr Must be implemented to overwrite this instance with another one. @@ -175,7 +175,7 @@ void JobResult::operator=( const JobResult& rCopy ) /* } SAFE */ } -//________________________________ + /** @short checks for existing parts of the analyzed result @descr The internal flag mask was set after analyzing of the pure result. @@ -196,7 +196,7 @@ sal_Bool JobResult::existPart( sal_uInt32 eParts ) const /* } SAFE */ } -//________________________________ + /** @short provides access to our internal members @descr The return value will be valid only in case a call of @@ -213,7 +213,7 @@ css::uno::Sequence< css::beans::NamedValue > JobResult::getArguments() const /* } SAFE */ } -//________________________________ + css::frame::DispatchResultEvent JobResult::getDispatchResult() const { diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 71e7f51b6fab..bfcc75b944e1 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -100,7 +100,7 @@ JobURL::JobURL( /*IN*/ const OUString& sURL ) } } -//________________________________ + /** @short knows, if this job URL object hold a valid URL inside @@ -113,7 +113,7 @@ sal_Bool JobURL::isValid() const return (m_eRequest!=E_UNKNOWN); } -//________________________________ + /** @short get the event item of this job URL @descr Because the three possible parts of such URL (event, alias, service) @@ -146,7 +146,7 @@ sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const return bSet; } -//________________________________ + /** @short get the alias item of this job URL @descr Because the three possible parts of such URL (event, alias, service) @@ -179,7 +179,7 @@ sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const return bSet; } -//________________________________ + /** @short get the service item of this job URL @descr Because the three possible parts of such URL (event, service, service) @@ -212,7 +212,7 @@ sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const return bSet; } -//________________________________ + /** @short searches for a special identifier in the given string and split it @descr If the given identifier could be found at the beginning of the given string, @@ -274,7 +274,7 @@ sal_Bool JobURL::implst_split( /*IN*/ const OUString& sPart , return bPartFound; } -//________________________________ + /** @short special debug method @descr It's the entry point method to start a self component check for this class. @@ -324,7 +324,7 @@ void JobURL::impldbg_checkIt() JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.myService?serviceArg1;alias=myAlias?aliasArg=564", E_EVENT | E_ALIAS, "" , "myAlias", "css.myService", NULL , "aliasArg=564" , "serviceArg1" ); } -//________________________________ + /** @short helper debug method @descr It uses the given parameter to create a new instance of a JobURL. @@ -528,7 +528,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char* pURL , SAL_INFO("fwk.joburl", OUString(sMsg)); } -//________________________________ + /** @short helper debug method @descr It returns a representation of the internal object state @@ -565,7 +565,7 @@ OUString JobURL::impldbg_toString() const return sBuffer.makeStringAndClear(); } -//________________________________ + sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const { @@ -583,7 +583,7 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const return bSet; } -//________________________________ + sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const { @@ -601,7 +601,7 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const return bSet; } -//________________________________ + sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const { diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 94647185454d..508ad1680628 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -18,7 +18,7 @@ */ -//_______________________________________________ + // include own header #include <jobs/shelljob.hxx> @@ -26,7 +26,7 @@ #include <threadhelp/readguard.hxx> #include <services.h> -//_______________________________________________ + // include others #include <osl/file.hxx> @@ -36,7 +36,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> -//_______________________________________________ + // include interfaces #include <com/sun/star/util/PathSubstitution.hpp> @@ -61,7 +61,7 @@ static const OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone"); /** address job configuration property "CheckExitCode". */ static const OUString PROP_CHECKEXITCODE("CheckExitCode"); -//----------------------------------------------- + DEFINE_XSERVICEINFO_MULTISERVICE_2(ShellJob , ::cppu::OWeakObject , @@ -78,19 +78,19 @@ DEFINE_INIT_SERVICE(ShellJob, } ) -//----------------------------------------------- + ShellJob::ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext) : ThreadHelpBase( ) , m_xContext (xContext) { } -//----------------------------------------------- + ShellJob::~ShellJob() { } -//----------------------------------------------- + css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::NamedValue >& lJobArguments) throw(css::lang::IllegalArgumentException, css::uno::Exception , @@ -128,7 +128,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N return css::uno::Any(); } -//----------------------------------------------- + css::uno::Any ShellJob::impl_generateAnswer4Deactivation() { css::uno::Sequence< css::beans::NamedValue > aAnswer(1); @@ -138,7 +138,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() return css::uno::makeAny(aAnswer); } -//----------------------------------------------- + OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) { // SYNCHRONIZED -> @@ -161,7 +161,7 @@ OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) return OUString(); } -//----------------------------------------------- + ::sal_Bool ShellJob::impl_execute(const OUString& sCommand , const css::uno::Sequence< OUString >& lArguments , ::sal_Bool bCheckExitCode) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 81fd7dd51548..17160890e46a 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1219,9 +1219,9 @@ throw (RuntimeException) implts_reset( sal_True ); } -//--------------------------------------------------------------------------------------------------------- + // XMenuBarMergingAcceptor -//--------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL LayoutManager::setMergedMenuBar( const Reference< XIndexAccess >& xMergedMenuBar ) throw (uno::RuntimeException) @@ -2289,9 +2289,9 @@ throw (RuntimeException) implts_doLayout_notify( sal_True ); } -//--------------------------------------------------------------------------------------------------------- + // ILayoutNotifications -//--------------------------------------------------------------------------------------------------------- + void LayoutManager::requestLayout( Hint eHint ) { if ( eHint == HINT_TOOLBARSPACE_HAS_CHANGED ) @@ -2540,9 +2540,9 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rB } } -//--------------------------------------------------------------------------------------------------------- + // XMenuCloser -//--------------------------------------------------------------------------------------------------------- + void LayoutManager::implts_updateMenuBarClose() { WriteGuard aWriteLock( m_aLock ); @@ -2626,9 +2626,9 @@ IMPL_LINK_NOARG(LayoutManager, SettingsChanged) return 1; } -//--------------------------------------------------------------------------------------------------------- + // XLayoutManagerEventBroadcaster -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) throw (uno::RuntimeException) { @@ -2662,9 +2662,9 @@ void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam ) } } -//--------------------------------------------------------------------------------------------------------- + // XWindowListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent ) throw( uno::RuntimeException ) { @@ -2780,9 +2780,9 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) return 0; } -//--------------------------------------------------------------------------------------------------------- + // XFrameActionListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) { @@ -3110,9 +3110,9 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even } } -//--------------------------------------------------------------------------------------------------------- + // OPropertySetHelper -//--------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any& aConvertedValue, Any& aOldValue, sal_Int32 nHandle, diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index cb3c844f28c3..e495407495b1 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -82,9 +82,9 @@ ToolbarLayoutManager::~ToolbarLayoutManager() delete m_pAddonOptions; } -//--------------------------------------------------------------------------------------------------------- + // XInterface -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL ToolbarLayoutManager::acquire() throw() { OWeakObject::acquire(); @@ -1566,9 +1566,9 @@ void ToolbarLayoutManager::implts_destroyDockingAreaWindows() xBottomDockingWindow->dispose(); } -//--------------------------------------------------------------------------------------------------------- + // persistence methods -//--------------------------------------------------------------------------------------------------------- + sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) { @@ -3215,9 +3215,9 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( } } -//--------------------------------------------------------------------------------------------------------- + // XWindowListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent ) throw( uno::RuntimeException ) { @@ -3283,9 +3283,9 @@ throw( uno::RuntimeException ) { } -//--------------------------------------------------------------------------------------------------------- + // XDockableWindowListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e ) throw (uno::RuntimeException) { @@ -3840,9 +3840,9 @@ throw (uno::RuntimeException) { } -//--------------------------------------------------------------------------------------------------------- + // XUIConfigurationListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent ) throw (uno::RuntimeException) { diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index e22d65da3668..5085f37874a1 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -106,14 +106,14 @@ class LoadEnvListener : private ThreadHelpBase public: - //_______________________________________ + LoadEnvListener(LoadEnv* pLoadEnv) : m_bWaitingResult(true) , m_pLoadEnv(pLoadEnv) { } - //_______________________________________ + // frame.XLoadEventListener virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) throw(css::uno::RuntimeException); @@ -121,12 +121,12 @@ class LoadEnvListener : private ThreadHelpBase virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) throw(css::uno::RuntimeException); - //_______________________________________ + // frame.XDispatchResultListener virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent) throw(css::uno::RuntimeException); - //_______________________________________ + // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); @@ -208,7 +208,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const return xComponent; } -//----------------------------------------------- + utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor) { utl::MediaDescriptor lDescriptor(lOutsideDescriptor); @@ -568,7 +568,7 @@ void LoadEnv::impl_setResult(sal_Bool bResult) LoadEnv::EContentType LoadEnv::classifyContent(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor) { - //------------------------------------------- + // (i) Filter some special well known URL protocols, // which can not be handled or loaded in general. // Of course an empty URL must be ignored here too. @@ -591,7 +591,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& return E_UNSUPPORTED_CONTENT; } - //------------------------------------------- + // (ii) Some special URLs indicates a given input stream, // a full featured document model directly or // specify a request for opening an empty document. @@ -654,7 +654,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& css::uno::Sequence< OUString > lTypesReg(1); - //------------------------------------------- + // (iii) If a FrameLoader service (or at least // a Filter) can be found, which supports // this URL - it must be a loadable content. @@ -680,7 +680,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& if (xSet->hasMoreElements()) return E_CAN_BE_LOADED; - //------------------------------------------- + // (iv) Some URL protocols are supported by special services. // E.g. ContentHandler. // Such contents can be handled ... but not loaded. @@ -695,7 +695,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& if (xSet->hasMoreElements()) return E_CAN_BE_HANDLED; - //------------------------------------------- + // (v) Last but not least the UCB is used inside office to // load contents. He has a special configuration to know // which URL schemata can be used inside office. @@ -703,7 +703,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& if (xUCB->queryContentProvider(sURL).is()) return E_CAN_BE_LOADED; - //------------------------------------------- + // (TODO) At this point, we have no idea .-) // But it seems to be better, to break all // further requests for this URL. Otherwise @@ -975,7 +975,7 @@ sal_Bool LoadEnv::impl_handleContent() return sal_False; } -//----------------------------------------------- + sal_Bool LoadEnv::impl_furtherDocsAllowed() { // SAFE -> @@ -1056,7 +1056,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() return bAllowed; } -//----------------------------------------------- + sal_Bool LoadEnv::impl_loadContent() throw(LoadEnvException, css::uno::RuntimeException) { diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index c2f9d962c5be..72e024636e11 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -52,7 +52,7 @@ DEFINE_INIT_SERVICE( #include <typelib/typedescription.h> -//-------------------------------------------------------------------------------------------------- + void flatten_struct_members( ::std::vector< Any > * vec, void const * data, typelib_CompoundTypeDescription * pTD ) diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 4c68e819e45f..9a205b1a7faf 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -49,7 +49,7 @@ DEFINE_INIT_SERVICE( } ) -//_____________________________________________________________________________ + /** @short standard constructor to create instance @descr Because an instance will be initialized by her interface methods @@ -64,7 +64,7 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c { } -//_____________________________________________________________________________ + /** @short standard destructor @descr We are a helper and not a real service. So we don't provide @@ -76,7 +76,7 @@ DispatchRecorderSupplier::~DispatchRecorderSupplier() m_xDispatchRecorder = NULL; } -//_____________________________________________________________________________ + /** @short set a new dispatch recorder on this supplier @descr Because there can exist more then one recorder implementations @@ -101,7 +101,7 @@ void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Ref m_xDispatchRecorder=xRecorder; // => SAFE } -//_____________________________________________________________________________ + /** @short provides access to the dispatch recorder of this supplier @descr Such recorder can be used outside to record dispatches. @@ -124,7 +124,7 @@ css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSu // => SAFE } -//_____________________________________________________________________________ + /** @short execute a dispatch request and record it @descr If given dispatch object provides right recording interface it diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 01519ba09fee..1e79c177b3d5 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -103,7 +103,7 @@ using namespace framework; namespace { -//--------------------------------------- + /** @short hold all needed information for an asynchronous dispatch alive. @descr Because some operations are forced to be executed asynchronously @@ -126,7 +126,7 @@ public: public: - //--------------------------------------- + /** @short can be set from outside and is provided to our internal started operations. @@ -138,16 +138,16 @@ public: */ css::uno::Reference< css::task::XStatusIndicator > m_xProgress; - //--------------------------------------- + /** TODO document me */ OUString m_sSavePath; - //--------------------------------------- + /** @short define the current cache entry, which should be used for current backup or cleanUp operation ... which is may be done asynchronous */ sal_Int32 m_nWorkingEntryID; - //--------------------------------------- + /** @short used for asyncoperations, to prevent us from dying. @descr If our dispatch() method was forced to start the @@ -159,7 +159,7 @@ public: css::uno::Reference< css::uno::XInterface > m_xHoldRefForAsyncOpAlive; }; -//_______________________________________________ + /** implements the functionality of AutoSave and AutoRecovery of documents - including features of an EmergencySave in @@ -263,13 +263,13 @@ public: E_USER_AUTO_SAVE = 2048 }; - //--------------------------------------- + /** @short combine different information about one office document. */ struct TDocumentInfo { public: - //------------------------------- + TDocumentInfo() : DocumentState (E_UNKNOWN) , UsedForSaving (sal_False) @@ -278,11 +278,11 @@ public: , ID (-1 ) {} - //------------------------------- + /** @short points to the document. */ css::uno::Reference< css::frame::XModel > Document; - //------------------------------- + /** @short knows, if the document is really modified since the last autosave, or was postponed, because it was an active one etcpp... @@ -295,14 +295,14 @@ public: */ sal_Int32 DocumentState; - //------------------------------- + /** Because our applications not ready for concurrent save requests at the same time, we have supress our own AutoSave for the moment, a document will be already saved by others. */ sal_Bool UsedForSaving; - //------------------------------- + /** For every user action, which modifies a document (e.g. key input) we get a notification as XModifyListener. That seems to be a "performance issue" .-) So we decided to listen for such modify events only for the time in which the document @@ -310,7 +310,7 @@ public: */ sal_Bool ListenForModify; - //------------------------------- + /** For SessionSave we must close all open documents by ourself. But because we are listen for documents events, we get some ... and deregister these documents from our configuration. @@ -319,7 +319,7 @@ public: */ sal_Bool IgnoreClosing; - //------------------------------- + /** TODO: document me */ OUString OrgURL; OUString FactoryURL; @@ -340,104 +340,104 @@ public: sal_Int32 ID; }; - //--------------------------------------- + /** @short used to know every currently open document. */ typedef ::std::vector< TDocumentInfo > TDocumentList; -//___________________________________________ + // member private: - //--------------------------------------- + /** @short the global uno service manager. @descr Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - //--------------------------------------- + /** @short points to the underlying recovery configuration. @descr This instance does not cache - it calls directly the configuration API! */ css::uno::Reference< css::container::XNameAccess > m_xRecoveryCFG; - //--------------------------------------- + /** @short proxy weak binding to forward Events to ourself without an ownership cycle */ css::uno::Reference< css::util::XChangesListener > m_xRecoveryCFGListener; - //--------------------------------------- + /** @short points to the used configuration package or.openoffice.Setup @descr This instance does not cache - it calls directly the configuration API! */ css::uno::Reference< css::container::XNameAccess > m_xModuleCFG; - //--------------------------------------- + /** @short holds the global event broadcaster alive, where we listen for new created documents. */ css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xNewDocBroadcaster; - //--------------------------------------- + /** @short proxy weak binding to forward Events to ourself without an ownership cycle */ css::uno::Reference< css::document::XEventListener > m_xNewDocBroadcasterListener; - //--------------------------------------- + /** @short because we stop/restart listening sometimes, it's a good idea to know if we already registered as listener .-) */ sal_Bool m_bListenForDocEvents; sal_Bool m_bListenForConfigChanges; - //--------------------------------------- + /** @short specify the time intervall between two save actions. @descr Time is measured in [min]. */ sal_Int32 m_nAutoSaveTimeIntervall; - //--------------------------------------- + /** @short for an asynchronous operation we must know, if there is at least one running job (may be asynchronous!). */ sal_Int32 m_eJob; - //--------------------------------------- + /** @short the timer, which is used to be informed about the next saving time ... */ Timer m_aTimer; - //--------------------------------------- + /** @short make our dispatch asynchronous ... if required to do so! */ ::vcl::EventPoster m_aAsyncDispatcher; - //--------------------------------------- + /** @see DispatchParams */ DispatchParams m_aDispatchParams; - //--------------------------------------- + /** @short indicates, which time period is currently used by the internal timer. */ ETimerType m_eTimerType; - //--------------------------------------- + /** @short this cache is used to hold all information about recovery/emergency save documents alive. */ TDocumentList m_lDocCache; - //--------------------------------------- + // TODO document me sal_Int32 m_nIdPool; - //--------------------------------------- + /** @short contains all status listener registered at this instance. */ ListenerHash m_lListener; @@ -465,7 +465,7 @@ private: sal_Int32 m_nMinSpaceDocSave; sal_Int32 m_nMinSpaceConfigSave; - //--------------------------------------- + /** @short special debug option to make testing faster. @descr We dont interpret the timer unit as [min] ... @@ -476,11 +476,11 @@ private: sal_Bool m_dbg_bMakeItFaster; #endif - //--------------------------------------- + // HACK ... TODO css::uno::Reference< css::task::XStatusIndicator > m_xExternalProgress; -//___________________________________________ + // interface public: @@ -521,7 +521,7 @@ public: // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.frame.XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) @@ -535,7 +535,7 @@ public: const css::util::URL& aURL ) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.document.XEventListener /** @short informs about created/opened documents. @@ -549,24 +549,24 @@ public: virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.util.XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); - //--------------------------------------- + // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); protected: - //--------------------------------------- + // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, @@ -590,7 +590,7 @@ protected: private: virtual void SAL_CALL disposing() SAL_OVERRIDE; - //--------------------------------------- + /** @short open the underlying configuration. @descr This method must be called every time @@ -609,7 +609,7 @@ private: */ css::uno::Reference< css::container::XNameAccess > implts_openConfig(); - //--------------------------------------- + /** @short read the underlying configuration. @descr After that we know the initial state - means: @@ -624,7 +624,7 @@ private: */ void implts_readConfig(); - //--------------------------------------- + /** @short read the underlying configuration... @descr ... but only keys related to the AutoSave mechanism. @@ -638,22 +638,22 @@ private: */ void implts_readAutoSaveConfig(); - //--------------------------------------- + // TODO document me void implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo , sal_Bool bRemoveIt = sal_False); - //--------------------------------------- + // TODO document me void implts_startListening(); void implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo); - //--------------------------------------- + // TODO document me void implts_stopListening(); void implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo); - //--------------------------------------- + /** @short stops and may be(!) restarts the timer. @descr A running timer is stopped every time here. @@ -668,7 +668,7 @@ private: */ void implts_updateTimer(); - //--------------------------------------- + /** @short stop the timer. @descr Double calls will be ignored - means we do @@ -681,21 +681,21 @@ private: */ void implts_stopTimer(); - //--------------------------------------- + /** @short callback of our internal timer. */ DECL_LINK(implts_timerExpired, void*); - //--------------------------------------- + /** @short makes our dispatch() method asynchronous! */ DECL_LINK(implts_asyncDispatch, void*); - //--------------------------------------- + /** @short implements the dispatch real. */ void implts_dispatch(const DispatchParams& aParams); - //--------------------------------------- + /** @short validate new detected document and add it into the internal document list. @@ -711,7 +711,7 @@ private: */ void implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument); - //--------------------------------------- + /** @short remove the specified document from our internal document list. @param xDocument @@ -728,24 +728,24 @@ private: void implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bStopListening = sal_True); - //--------------------------------------- + // TODO document me void implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument); - //--------------------------------------- + // TODO document me void implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument); - //--------------------------------------- + // TODO document me void implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bSaveInProgress); - //--------------------------------------- + // TODO document me void implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument); - //--------------------------------------- + /** @short search a document inside given list. @param rList @@ -764,12 +764,12 @@ private: static TDocumentList::iterator impl_searchDocument( AutoRecovery::TDocumentList& rList , const css::uno::Reference< css::frame::XModel >& xDocument); - //--------------------------------------- + /** TODO document me */ void implts_changeAllDocVisibility(sal_Bool bVisible); void implts_prepareSessionShutdown(); - //--------------------------------------- + /** @short save all current opened documents to a specific backup directory. @@ -809,7 +809,7 @@ private: sal_Bool bRemoveLockFiles, const DispatchParams* pParams = 0); - //--------------------------------------- + /** @short save one of the current documents to a specific backup directory. @@ -847,7 +847,7 @@ private: AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress); - //--------------------------------------- + /** @short recovery all documents, which was saved during a crash before. @@ -857,19 +857,19 @@ private: */ AutoRecovery::ETimerType implts_openDocs(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_openOneDoc(const OUString& sURL , utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ); - //--------------------------------------- + // TODO document me void implts_generateNewTempURL(const OUString& sBackupPath , utl::MediaDescriptor& rMediaDescriptor, AutoRecovery::TDocumentInfo& rInfo ); - //--------------------------------------- + /** @short notifies all interested listener about the current state of the currently running operation. @@ -889,7 +889,7 @@ private: void implts_informListener( sal_Int32 eJob , const css::frame::FeatureStateEvent& aEvent); - //--------------------------------------- + /** short create a feature event struct, which can be send to any interested listener. @@ -932,16 +932,16 @@ private: } }; - //--------------------------------------- + // TODO document me void implts_resetHandleStates(sal_Bool bLoadCache); - //--------------------------------------- + // TODO document me void implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo); - //--------------------------------------- + // TODO document me void implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo); @@ -955,39 +955,39 @@ private: */ void implts_persistAllActiveViewNames(); - //--------------------------------------- + // TODO document me void implts_prepareEmergencySave(); - //--------------------------------------- + // TODO document me void implts_doEmergencySave(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_doRecovery(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_doSessionSave(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_doSessionQuietQuit(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_doSessionRestore(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_backupWorkingEntry(const DispatchParams& aParams); - //--------------------------------------- + // TODO document me void implts_cleanUpWorkingEntry(const DispatchParams& aParams); - //--------------------------------------- + /** try to make sure that all changed config items (not our used config access only) will be flushed back to disc. @@ -998,13 +998,13 @@ private: */ void impl_flushALLConfigChanges(); - //--------------------------------------- + // TODO document me AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource , const OUString& sTargetPath, const OUString& sTargetName); - //--------------------------------------- + /** @short converts m_eJob into a job description, which can be used to inform an outside listener about the current running operation @@ -1019,7 +1019,7 @@ private: */ static OUString implst_getJobDescription(sal_Int32 eJob); - //--------------------------------------- + /** @short mape the given URL to an internal int representation. @param aURL @@ -1041,7 +1041,7 @@ private: /// TODO document me static void impl_showFullDiscError(); - //--------------------------------------- + /** @short try to create/use a progress and set it inside the environment. @@ -1073,7 +1073,7 @@ private: utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); - //--------------------------------------- + /** try to remove the specified file from disc. Every URL supported by our UCB component can be used here. @@ -1091,7 +1091,7 @@ private: */ void st_impl_removeFile(const OUString& sURL); - //--------------------------------------- + /** try to remove ".lock" file from disc if office will be terminated not using the offical way .-) @@ -1102,7 +1102,7 @@ private: }; -//----------------------------------------------- + // recovery.xcu static const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/"; static const char CFG_ENTRY_RECOVERYLIST[] = "RecoveryList"; @@ -1205,7 +1205,7 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in // force "return sal_False" for the method impl_enoughDiscSpace(). // #define SIMULATE_FULL_DISC -//----------------------------------------------- + class CacheLockGuard { private: @@ -1236,7 +1236,7 @@ class CacheLockGuard void unlock(); }; -//----------------------------------------------- + CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , osl::Mutex& rMutex , sal_Int32& rCacheLock , @@ -1249,14 +1249,14 @@ CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner , lock(bLockForAddRemoveVectorItems); } -//----------------------------------------------- + CacheLockGuard::~CacheLockGuard() { unlock(); m_xOwner.clear(); } -//----------------------------------------------- + void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) { /* SAFE */ { @@ -1291,7 +1291,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) } /* SAFE */ } -//----------------------------------------------- + void CacheLockGuard::unlock() { /* SAFE */ { @@ -1313,13 +1313,13 @@ void CacheLockGuard::unlock() } /* SAFE */ } -//----------------------------------------------- + DispatchParams::DispatchParams() : m_nWorkingEntryID(-1) { }; -//----------------------------------------------- + DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& lArgs , const css::uno::Reference< css::uno::XInterface >& xOwner) { @@ -1329,7 +1329,7 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap& m_xHoldRefForAsyncOpAlive = xOwner; }; -//----------------------------------------------- + DispatchParams::DispatchParams(const DispatchParams& rCopy) { m_xProgress = rCopy.m_xProgress; @@ -1338,11 +1338,11 @@ DispatchParams::DispatchParams(const DispatchParams& rCopy) m_xHoldRefForAsyncOpAlive = rCopy.m_xHoldRefForAsyncOpAlive; }; -//----------------------------------------------- + DispatchParams::~DispatchParams() {}; -//----------------------------------------------- + DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) { m_xProgress = rCopy.m_xProgress; @@ -1352,7 +1352,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy) return *this; } -//----------------------------------------------- + void DispatchParams::forget() { m_sSavePath = ""; @@ -1361,7 +1361,7 @@ void DispatchParams::forget() m_xHoldRefForAsyncOpAlive.clear(); }; -//----------------------------------------------- + AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext) : AutoRecovery_BASE (*static_cast<Mutex *>(this)) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) @@ -1396,7 +1396,7 @@ void AutoRecovery::initListeners() m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired)); } -//----------------------------------------------- + AutoRecovery::~AutoRecovery() { disposing(); @@ -1423,7 +1423,7 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::R ); } -//----------------------------------------------- + void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException) @@ -1520,7 +1520,7 @@ void AutoRecovery::ListenerInformer::stop() m_bStopped = true; } -//----------------------------------------------- + void AutoRecovery::implts_dispatch(const DispatchParams& aParams) { sal_Int32 eJob; @@ -1658,7 +1658,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) implts_startListening(); } -//----------------------------------------------- + void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(css::uno::RuntimeException) @@ -1692,7 +1692,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr } /* SAFE */ } -//----------------------------------------------- + void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(css::uno::RuntimeException) @@ -1703,7 +1703,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: m_lListener.removeInterface(aURL.Complete, xListener); } -//----------------------------------------------- + void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent) throw(css::uno::RuntimeException) { @@ -1772,7 +1772,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent } } -//----------------------------------------------- + void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException) { @@ -1826,7 +1826,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven implts_updateTimer(); } -//----------------------------------------------- + void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException) { @@ -1837,7 +1837,7 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) implts_markDocumentModifiedAgainstLastBackup(xDocument); } -//----------------------------------------------- + void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException) { @@ -1869,7 +1869,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) } /* SAFE */ } -//----------------------------------------------- + css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConfig() { /* SAFE */ { @@ -1922,7 +1922,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf return xCFG; } -//----------------------------------------------- + void AutoRecovery::implts_readAutoSaveConfig() { css::uno::Reference< css::container::XHierarchicalNameAccess > xCommonRegistry(implts_openConfig(), css::uno::UNO_QUERY); @@ -1968,7 +1968,7 @@ void AutoRecovery::implts_readAutoSaveConfig() } /* SAFE */ } -//----------------------------------------------- + void AutoRecovery::implts_readConfig() { implts_readAutoSaveConfig(); @@ -2055,7 +2055,7 @@ void AutoRecovery::implts_readConfig() implts_updateTimer(); } -//----------------------------------------------- + void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo) { if (rInfo.AppModule.isEmpty()) @@ -2118,7 +2118,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume } } -//----------------------------------------------- + void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo) { ENSURE_OR_THROW2( @@ -2136,7 +2136,7 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService; } -//----------------------------------------------- + void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i_rInfo ) { ENSURE_OR_THROW2( i_rInfo.Document.is(), "need at document, at the very least", *this ); @@ -2177,7 +2177,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() ); } -//----------------------------------------------- + void AutoRecovery::implts_persistAllActiveViewNames() { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2193,7 +2193,7 @@ void AutoRecovery::implts_persistAllActiveViewNames() } } -//----------------------------------------------- + void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo, sal_Bool bRemoveIt) { css::uno::Reference< css::container::XHierarchicalNameAccess > xCFG; @@ -2299,7 +2299,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn while(nRetry>0); } -//----------------------------------------------- + void AutoRecovery::implts_startListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; @@ -2345,7 +2345,7 @@ void AutoRecovery::implts_startListening() } } -//----------------------------------------------- + void AutoRecovery::implts_stopListening() { css::uno::Reference< css::util::XChangesNotifier > xCFG; @@ -2378,7 +2378,7 @@ void AutoRecovery::implts_stopListening() } } -//----------------------------------------------- + void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo) { if (rInfo.ListenForModify) @@ -2393,7 +2393,7 @@ void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& } } -//----------------------------------------------- + void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo) { if (! rInfo.ListenForModify) @@ -2408,7 +2408,7 @@ void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& } } -//----------------------------------------------- + void AutoRecovery::implts_updateTimer() { implts_stopTimer(); @@ -2448,7 +2448,7 @@ void AutoRecovery::implts_updateTimer() } /* SAFE */ } -//----------------------------------------------- + void AutoRecovery::implts_stopTimer() { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2458,7 +2458,7 @@ void AutoRecovery::implts_stopTimer() m_aTimer.Stop(); } -//----------------------------------------------- + IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) { try @@ -2555,7 +2555,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) return 0; } -//----------------------------------------------- + IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) { DispatchParams aParams; @@ -2576,7 +2576,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) return 0; } -//----------------------------------------------- + void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument) { // ignore corrupted events, where no document is given ... Runtime Error ?! @@ -2699,7 +2699,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame aCacheLock.unlock(); } -//----------------------------------------------- + void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bStopListening) { @@ -2747,7 +2747,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config } -//----------------------------------------------- + void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2769,7 +2769,7 @@ void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno:: } /* SAFE */ } -//----------------------------------------------- + void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2800,7 +2800,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr } /* SAFE */ } -//----------------------------------------------- + void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument , sal_Bool bSaveInProgress) { @@ -2818,7 +2818,7 @@ void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Refer } /* SAFE */ } -//----------------------------------------------- + void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -2869,7 +2869,7 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr AutoRecovery::st_impl_removeFile(sRemoveURL2); } -//----------------------------------------------- + AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( AutoRecovery::TDocumentList& rList , const css::uno::Reference< css::frame::XModel >& xDocument) { @@ -2885,7 +2885,7 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument( Au return pIt; } -//----------------------------------------------- + namespace { void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, sal_Bool i_bVisible ) @@ -2912,14 +2912,14 @@ namespace } } -//----------------------------------------------- + void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible) { css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create(m_xContext), css::uno::UNO_QUERY); lcl_changeVisibility( xDesktop, bVisible ); } -//----------------------------------------------- + /* Currently the document is not closed in case of crash, so the lock file must be removed explicitly */ @@ -2948,7 +2948,7 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo) } -//----------------------------------------------- + void AutoRecovery::implts_prepareSessionShutdown() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_prepareSessionShutdown() starts ..."); @@ -3013,7 +3013,7 @@ void AutoRecovery::implts_prepareSessionShutdown() } /* SAFE */ } -//----------------------------------------------- + /* TODO WORKAROUND: #i64599# @@ -3041,7 +3041,7 @@ sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo) return bNoAutoSave; } -//----------------------------------------------- + AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAllowUserIdleLoop, sal_Bool bRemoveLockFiles, const DispatchParams* pParams ) @@ -3214,7 +3214,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl return eTimer; } -//----------------------------------------------- + void AutoRecovery::implts_saveOneDoc(const OUString& sBackupPath , AutoRecovery::TDocumentInfo& rInfo , const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress) @@ -3345,7 +3345,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString& AutoRecovery::st_impl_removeFile(sRemoveFile); } -//----------------------------------------------- + AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams) { AutoRecovery::ETimerType eTimer = AutoRecovery::E_DONT_START_TIMER; @@ -3540,7 +3540,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa return eTimer; } -//----------------------------------------------- + void AutoRecovery::implts_openOneDoc(const OUString& sURL , utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ) @@ -3660,7 +3660,7 @@ void AutoRecovery::implts_openOneDoc(const OUString& sURL , } } -//----------------------------------------------- + void AutoRecovery::implts_generateNewTempURL(const OUString& sBackupPath , utl::MediaDescriptor& /*rMediaDescriptor*/, AutoRecovery::TDocumentInfo& rInfo ) @@ -3696,7 +3696,7 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack rInfo.NewTempURL = aTempFile.GetURL(); } -//----------------------------------------------- + void AutoRecovery::implts_informListener( sal_Int32 eJob , const css::frame::FeatureStateEvent& aEvent) { @@ -3724,7 +3724,7 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ } } -//----------------------------------------------- + OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) { // describe the current running operation @@ -3761,7 +3761,7 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) return sFeature.makeStringAndClear(); } -//----------------------------------------------- + sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) { if ( aURL.Protocol == CMD_PROTOCOL ) @@ -3792,7 +3792,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) return AutoRecovery::E_NO_JOB; } -//----------------------------------------------- + css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( sal_Int32 eJob , const OUString& sEventType, AutoRecovery::TDocumentInfo* pInfo ) @@ -3821,7 +3821,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( return aEvent; } -//----------------------------------------------- + void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -3847,7 +3847,7 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) } /* SAFE */ } -//----------------------------------------------- + void AutoRecovery::implts_prepareEmergencySave() { // Be sure to know all open documents really .-) @@ -3857,7 +3857,7 @@ void AutoRecovery::implts_prepareEmergencySave() implts_changeAllDocVisibility(sal_False); } -//----------------------------------------------- + void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) { // Write a hint "we chrashed" into the configuration, so @@ -3906,7 +3906,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) AutoRecovery::st_impl_removeLockFile(); } -//----------------------------------------------- + void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) { AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; @@ -3933,7 +3933,7 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) ::comphelper::ConfigurationHelper::E_STANDARD); } -//----------------------------------------------- + void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionSave()"); @@ -3972,7 +3972,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) impl_flushALLConfigChanges(); } -//----------------------------------------------- + void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionQuietQuit()"); @@ -4004,7 +4004,7 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) } -//----------------------------------------------- + void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionRestore() ..."); @@ -4039,7 +4039,7 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_doSessionRestore()"); } -//----------------------------------------------- + void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -4076,7 +4076,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams) } } -//----------------------------------------------- + void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_ADD_REMOVE); @@ -4099,7 +4099,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams) } } -//----------------------------------------------- + AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource , const OUString& sTargetPath, const OUString& sTargetName) @@ -4139,7 +4139,7 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& s return AutoRecovery::E_COPIED; } -//----------------------------------------------- + sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*aConvertedValue*/, css::uno::Any& /*aOldValue*/ , sal_Int32 /*nHandle*/ , @@ -4150,7 +4150,7 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /* return sal_False; } -//----------------------------------------------- + void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const css::uno::Any& /*aValue*/ ) throw(css::uno::Exception) @@ -4158,7 +4158,7 @@ void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 // not needed currently } -//----------------------------------------------- + void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const { @@ -4205,7 +4205,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , } } -//----------------------------------------------- + const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor() { const css::beans::Property pPropertys[] = @@ -4218,7 +4218,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto return lPropertyDescriptor; } -//----------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL AutoRecovery::getInfoHelper() { static ::cppu::OPropertyArrayHelper* pInfoHelper = 0; @@ -4235,7 +4235,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto return (*pInfoHelper); } -//----------------------------------------------- + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo() throw(css::uno::RuntimeException) { @@ -4254,7 +4254,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPr return (*pInfo); } -//----------------------------------------------- + void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() ..."); @@ -4327,7 +4327,7 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()"); } -//----------------------------------------------- + sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) { #ifdef SIMULATE_FULL_DISC @@ -4356,7 +4356,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace) #endif // SIMULATE_FULL_DISC } -//----------------------------------------------- + void AutoRecovery::impl_showFullDiscError() { OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON)); @@ -4376,7 +4376,7 @@ void AutoRecovery::impl_showFullDiscError() dlgError.Execute(); } -//----------------------------------------------- + void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4442,7 +4442,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress); } -//----------------------------------------------- + void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame) @@ -4477,7 +4477,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& } } -//----------------------------------------------- + void AutoRecovery::impl_flushALLConfigChanges() { try @@ -4500,7 +4500,7 @@ void AutoRecovery::impl_flushALLConfigChanges() } } -//----------------------------------------------- + void AutoRecovery::st_impl_removeFile(const OUString& sURL) { if ( sURL.isEmpty()) @@ -4516,7 +4516,7 @@ void AutoRecovery::st_impl_removeFile(const OUString& sURL) } } -//----------------------------------------------- + void AutoRecovery::st_impl_removeLockFile() { try diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 87fd71303de0..6ca2fb3ab3ec 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -99,14 +99,14 @@ void Desktop::constructorInit() OFrames* pFramesHelper = new OFrames( this, &m_aChildTaskContainer ); m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY ); - //------------------------------------------------------------------------------------------------------------- + // Initialize a new dispatchhelper-object to handle dispatches. // We use these helper as slave for our interceptor helper ... not directly! // But he is event listener on THIS instance! DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this ); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY ); - //------------------------------------------------------------------------------------------------------------- + // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism. // Set created dispatch provider as slowest slave of it. // Hold interception helper by reference only - not by pointer! @@ -233,7 +233,7 @@ sal_Bool SAL_CALL Desktop::terminate() aReadLock.unlock(); // end synchronize - //------------------------------------------------------------------------------------------------------------- + // Ask normal terminate listener. They could stop terminate without closing any open document. Desktop::TTerminateListenerList lCalledTerminationListener; ::sal_Bool bVeto = sal_False; @@ -244,7 +244,7 @@ sal_Bool SAL_CALL Desktop::terminate() return sal_False; } - //------------------------------------------------------------------------------------------------------------- + // try to close all open frames. // Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past. ::sal_Bool bAllowUI = sal_True; @@ -255,7 +255,7 @@ sal_Bool SAL_CALL Desktop::terminate() return sal_False; } - //------------------------------------------------------------------------------------------------------------- + // Normal listener had no problem ... // all frames was closed ... // now it's time to ask our specialized listener. @@ -965,13 +965,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS { css::uno::Reference< css::frame::XFrame > xTarget; - //----------------------------------------------------------------------------------------------------- + // 0) Ignore wrong parameter! // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong // search results can occur! - //----------------------------------------------------------------------------------------------------- + if ( (sTargetFrameName==SPECIALTARGET_DEFAULT ) || // valid for dispatches - not for findFrame()! (sTargetFrameName==SPECIALTARGET_MENUBAR ) || // valid for dispatches - not for findFrame()! @@ -983,35 +983,35 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS return NULL; } - //----------------------------------------------------------------------------------------------------- + // I) check for special defined targets first which must be handled exclusive. // force using of "if() else if() ..." - //----------------------------------------------------------------------------------------------------- - //----------------------------------------------------------------------------------------------------- + + // I.I) "_blank" // create a new task as child of this desktop instance // Note: Used helper TaskCreator use us automaticly ... - //----------------------------------------------------------------------------------------------------- + if ( sTargetFrameName==SPECIALTARGET_BLANK ) { TaskCreator aCreator( m_xContext ); xTarget = aCreator.createTask(sTargetFrameName,sal_False); } - //----------------------------------------------------------------------------------------------------- + // I.II) "_top" // We are top by definition - //----------------------------------------------------------------------------------------------------- + else if ( sTargetFrameName==SPECIALTARGET_TOP ) { xTarget = this; } - //----------------------------------------------------------------------------------------------------- + // I.III) "_self", "" // This mean this "frame" in every case. - //----------------------------------------------------------------------------------------------------- + else if ( ( sTargetFrameName==SPECIALTARGET_SELF ) || ( sTargetFrameName.isEmpty() ) @@ -1022,20 +1022,20 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS else { - //------------------------------------------------------------------------------------------------- + // II) otherwise use optional given search flags // force using of combinations of such flags. means no "else" part of use if() statements. // But we ust break further searches if target was already found. // Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT // TASK and CREATE are handled special. // But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT. - //------------------------------------------------------------------------------------------------- - //------------------------------------------------------------------------------------------------- + + // II.I) SELF // Check for right name. If it's the searched one return ourself - otherwise // ignore this flag. - //------------------------------------------------------------------------------------------------- + if ( (nSearchFlags & css::frame::FrameSearchFlag::SELF) && (m_sName == sTargetFrameName) @@ -1044,7 +1044,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = this; } - //------------------------------------------------------------------------------------------------- + // II.II) TASKS // This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees. // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement @@ -1052,7 +1052,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // search on ALL child frames. May that can be useful to get access on opened document tasks // only without filter out all non really required sub frames ... // Used helper method on our container doesn't create any frame - it's a search only. - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::TASKS) @@ -1061,13 +1061,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = m_aChildTaskContainer.searchOnDirectChildrens(sTargetFrameName); } - //------------------------------------------------------------------------------------------------- + // II.III) CHILDREN // Search on all children for the given target name. // An empty name value can't occur here - because it must be already handled as "_self" // before. Used helper function of container doesn't create any frame. // It makes a deep search only. - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN) @@ -1076,11 +1076,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS xTarget = m_aChildTaskContainer.searchOnAllChildrens(sTargetFrameName); } - //------------------------------------------------------------------------------------------------- + // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create // a new one ... we should do that. Used TaskCreator use us automaticly as parent! - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::CREATE) @@ -1366,7 +1366,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ } -//----------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ) @@ -1375,7 +1375,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio return m_xTitleNumberGenerator->leaseNumber (xComponent); } -//----------------------------------------------------------------------------- + void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ) @@ -1384,7 +1384,7 @@ void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) m_xTitleNumberGenerator->releaseNumber (nNumber); } -//----------------------------------------------------------------------------- + void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ) @@ -1393,7 +1393,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css m_xTitleNumberGenerator->releaseNumberForComponent (xComponent); } -//----------------------------------------------------------------------------- + OUString SAL_CALL Desktop::getUntitledPrefix() throw (css::uno::RuntimeException) { diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index f3aeaf66c146..a6d51d7f3900 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -30,7 +30,7 @@ namespace framework{ -//_______________________________________________ + // XInterface, XTypeProvider, XServiceInfo DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper , @@ -40,7 +40,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper , DEFINE_INIT_SERVICE( DispatchHelper, {} ) -//_______________________________________________ + /** ctor. @@ -53,7 +53,7 @@ DispatchHelper::DispatchHelper( const css::uno::Reference< css::uno::XComponentC { } -//_______________________________________________ + /** dtor. */ @@ -61,7 +61,7 @@ DispatchHelper::~DispatchHelper() { } -//_______________________________________________ + /** capsulate all steps of a dispatch request and provide so an easy way for dispatches. @@ -151,7 +151,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( return aResult; } -//_______________________________________________ + /** callback for started dispatch with guaranteed notifications. @@ -175,7 +175,7 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult /* } SAFE */ } -//_______________________________________________ + /** we has to realease our broadcaster reference. diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 14d5d69b98bd..a0f7d274d9fd 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -179,9 +179,9 @@ public: return aSeq; } - //--------------------------------------------------------------------------------------------------------- + // XComponentLoader - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& sURL, const OUString& sTargetFrameName, @@ -192,16 +192,16 @@ public: css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XFramesSupplier - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XFrame - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ); @@ -222,59 +222,59 @@ public: virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XComponent - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XStatusIndicatorFactory - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator ( ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XDispatchProvider - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XDispatchProviderInterception - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XDispatchInformationProvider - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException); - //--------------------------------------------------------------------------------------------------------- + // XWindowListener // Attention: windowResized() and windowShown() are implement only! All other are empty! - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL windowResized ( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowMoved ( const css::awt::WindowEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; virtual void SAL_CALL windowShown ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowHidden ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XFocusListener // Attention: focusLost() not implemented yet! - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - //--------------------------------------------------------------------------------------------------------- + // XTopWindowListener // Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty! - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL windowActivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowDeactivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowOpened ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; @@ -283,48 +283,48 @@ public: virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - //--------------------------------------------------------------------------------------------------------- + // XEventListener - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XActionLockable - //--------------------------------------------------------------------------------------------------------- + virtual sal_Bool SAL_CALL isActionLocked ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL addActionLock ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL removeActionLock( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL setActionLocks ( sal_Int16 nLock ) throw( css::uno::RuntimeException ); virtual sal_Int16 SAL_CALL resetActionLocks( ) throw( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XCloseable - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XCloseBroadcaster - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException); - //--------------------------------------------------------------------------------------------------------- + // XTitle - //--------------------------------------------------------------------------------------------------------- + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException); - //--------------------------------------------------------------------------------------------------------- + // XTitleChangeBroadcaster - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL addTitleChangeListener ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException); virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException); - //--------------------------------------------------------------------------------------------------------- + // XFrame2 attributes - //--------------------------------------------------------------------------------------------------------- + virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getUserDefinedAttributes() throw (css::uno::RuntimeException); virtual css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL getDispatchRecorderSupplier() throw (css::uno::RuntimeException); @@ -334,9 +334,9 @@ public: virtual void SAL_CALL setLayoutManager(const css::uno::Reference<css::uno::XInterface>&) throw (css::uno::RuntimeException); - //--------------------------------------------------------------------------------------------------------- + // PropertySetHelper => XPropertySet, XPropertySetInfo - //--------------------------------------------------------------------------------------------------------- + private: void impl_initializePropInfo(); @@ -348,9 +348,9 @@ private: virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, sal_Int32 nHandle ); -//------------------------------------------------------------------------------------------------------------- + // private methods -//------------------------------------------------------------------------------------------------------------- + private: @@ -378,10 +378,10 @@ private: void impl_setCloser ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , sal_Bool bState ); void impl_disposeContainerWindow ( css::uno::Reference< css::awt::XWindow >& xWindow ); -//------------------------------------------------------------------------------------------------------------- + // debug methods // (should be private everyway!) -//------------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short debug-method to check incoming parameter of some other mehods of this class @@ -588,18 +588,18 @@ void Frame::initListeners() { css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW); - //------------------------------------------------------------------------------------------------------------- + // Initialize a new dispatchhelper-object to handle dispatches. // We use these helper as slave for our interceptor helper ... not directly! // But he is event listener on THIS instance! DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this ); css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY ); - //------------------------------------------------------------------------------------------------------------- + DispatchInformationProvider* pInfoHelper = new DispatchInformationProvider(m_xContext, this); m_xDispatchInfoHelper = css::uno::Reference< css::frame::XDispatchInformationProvider >( static_cast< ::cppu::OWeakObject* >(pInfoHelper), css::uno::UNO_QUERY ); - //------------------------------------------------------------------------------------------------------------- + // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism. // Set created dispatch provider as slowest slave of it. // Hold interception helper by reference only - not by pointer! @@ -607,7 +607,7 @@ void Frame::initListeners() InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider ); m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY ); - //------------------------------------------------------------------------------------------------------------- + // Initialize a new XFrames-helper-object to handle XIndexAccess and XElementAccess. // We hold member as reference ... not as pointer too! // Attention: We share our frame container with this helper. Container is threadsafe himself ... So I think we can do that. @@ -615,7 +615,7 @@ void Frame::initListeners() OFrames* pFramesHelper = new OFrames( this, &m_aChildFrameContainer ); m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY ); - //------------------------------------------------------------------------------------------------------------- + // Initialize a the drop target listener. // We hold member as reference ... not as pointer too! OpenFileDropTargetListener* pDropListener = new OpenFileDropTargetListener( m_xContext, this ); @@ -628,16 +628,16 @@ void Frame::initListeners() SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Frame::Frame(): Frames helper isn't valid. XFrames, XIndexAccess and XElementAcces are not supported!" ); SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper isn't valid. Drag and drop without functionality!" ); - //------------------------------------------------------------------------------------------------------------- + // establish notifies for changing of "disabled commands" configuration during runtime m_aCommandOptions.EstablisFrameCallback(this); - //------------------------------------------------------------------------------------------------------------- + // Create an initial layout manager // Create layout manager and connect it to the newly created frame m_xLayoutManager = css::frame::LayoutManager::create(m_xContext); - //------------------------------------------------------------------------------------------------------------- + // set information about all supported properties at the base class helper PropertySetHelper impl_initializePropInfo(); } @@ -1116,13 +1116,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr { css::uno::Reference< css::frame::XFrame > xTarget; - //----------------------------------------------------------------------------------------------------- + // 0) Ignore wrong parameter! // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong // search results can occur! - //----------------------------------------------------------------------------------------------------- + if ( (sTargetFrameName==SPECIALTARGET_DEFAULT ) || // valid for dispatches - not for findFrame()! (sTargetFrameName==SPECIALTARGET_MENUBAR ) // valid for dispatches - not for findFrame()! @@ -1131,10 +1131,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr return NULL; } - //----------------------------------------------------------------------------------------------------- + // I) check for special defined targets first which must be handled exclusive. // force using of "if() else if() ..." - //----------------------------------------------------------------------------------------------------- + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ @@ -1146,32 +1146,32 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr aReadLock.unlock(); /* } SAFE */ - //----------------------------------------------------------------------------------------------------- + // I.I) "_blank" // Not allowed for a normal frame - but for the desktop. // Use helper class to do so. It use the desktop automaticly. - //----------------------------------------------------------------------------------------------------- + if ( sTargetFrameName==SPECIALTARGET_BLANK ) { TaskCreator aCreator(xContext); xTarget = aCreator.createTask(sTargetFrameName,sal_False); } - //----------------------------------------------------------------------------------------------------- + // I.II) "_parent" // It doesn't matter if we have a valid parent or not. User ask for him and get it. // An empty result is a valid result too. - //----------------------------------------------------------------------------------------------------- + else if ( sTargetFrameName==SPECIALTARGET_PARENT ) { xTarget = xParent; } - //----------------------------------------------------------------------------------------------------- + // I.III) "_top" // If we are not the top frame in this hierarchy, we must forward request to our parent. // Otherwhise we must return ourself. - //----------------------------------------------------------------------------------------------------- + else if ( sTargetFrameName==SPECIALTARGET_TOP ) { if (bIsTopFrame) @@ -1180,10 +1180,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = xParent->findFrame(SPECIALTARGET_TOP,0); } - //----------------------------------------------------------------------------------------------------- + // I.IV) "_self", "" // This mean this frame in every case. - //----------------------------------------------------------------------------------------------------- + else if ( ( sTargetFrameName==SPECIALTARGET_SELF ) || ( sTargetFrameName.isEmpty() ) @@ -1192,12 +1192,12 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = this; } - //----------------------------------------------------------------------------------------------------- + // I.V) "_beamer" // This is a special sub frame of any task. We must return it if we found it on our direct children // or create it there if it not already exists. // Note: Such beamer exists for task(top) frames only! - //----------------------------------------------------------------------------------------------------- + else if ( sTargetFrameName==SPECIALTARGET_BEAMER ) { // We are a task => search or create the beamer @@ -1220,13 +1220,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr else { - //------------------------------------------------------------------------------------------------- + // II) otherwise use optional given search flags // force using of combinations of such flags. means no "else" part of use if() statements. // But we ust break further searches if target was already found. // Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT // TASK and CREATE are handled special. - //------------------------------------------------------------------------------------------------- + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ @@ -1235,11 +1235,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr aReadLock.unlock(); /* } SAFE */ - //------------------------------------------------------------------------------------------------- + // II.I) SELF // Check for right name. If it's the searched one return ourself - otherwise // ignore this flag. - //------------------------------------------------------------------------------------------------- + if ( (nSearchFlags & css::frame::FrameSearchFlag::SELF) && (sOwnName == sTargetFrameName ) @@ -1248,13 +1248,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = this; } - //------------------------------------------------------------------------------------------------- + // II.II) CHILDREN // Search on all children for the given target name. // An empty name value can't occur here - because it must be already handled as "_self" // before. Used helper function of container doesn't create any frame. // It makes a deep search only. - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN) @@ -1263,19 +1263,19 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr xTarget = m_aChildFrameContainer.searchOnAllChildrens(sTargetFrameName); } - //------------------------------------------------------------------------------------------------- + // II.III) TASKS // This is a special flag. It regulate search on this task tree only or allow search on // all other ones (which are sibling trees of us) too. // Upper search must stop at this frame if we are the topest one and the TASK flag isn't set // or we can ignore it if we have no valid parent. - //------------------------------------------------------------------------------------------------- + if ( ( bIsTopFrame && (nSearchFlags & css::frame::FrameSearchFlag::TASKS) ) || ( ! bIsTopFrame ) ) { - //------------------------------------------------------------------------------------------------- + // II.III.I) SIBLINGS // Search on all our direct siblings - means all children of our parent. // Use this flag in combination with TASK. We must supress such upper search if @@ -1287,7 +1287,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // if we call it with the CHILDREN flag. We don't need that - we need the direct container // items of our parent only to start searches there. So we must use the container interface // XIndexAccess instead of XFrames. - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::SIBLINGS) && @@ -1327,12 +1327,12 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr } } - //------------------------------------------------------------------------------------------------- + // II.III.II) PARENT // Forward search to our parent (if he exists.) // To prevent us against recursive and superflous calls (which can occur if we allow him // to search on his children too) we must change used search flags. - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::PARENT) && @@ -1350,11 +1350,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr } } - //------------------------------------------------------------------------------------------------- + // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create // a new one ... we should do that. Used TaskCreator use Desktop instance automaticly as parent! - //------------------------------------------------------------------------------------------------- + if ( ( ! xTarget.is() ) && (nSearchFlags & css::frame::FrameSearchFlag::CREATE) @@ -1437,7 +1437,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) aWriteLock.unlock(); /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ - //_________________________________________________________________________________________________________ + // 1) If I'am not active before ... if( eState == E_INACTIVE ) { @@ -1470,7 +1470,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_ACTIVATED ); } - //_________________________________________________________________________________________________________ + // 2) I was active before or current activated and there is a path from here to bottom, who CAN be active. // But ouer direct child of path is not active yet. // (It can be, if activation occur in the middle of a current path!) @@ -1480,7 +1480,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) xActiveChild->activate(); } - //_________________________________________________________________________________________________________ + // 3) I was active before or current activated. But if I have no active child => I will get the focus! if ( eState == E_ACTIVE && !xActiveChild.is() ) { @@ -1528,14 +1528,14 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) // Work only, if there something to do! if( eState != E_INACTIVE ) { - //_____________________________________________________________________________________________________ + // 1) Deactivate all active children. if ( xActiveChild.is() && xActiveChild->isActive() ) { xActiveChild->deactivate(); } - //_____________________________________________________________________________________________________ + // 2) If I have the focus - I will lost it now. if( eState == E_FOCUS ) { @@ -1548,7 +1548,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_DEACTIVATING ); } - //_____________________________________________________________________________________________________ + // 3) If I'am active - I will be deactivated now. if( eState == E_ACTIVE ) { @@ -1560,7 +1560,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_DEACTIVATING ); } - //_____________________________________________________________________________________________________ + // 4) If there is a path from here to my parent ... // ... I'am on the top or in the middle of deactivated subtree and action was started here. // I must deactivate all frames from here to top, which are members of current path. @@ -1655,7 +1655,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::XWindow >& xComponentWindow , const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException ) { - //_____________________________________________________________________________________________________ + // Ignore this HACK of sfx2! // He call us with an valid controller without a valid window ... Thats not allowed! if ( xController.is() && ! xComponentWindow.is() ) @@ -1663,7 +1663,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - //_____________________________________________________________________________________________________ + // Get threadsafe some copies of used members. /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -1676,7 +1676,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aReadLock.unlock(); /* } SAFE */ - //_____________________________________________________________________________________________________ + // stop listening on old window // May it produce some trouble. // But don't forget to listen on new window again ... or reactivate listening @@ -1687,7 +1687,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X if (bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_DETACHING ); - //_____________________________________________________________________________________________________ + // otherwise release old component first // Always release controller before releasing window, // because controller may want to access its window! @@ -1723,7 +1723,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X xOldController = NULL; } - //_____________________________________________________________________________________________________ + // Now it's time to release the component window. // If controller wasn't released successfully - this code line shouldn't be reached. // Because in case of "suspend()==false" we return immediately with false ... @@ -1754,7 +1754,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X xOldComponentWindow = NULL; } - //_____________________________________________________________________________________________________ + // Now it's time to set the new component ... // By the way - find out our new "load state" - means if we have a valid component inside. /* SAFE { */ @@ -1766,14 +1766,14 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X aWriteLock.unlock(); /* } SAFE */ - //_____________________________________________________________________________________________________ + // notifies all interest listener, that current component was changed or a new one was loaded if (bIsConnected && bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_REATTACHED ); else if (bIsConnected && !bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED ); - //_____________________________________________________________________________________________________ + // A new component window doesn't know anything about current active/focus states. // Set this information on it! if ( @@ -3192,13 +3192,13 @@ void Frame::implts_setIconOnWindow() if( xContainerWindow.is() && xController.is() ) { - //------------------------------------------------------------------------------------------------------------- + // a) set default value to an invalid one. So we can start further searches for right icon id, if // first steps failed! // We must reset it to any fallback value - if no search step returns a valid result. sal_Int32 nIcon = -1; - //------------------------------------------------------------------------------------------------------------- + // b) try to find information on controller propertyset directly // Don't forget to catch possible exceptions - because these property is an optional one! css::uno::Reference< css::beans::XPropertySet > xSet( xController, css::uno::UNO_QUERY ); @@ -3216,7 +3216,7 @@ void Frame::implts_setIconOnWindow() } } - //------------------------------------------------------------------------------------------------------------- + // c) if b) failed ... analyze argument list of currently loaded document insde the frame to find the filter. // He can be used to detect right factory - and these can be used to match factory to icon ... if( nIcon == -1 ) @@ -3230,14 +3230,14 @@ void Frame::implts_setIconOnWindow() } } - //------------------------------------------------------------------------------------------------------------- + // d) if all steps failed - use fallback! if( nIcon == -1 ) { nIcon = 0; } - //------------------------------------------------------------------------------------------------------------- + // e) set icon on container window now // Don't forget SolarMutex! We use vcl directly :-( // Check window pointer for right WorkWindow class too!!! @@ -3390,7 +3390,7 @@ void Frame::implts_checkSuicide() {} } -//_______________________________________________________________ + /** little helper to enable/disable the menu closer at the menubar of the given frame. @@ -3423,7 +3423,7 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame {} } -//_______________________________________________________________ + /** it checks, which of the top level task frames must have the special menu closer for switching to the backing window mode. @@ -3461,7 +3461,7 @@ void Frame::impl_checkMenuCloser() // specify the new frame, which must have this special state ... css::uno::Reference< css::frame::XFrame2 > xNewCloserFrame; - // ----------------------------- + // a) // If there exist ate least one other frame - there are two frames currently open. // But we can enable this closer only, if one of these two tasks includes the help module. @@ -3481,7 +3481,7 @@ void Frame::impl_checkMenuCloser() // Because it's set at the special member aAnalyzer.m_xBackingComponent ... :-) xNewCloserFrame.set( aAnalyzer.m_lOtherVisibleFrames[0], css::uno::UNO_QUERY_THROW ); } - // ----------------------------- + // b) // There is no other frame ... means no other document frame. The help module // will be handled separately and must(!) be ignored here ... excepting weself includes the help. @@ -3513,9 +3513,9 @@ void Frame::impl_checkMenuCloser() /* } STATIC SAFE */ } -//_________________________________________________________________________________________________________________ + // debug methods -//_________________________________________________________________________________________________________________ + //***************************************************************************************************************** // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer! diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 4b590bea2d94..a19a39ecded0 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -49,13 +49,13 @@ class ModuleManager: { private: - //--------------------------------------- + /** the global uno service manager. Must be used to create own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; - //--------------------------------------- + /** points to the underlying configuration. This ModuleManager does not cache - it calls directly the configuration API! @@ -121,7 +121,7 @@ public: private: - //--------------------------------------- + /** @short makes the real identification of the module. @descr It checks for the optional but preferred interface diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index d7e1f6f3c8de..90d61d2b6b13 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -456,7 +456,7 @@ private: css::uno::Reference< css::container::XNameAccess > fa_getCfgNew(); }; -//----------------------------------------------------------------------------- + PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : PathSettings_BASE(*(static_cast<osl::Mutex *>(this))) , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper) @@ -466,7 +466,7 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte { } -//----------------------------------------------------------------------------- + PathSettings::~PathSettings() { disposing(); @@ -490,7 +490,7 @@ void SAL_CALL PathSettings::disposing() m_pPropHelp = 0; } -//------------------------------------------------------------------ + css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException) { @@ -500,7 +500,7 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp return aRet; } -//------------------------------------------------------------------ + css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) throw(css::uno::RuntimeException) { @@ -510,7 +510,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) ); } -//----------------------------------------------------------------------------- + void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException) { @@ -541,7 +541,7 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven impl_rebuildPropertyDescriptor(); } -//----------------------------------------------------------------------------- + void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException) { @@ -551,7 +551,7 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) m_xCfgNew.clear(); } -//----------------------------------------------------------------------------- + OUString PathSettings::getStringProperty(const OUString& p1) throw(css::uno::RuntimeException) { @@ -561,14 +561,14 @@ OUString PathSettings::getStringProperty(const OUString& p1) return s; } -//----------------------------------------------------------------------------- + void PathSettings::setStringProperty(const OUString& p1, const OUString& p2) throw(css::uno::RuntimeException) { ::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2)); } -//----------------------------------------------------------------------------- + void PathSettings::impl_readAll() { try @@ -591,7 +591,7 @@ void PathSettings::impl_readAll() impl_rebuildPropertyDescriptor(); } -//----------------------------------------------------------------------------- + // NO substitution here ! It's done outside ... OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) { @@ -618,7 +618,7 @@ OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) return aPathVal; } -//----------------------------------------------------------------------------- + // NO substitution here ! It's done outside ... PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) { @@ -664,7 +664,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) return aPathVal; } -//----------------------------------------------------------------------------- + void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) { m_bIgnoreEvents = sal_True; @@ -710,7 +710,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) m_bIgnoreEvents = sal_False; } -//----------------------------------------------------------------------------- + void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, const OUStringList& lOld ) { @@ -739,7 +739,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, } } -//----------------------------------------------------------------------------- + PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath , sal_Bool bNotifyListener) { @@ -846,7 +846,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath return eOp; } -//----------------------------------------------------------------------------- + css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUString& sPath) { OUString sOldStyleProp = sPath; @@ -890,7 +890,7 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt return lIDs; } -//----------------------------------------------------------------------------- + void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ , const OUString& sPath , const PathSettings::PathInfo* pPathOld, @@ -968,7 +968,7 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ } } -//----------------------------------------------------------------------------- + void PathSettings::impl_subst( OUStringList& lVals , const css::uno::Reference< css::util::XStringSubstitution >& xSubst , sal_Bool bReSubst) @@ -990,7 +990,7 @@ void PathSettings::impl_subst( OUStringList& } } -//----------------------------------------------------------------------------- + void PathSettings::impl_subst(PathSettings::PathInfo& aPath , sal_Bool bReSubst) { @@ -1004,7 +1004,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, sal_False); } -//----------------------------------------------------------------------------- + OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; @@ -1041,7 +1041,7 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r return sPathVal.makeStringAndClear(); } -//----------------------------------------------------------------------------- + OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePath) const { OUStringList lList; @@ -1057,7 +1057,7 @@ OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePa return lList; } -//----------------------------------------------------------------------------- + void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, OUStringList& lList) { @@ -1086,7 +1086,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, lList.erase(pItem); } -//----------------------------------------------------------------------------- + void PathSettings::impl_rebuildPropertyDescriptor() { // SAFE -> @@ -1146,7 +1146,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() // <- SAFE } -//----------------------------------------------------------------------------- + css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const { const PathSettings::PathInfo* pPath = impl_getPathAccessConst(nID); @@ -1185,7 +1185,7 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const return aVal; } -//----------------------------------------------------------------------------- + void PathSettings::impl_setPathValue( sal_Int32 nID , const css::uno::Any& aVal) { @@ -1292,7 +1292,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , pOrgPath->takeOver(aChangePath); } -//----------------------------------------------------------------------------- + sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const { OUStringList::const_iterator pIt; @@ -1308,7 +1308,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const return sal_True; } -//----------------------------------------------------------------------------- + sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const { // allow empty path to reset a path. @@ -1321,7 +1321,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const return (! INetURLObject(sPath).HasError()); } -//----------------------------------------------------------------------------- + OUString impl_extractBaseFromPropName(const OUString& sPropName) { sal_Int32 i = sPropName.indexOf(POSTFIX_INTERNAL_PATHS); @@ -1337,7 +1337,7 @@ OUString impl_extractBaseFromPropName(const OUString& sPropName) return sPropName; } -//----------------------------------------------------------------------------- + PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) { // SAFE -> @@ -1357,7 +1357,7 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) // <- SAFE } -//----------------------------------------------------------------------------- + const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nHandle) const { // SAFE -> @@ -1377,7 +1377,7 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH // <- SAFE } -//----------------------------------------------------------------------------- + sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aConvertedValue, css::uno::Any& aOldValue , sal_Int32 nHandle , @@ -1394,7 +1394,7 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC aConvertedValue); } -//----------------------------------------------------------------------------- + void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::uno::Exception) @@ -1403,20 +1403,20 @@ void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 impl_setPathValue(nHandle, aValue); } -//----------------------------------------------------------------------------- + void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const { aValue = impl_getPathValue(nHandle); } -//----------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL PathSettings::getInfoHelper() { return *m_pPropHelp; } -//----------------------------------------------------------------------------- + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo() throw(css::uno::RuntimeException) { @@ -1424,7 +1424,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPr ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper())); } -//----------------------------------------------------------------------------- + css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubstitution() { css::uno::Reference< css::util::XStringSubstitution > xSubst; @@ -1450,7 +1450,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti return xSubst; } -//----------------------------------------------------------------------------- + css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() { const OUString CFG_NODE_OLD("org.openoffice.Office.Common/Path/Current"); @@ -1479,7 +1479,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() return xCfg; } -//----------------------------------------------------------------------------- + css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() { const OUString CFG_NODE_NEW("org.openoffice.Office.Paths/Paths"); diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 8f480f81cce0..6734ff030a5b 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -393,9 +393,9 @@ static const FixedVariable aFixedVarTable[] = { RTL_CONSTASCII_STRINGPARAM("$(brandbaseurl)"),PREDEFVAR_BRANDBASEURL, true } }; -//_________________________________________________________________________________________________________________ + // Implementation helper classes -//_________________________________________________________________________________________________________________ + OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const OUString& aOSString ) { @@ -488,9 +488,9 @@ void SubstitutePathVariables_Impl::Commit() } -//_________________________________________________________________________________________________________________ + // private methods -//_________________________________________________________________________________________________________________ + OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem() { @@ -822,9 +822,9 @@ throw ( NoSuchElementException, RuntimeException ) return impl_getSubstituteVariableValue( aVariable ); } -//_________________________________________________________________________________________________________________ + // protected methods -//_________________________________________________________________________________________________________________ + IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify) { diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 2630ff951a4b..0e38d780a6a3 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -122,9 +122,9 @@ public: return aSeq; } - //--------------------------------------------------------------------------------------------------------- + // XSimpleTabController - //--------------------------------------------------------------------------------------------------------- + virtual sal_Int32 SAL_CALL insertTab() throw ( css::uno::RuntimeException ); virtual void SAL_CALL removeTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ); @@ -135,9 +135,9 @@ public: virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException ); - //--------------------------------------------------------------------------------------------------------- + // XComponent - //--------------------------------------------------------------------------------------------------------- + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException ); diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index a45a72afd362..c683ff44bc76 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -55,7 +55,7 @@ class TaskCreatorService : private osl::Mutex, { private: - //--------------------------------------- + /** @short the global uno service manager. @descr Must be used to create own needed services. */ @@ -115,19 +115,19 @@ private: OUString impl_filterNames( const OUString& sName ); }; -//----------------------------------------------- + TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext) : TaskCreatorService_BASE(*static_cast<osl::Mutex *>(this)) , m_xContext (xContext ) { } -//----------------------------------------------- + TaskCreatorService::~TaskCreatorService() { } -//----------------------------------------------- + css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance() throw(css::uno::Exception , css::uno::RuntimeException) @@ -135,7 +135,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >()); } -//----------------------------------------------- + css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -218,7 +218,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI return css::uno::Reference< css::uno::XInterface >(xFrame, css::uno::UNO_QUERY_THROW); } -//----------------------------------------------- + void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const { // SYNCHRONIZED -> @@ -229,7 +229,7 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< // <- SYNCHRONIZED } -//----------------------------------------------- + css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow , const css::awt::Rectangle& aPosSize , sal_Bool bTopWindow ) @@ -286,7 +286,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai return xWindow; } -//----------------------------------------------- + css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow, const OUString& sName ) @@ -315,7 +315,7 @@ css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFram return xNewFrame; } -//----------------------------------------------- + void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -330,7 +330,7 @@ void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Re xInit->initialize(lInitData); } -//----------------------------------------------- + void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { // Special feature: It's allowed for frames using a top level window only! @@ -344,7 +344,7 @@ void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Refe xInit->initialize(lInitData); } -//----------------------------------------------- + void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame2 >& xFrame ) { TitleBarUpdate* pHelper = new TitleBarUpdate (m_xContext); diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index c03e0b1d8357..21061fe1a0b1 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -36,9 +36,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/sequenceashashmap.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star; @@ -103,9 +103,9 @@ TabWindow::~TabWindow() { } -//--------------------------------------------------------------------------------------------------------- + // Helper -//--------------------------------------------------------------------------------------------------------- + void TabWindow::implts_LayoutWindows() const { @@ -232,9 +232,9 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con } } -//--------------------------------------------------------------------------------------------------------- + // Links -//--------------------------------------------------------------------------------------------------------- + IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl ) { @@ -266,9 +266,9 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) return 1; } -//--------------------------------------------------------------------------------------------------------- + // XInitilization -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException) @@ -423,9 +423,9 @@ throw (css::uno::Exception, css::uno::RuntimeException) } } -//--------------------------------------------------------------------------------------------------------- + // XComponent -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) { // Send message to all listener and forget her references. @@ -491,17 +491,17 @@ throw (css::uno::RuntimeException) m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -//--------------------------------------------------------------------------------------------------------- + // XEventListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL TabWindow::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException ) { } -//--------------------------------------------------------------------------------------------------------- + // XWindowListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& ) throw( css::uno::RuntimeException ) { @@ -548,9 +548,9 @@ throw( css::uno::RuntimeException ) pTabControl->Hide(); } -//--------------------------------------------------------------------------------------------------------- + // XTopWindowListener -//--------------------------------------------------------------------------------------------------------- + void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& ) throw (css::uno::RuntimeException) { @@ -589,9 +589,9 @@ throw (css::uno::RuntimeException) { } -//--------------------------------------------------------------------------------------------------------- + // XSimpleTabController -//--------------------------------------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL TabWindow::insertTab() throw (css::uno::RuntimeException) @@ -815,9 +815,9 @@ throw (css::uno::RuntimeException) ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >* ) NULL ), xListener ); } -//--------------------------------------------------------------------------------------------------------- + // OPropertySetHelper -//--------------------------------------------------------------------------------------------------------- + // XPropertySet helper sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any& aConvertedValue , diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index 718447bbf2eb..90297d3d876d 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -31,9 +31,9 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index b75b7fd66451..7f5f090c43e6 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -34,16 +34,16 @@ #include <rtl/instance.hxx> #include <cppuhelper/implbase2.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star; -//_________________________________________________________________________________________________________________ + // Namespace -//_________________________________________________________________________________________________________________ + static const char GLOBALSETTINGS_ROOT_ACCESS[] = "/org.openoffice.Office.UI.GlobalSettings/Toolbars"; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index b83766c41fb7..076c6291c014 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -147,7 +147,7 @@ static OUString getCanonicalName( const OUString& rFileName ) return aBuf.makeStringAndClear(); } -//_________________________________________________________________________________________________________________ + CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) : m_bVectorInit( sal_False ), @@ -320,7 +320,7 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const OUString& rCommandU return impl_getImageCommandNameVector(); } -//_________________________________________________________________________________________________________________ + GlobalImageList::GlobalImageList( const uno::Reference< uno::XComponentContext >& rxContext ) : CmdImageList( rxContext, OUString() ), diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 611629d25ab1..ee8cbe638638 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -48,9 +48,9 @@ #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 079d4a28bd44..aa6aaf01f867 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -58,9 +58,9 @@ #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 755da4671850..0049f6f21ecd 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::util; namespace framework { -// ------------------------------------------------------------------ + // Wrapper class to notify controller about events from combobox. // Unfortunaltly the events are notifed through virtual methods instead @@ -135,7 +135,7 @@ bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } -// ------------------------------------------------------------------ + ComboboxToolbarController::ComboboxToolbarController( const Reference< XComponentContext >& rxContext, @@ -159,13 +159,13 @@ ComboboxToolbarController::ComboboxToolbarController( m_pToolbar->SetItemWindow( m_nID, m_pComboBox ); } -// ------------------------------------------------------------------ + ComboboxToolbarController::~ComboboxToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL ComboboxToolbarController::dispose() throw ( RuntimeException ) @@ -180,7 +180,7 @@ throw ( RuntimeException ) m_pComboBox = 0; } -// ------------------------------------------------------------------ + Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -194,7 +194,7 @@ Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyM return aArgs; } -// ------------------------------------------------------------------ + void ComboboxToolbarController::Select() { @@ -259,7 +259,7 @@ bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } -// -------------------------------------------------------- + void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 1d64c569801e..71a4b4947c91 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::util; namespace framework { -// ------------------------------------------------------------------ + ComplexToolbarController::ComplexToolbarController( const Reference< XComponentContext >& rxContext, @@ -66,13 +66,13 @@ ComplexToolbarController::ComplexToolbarController( m_xURLTransformer.set( URLTransformer::create(m_xContext) ); } -// ------------------------------------------------------------------ + ComplexToolbarController::~ComplexToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL ComplexToolbarController::dispose() throw ( RuntimeException ) @@ -87,7 +87,7 @@ throw ( RuntimeException ) m_nID = 0; } -// ------------------------------------------------------------------ + Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 1 ); @@ -97,7 +97,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo aArgs[0].Value <<= KeyModifier; return aArgs; } -// ----------------------------------------------------------------------------- + void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier ) throw ( RuntimeException ) { @@ -136,7 +136,7 @@ throw ( RuntimeException ) } } -// ------------------------------------------------------------------ + void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) @@ -206,7 +206,7 @@ throw ( RuntimeException ) } } -// ------------------------------------------------------------------ + IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { @@ -227,7 +227,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteI return 0; } -// ------------------------------------------------------------------ + IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo ) { @@ -252,7 +252,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, return 0; } -// ------------------------------------------------------------------ + void ComplexToolbarController::addNotifyInfo( const OUString& aEventName, @@ -282,7 +282,7 @@ void ComplexToolbarController::addNotifyInfo( } } -// -------------------------------------------------------- + sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); @@ -294,7 +294,7 @@ sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow ) return aPixelSize.Height(); } -// -------------------------------------------------------- + uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const OUString& aCommand ) const { @@ -310,7 +310,7 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm return xDispatch; } -// -------------------------------------------------------- + const ::com::sun::star::util::URL& ComplexToolbarController::getInitializedURL() { diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 190428d918df..fef232b39d45 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::util; namespace framework { -// ------------------------------------------------------------------ + // Wrapper class to notify controller about events from ListBox. // Unfortunaltly the events are notifed through virtual methods instead @@ -118,7 +118,7 @@ bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } -// ------------------------------------------------------------------ + DropdownToolbarController::DropdownToolbarController( const Reference< XComponentContext >& rxContext, @@ -143,13 +143,13 @@ DropdownToolbarController::DropdownToolbarController( m_pListBoxControl->SetDropDownLineCount( 5 ); } -// ------------------------------------------------------------------ + DropdownToolbarController::~DropdownToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL DropdownToolbarController::dispose() throw ( RuntimeException ) @@ -164,7 +164,7 @@ throw ( RuntimeException ) m_pListBoxControl = 0; } -// ------------------------------------------------------------------ + Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -178,7 +178,7 @@ Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyM return aArgs; } -// ------------------------------------------------------------------ + void DropdownToolbarController::Select() { @@ -210,7 +210,7 @@ bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) return false; } -// -------------------------------------------------------- + void DropdownToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 954d3ae5056b..211de6c724df 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::util; namespace framework { -// ------------------------------------------------------------------ + // Wrapper class to notify controller about events from edit. // Unfortunaltly the events are notifed through virtual methods instead @@ -117,7 +117,7 @@ bool EditControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } -// ------------------------------------------------------------------ + EditToolbarController::EditToolbarController( const Reference< XComponentContext >& rxContext, @@ -140,13 +140,13 @@ EditToolbarController::EditToolbarController( m_pToolbar->SetItemWindow( m_nID, m_pEditControl ); } -// ------------------------------------------------------------------ + EditToolbarController::~EditToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL EditToolbarController::dispose() throw ( RuntimeException ) @@ -161,7 +161,7 @@ throw ( RuntimeException ) m_pEditControl = 0; } -// ------------------------------------------------------------------ + Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -175,7 +175,7 @@ Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModif return aArgs; } -// ------------------------------------------------------------------ + void EditToolbarController::Modify() { @@ -214,7 +214,7 @@ bool EditToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } -// -------------------------------------------------------- + void EditToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 4105279a73e0..1f243371660d 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -36,9 +36,9 @@ #include <vcl/mnemonic.hxx> #include <osl/mutex.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 22752cd2686d..69625f061181 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -38,9 +38,9 @@ #include <svtools/ctrltool.hxx> #include <osl/mutex.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 04de4a921efd..1b866b0a88b3 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -38,9 +38,9 @@ #include <vcl/i18nhelp.hxx> #include <rtl/ustrbuf.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 1854b8761d90..f0656db07bd4 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -39,9 +39,9 @@ #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index f6f6bdbdf172..3065fe785c8a 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -60,7 +60,7 @@ namespace framework static uno::WeakReference< util::XMacroExpander > m_xMacroExpander; -// ------------------------------------------------------------------ + uno::Reference< util::XMacroExpander > GetMacroExpander() { @@ -96,7 +96,7 @@ static void SubstituteVariables( OUString& aURL ) } } -// ------------------------------------------------------------------ + ImageButtonToolbarController::ImageButtonToolbarController( const Reference< XComponentContext >& rxContext, @@ -114,13 +114,13 @@ ImageButtonToolbarController::ImageButtonToolbarController( m_pToolbar->SetItemImage( m_nID, aImage ); } -// ------------------------------------------------------------------ + ImageButtonToolbarController::~ImageButtonToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL ImageButtonToolbarController::dispose() throw ( RuntimeException ) @@ -129,7 +129,7 @@ throw ( RuntimeException ) ComplexToolbarController::dispose(); } -// ------------------------------------------------------------------ + void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 5749f0013257..e2c982cd902c 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -52,9 +52,9 @@ #include <map> #include <set> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index aca7a24becaf..9226539ad224 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -754,9 +754,9 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId) pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false ); } -//_________________________________________________________________________________________________________________ + // vcl handler -//_________________________________________________________________________________________________________________ + namespace { diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index b602b3932a72..16da1544849d 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -46,9 +46,9 @@ #include <unotools/moduleoptions.hxx> #include <osl/mutex.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index a6f702d53da2..b1c88f89fb31 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star::util; namespace framework { -// ------------------------------------------------------------------ + // Wrapper class to notify controller about events from combobox. // Unfortunaltly the events are notifed through virtual methods instead @@ -171,7 +171,7 @@ bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) return nRet; } -// ------------------------------------------------------------------ + SpinfieldToolbarController::SpinfieldToolbarController( const Reference< XComponentContext >& rxContext, @@ -201,13 +201,13 @@ SpinfieldToolbarController::SpinfieldToolbarController( m_pToolbar->SetItemWindow( m_nID, m_pSpinfieldControl ); } -// ------------------------------------------------------------------ + SpinfieldToolbarController::~SpinfieldToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL SpinfieldToolbarController::dispose() throw ( RuntimeException ) @@ -222,7 +222,7 @@ throw ( RuntimeException ) m_pSpinfieldControl = 0; } -// ------------------------------------------------------------------ + Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -239,7 +239,7 @@ Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 Key return aArgs; } -// ------------------------------------------------------------------ + void SpinfieldToolbarController::Up() { @@ -336,7 +336,7 @@ bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) return false; } -// -------------------------------------------------------- + void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 03068017932d..5dbe7a306d8b 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::util; namespace framework { -// ------------------------------------------------------------------ + ToggleButtonToolbarController::ToggleButtonToolbarController( const Reference< XComponentContext >& rxContext, @@ -72,13 +72,13 @@ ToggleButtonToolbarController::ToggleButtonToolbarController( m_pToolbar->SetItemBits( m_nID, TIB_DROPDOWN | m_pToolbar->GetItemBits( m_nID ) ); } -// ------------------------------------------------------------------ + ToggleButtonToolbarController::~ToggleButtonToolbarController() { } -// ------------------------------------------------------------------ + void SAL_CALL ToggleButtonToolbarController::dispose() throw ( RuntimeException ) @@ -87,7 +87,7 @@ throw ( RuntimeException ) ComplexToolbarController::dispose(); } -// ------------------------------------------------------------------ + Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); @@ -100,7 +100,7 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 return aArgs; } -// ------------------------------------------------------------------ + uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) @@ -133,7 +133,7 @@ throw (::com::sun::star::uno::RuntimeException) return xWindow; } -// ------------------------------------------------------------------ + void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index a1afbab0d253..ce4df551fefd 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -75,9 +75,9 @@ #include <boost/bind.hpp> #include <svtools/acceleratorexecute.hxx> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star::awt; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index aea77062fcd8..45b576561d1c 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -56,9 +56,9 @@ #include <unotools/cmdoptions.hxx> #include <svtools/miscopt.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 6e31dc6b23cb..413aabc0204d 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -46,9 +46,9 @@ using namespace com::sun::star::configuration; using namespace com::sun::star::container; using namespace ::com::sun::star::frame; -//_________________________________________________________________________________________________________________ + // Namespace -//_________________________________________________________________________________________________________________ + struct ModuleToCommands { diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index dd61fa55ef7b..35c55755171e 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -33,18 +33,18 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> -//_________________________________________________________________________________________________________________ + // Defines -//_________________________________________________________________________________________________________________ + using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; -//_________________________________________________________________________________________________________________ + // Namespace -//_________________________________________________________________________________________________________________ + namespace framework { diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 9e1f5a46050c..342bb280e3df 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -33,7 +33,7 @@ namespace framework{ -//----------------------------------------------- + /* Throws a SaxException in case a wrong formated XML structure was detected. @@ -56,7 +56,7 @@ namespace framework{ css::uno::Any()); \ } -//----------------------------------------------- + AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) : ThreadHelpBase (&Application::GetSolarMutex()) , m_rContainer (rContainer ) @@ -65,19 +65,19 @@ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& { } -//----------------------------------------------- + AcceleratorConfigurationReader::~AcceleratorConfigurationReader() { } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::startDocument() throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::endDocument() throw(css::xml::sax::SAXException, css::uno::RuntimeException ) @@ -94,7 +94,7 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument() } } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& sElement , const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList) throw(css::xml::sax::SAXException, @@ -186,7 +186,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& } } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) @@ -210,21 +210,21 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen } } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) { } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/, const OUString& /*sData*/ ) throw(css::xml::sax::SAXException, @@ -232,7 +232,7 @@ void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUStri { } -//----------------------------------------------- + void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator) throw(css::xml::sax::SAXException, css::uno::RuntimeException ) @@ -240,7 +240,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno: m_xLocator = xLocator; } -//----------------------------------------------- + AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const OUString& sElement) { AcceleratorConfigurationReader::EXMLElement eElement; @@ -257,7 +257,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl return eElement; } -//----------------------------------------------- + AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const OUString& sAttribute) { AcceleratorConfigurationReader::EXMLAttribute eAttribute; @@ -282,7 +282,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im return eAttribute; } -//----------------------------------------------- + OUString AcceleratorConfigurationReader::implts_getErrorLineString() { if (!m_xLocator.is()) diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 70fa9ab70adf..f18a72b9de21 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -35,7 +35,7 @@ namespace framework{ -//----------------------------------------------- + AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) : ThreadHelpBase(&Application::GetSolarMutex()) @@ -44,12 +44,12 @@ AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const Accelerator { } -//----------------------------------------------- + AcceleratorConfigurationWriter::~AcceleratorConfigurationWriter() { } -//----------------------------------------------- + void AcceleratorConfigurationWriter::flush() { // SAFE -> ---------------------------------- @@ -101,7 +101,7 @@ void AcceleratorConfigurationWriter::flush() xCFG->endDocument(); } -//----------------------------------------------- + void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , const OUString& sCommand, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ) diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index aab1e819c665..131e214c8513 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -601,9 +601,9 @@ OUString OReadImagesDocumentHandler::getErrorLineString() } -//_________________________________________________________________________________________________________________ + // OWriteImagesDocumentHandler -//_________________________________________________________________________________________________________________ + OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( const ImageListsDescriptor& aItems, @@ -676,9 +676,9 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw m_xWriteDocumentHandler->endDocument(); } -//_________________________________________________________________________________________________________________ + // protected member functions -//_________________________________________________________________________________________________________________ + void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw ( SAXException, RuntimeException ) |