diff options
Diffstat (limited to 'framework/source')
224 files changed, 5237 insertions, 5245 deletions
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index d6e596d6a409..96a266818d31 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::AcceleratorCache() : ThreadHelpBase(&Application::GetSolarMutex()) { } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) : ThreadHelpBase(&Application::GetSolarMutex()) { @@ -70,62 +70,62 @@ 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 -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + m_lCommand2Keys = rCopy.m_lCommand2Keys; m_lKey2Commands = rCopy.m_lKey2Commands; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy) { takeOver(rCopy); return *this; } -//----------------------------------------------- +//----------------------------------------------- sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + return (m_lKey2Commands.find(aKey) != m_lKey2Commands.end()); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- sal_Bool AcceleratorCache::hasCommand(const ::rtl::OUString& sCommand) const { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + return (m_lCommand2Keys.find(sCommand) != m_lCommand2Keys.end()); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const { TKeyList lKeys; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); lKeys.reserve(m_lKey2Commands.size()); - + TKey2Commands::const_iterator pIt; TKey2Commands::const_iterator pEnd = m_lKey2Commands.end(); for ( pIt = m_lKey2Commands.begin(); @@ -134,14 +134,14 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const { lKeys.push_back(pIt->first); } - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lKeys; } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , const ::rtl::OUString& sCommand) { @@ -149,62 +149,62 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , WriteGuard aWriteLock(m_aLock); // register command for the specified key - m_lKey2Commands[aKey] = sCommand; + m_lKey2Commands[aKey] = sCommand; // update optimized structure to bind multiple keys to one command - TKeyList& rKeyList = m_lCommand2Keys[sCommand]; + TKeyList& rKeyList = m_lCommand2Keys[sCommand]; rKeyList.push_back(aKey); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUString& sCommand) const { TKeyList lKeys; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + TCommand2Keys::const_iterator pCommand = m_lCommand2Keys.find(sCommand); if (pCommand == m_lCommand2Keys.end()) throw css::container::NoSuchElementException( - ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); - lKeys = pCommand->second; - + ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); + lKeys = pCommand->second; + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lKeys; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const { ::rtl::OUString sCommand; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey); if (pKey == m_lKey2Commands.end()) throw css::container::NoSuchElementException( - ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); + ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); sCommand = pKey->second; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return sCommand; } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + // check if key exists TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey); if (pKey == m_lKey2Commands.end()) @@ -212,26 +212,26 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) // get its registered command // Because we must know its place inside the optimized - // structure, which bind keys to commands, too! + // structure, which bind keys to commands, too! ::rtl::OUString sCommand = pKey->second; - pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-) + pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-) // remove key from primary list m_lKey2Commands.erase(aKey); - + // remove key from optimized command list m_lCommand2Keys.erase(sCommand); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + const TKeyList& lKeys = getKeysByCommand(sCommand); AcceleratorCache::TKeyList::const_iterator pKey ; for ( pKey = lKeys.begin(); @@ -242,9 +242,9 @@ void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand) removeKey(rKey); } m_lCommand2Keys.erase(sCommand); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } - + } // namespace framework diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 88a941294ae0..43772f5c4273 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ namespace framework { const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier... ::rtl::OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex)); - + if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT ) sKeyBuffer.appendAscii("_SHIFT"); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 ) @@ -127,8 +127,8 @@ namespace framework return sKeyBuffer.makeStringAndClear(); } -//----------------------------------------------- -// XInterface, XTypeProvider +//----------------------------------------------- +// XInterface, XTypeProvider DEFINE_XINTERFACE_6(XMLBasedAcceleratorConfiguration , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), @@ -139,14 +139,14 @@ DEFINE_XINTERFACE_6(XMLBasedAcceleratorConfiguration , DIRECT_INTERFACE(css::ui::XUIConfiguration )) DEFINE_XTYPEPROVIDER_6(XMLBasedAcceleratorConfiguration , - css::lang::XTypeProvider , + css::lang::XTypeProvider , css::ui::XAcceleratorConfiguration , css::form::XReset , css::ui::XUIConfigurationPersistence, css::ui::XUIConfigurationStorage , css::ui::XUIConfiguration ) - -//----------------------------------------------- + +//----------------------------------------------- XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xSMGR (xSMGR ) @@ -155,45 +155,45 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un { } -//----------------------------------------------- +//----------------------------------------------- XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration() { LOG_ASSERT(!m_pWriteCache, "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration()\nChanges not flushed. Ignore it ...") } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(); AcceleratorCache::TKeyList lKeys = rCache.getAllKeys(); return lKeys.getAsConstList(); - + // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(); if (!rCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< ::cppu::OWeakObject* >(this)); return rCache.getCommandByKey(aKeyEvent); - + // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -226,7 +226,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 ) @@ -239,12 +239,12 @@ throw(css::container::NoSuchElementException, throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< ::cppu::OWeakObject* >(this)); - rCache.removeKey(aKeyEvent); + rCache.removeKey(aKeyEvent); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -255,35 +255,35 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 1); - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(); if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< ::cppu::OWeakObject* >(this)); - + AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(sCommand); return lKeys.getAsConstList(); - + // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + sal_Int32 i = 0; - sal_Int32 c = lCommandList.getLength(); + sal_Int32 c = lCommandList.getLength(); css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! AcceleratorCache& rCache = impl_getCFG(); - + for (i=0; i<c; ++i) { const ::rtl::OUString& rCommand = lCommandList[i]; @@ -292,25 +292,25 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); - + if (!rCache.hasCommand(rCommand)) continue; - + AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(rCommand); if ( lKeys.empty() ) continue; - + css::uno::Any& rAny = lPreferredOnes[i]; - rAny <<= *(lKeys.begin()); + rAny <<= *(lKeys.begin()); } - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lPreferredOnes; } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -321,22 +321,22 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 0); - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache! if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( ::rtl::OUString::createFromAscii("Command does not exists inside this container."), static_cast< ::cppu::OWeakObject* >(this)); - rCache.removeCommand(sCommand); - + rCache.removeCommand(sCommand); + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException) @@ -351,13 +351,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() xStreamNoLang = m_aPresetHandler.openPreset(PresetHandler::PRESET_DEFAULT(), sal_True); } catch(const css::io::IOException&) {} // does not have to exist - aReadLock.unlock(); + aReadLock.unlock(); // <- SAFE ---------------------------------- css::uno::Reference< css::io::XInputStream > xIn; if (xStream.is()) xIn = xStream->getInputStream(); - if (!xIn.is()) + if (!xIn.is()) throw css::io::IOException( ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."), static_cast< ::cppu::OWeakObject* >(this)); @@ -366,10 +366,10 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_aReadCache = AcceleratorCache(); - aWriteLock.unlock(); + aWriteLock.unlock(); // <- SAFE ---------------------------------- - impl_ts_load(xIn); + impl_ts_load(xIn); // Load also the general language independent default accelerators // (ignoring the already defined accelerators) @@ -380,8 +380,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() impl_ts_load(xIn); } } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException) @@ -389,14 +389,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create! - aReadLock.unlock(); + aReadLock.unlock(); // <- SAFE ---------------------------------- css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); - if (!xOut.is()) + if (!xOut.is()) throw css::io::IOException( ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); @@ -408,8 +408,8 @@ 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) @@ -422,18 +422,18 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); - - if (!xOut.is()) + + if (!xOut.is()) throw css::io::IOException( ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); - + impl_ts_save(xOut); - + // 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) { @@ -442,8 +442,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R return (m_pWriteCache != 0); // <- SAFE ---------------------------------- } - -//----------------------------------------------- + +//----------------------------------------------- ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException) { @@ -456,39 +456,39 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); - return !(xOut.is()); + return !(xOut.is()); } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::setStorage()", "TODO implement this HACK .-)") } - -//----------------------------------------------- + +//----------------------------------------------- ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::hasStorage()", "TODO implement this HACK .-)") return sal_False; } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::addConfigurationListener()", "TODO implement me") } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::removeConfigurationListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { @@ -500,15 +500,15 @@ throw(css::uno::RuntimeException) reload(); } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::addResetListener()", "TODO implement me") } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { @@ -522,12 +522,12 @@ void XMLBasedAcceleratorConfiguration::changesOccured(const ::rtl::OUString& /*s reload(); } -//----------------------------------------------- +//----------------------------------------------- void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; if (m_pWriteCache) { @@ -536,14 +536,14 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c m_pWriteCache = 0; delete pTemp; } - + aWriteLock.unlock(); // <- SAFE ---------------------------------- css::uno::Reference< css::io::XSeekable > xSeek(xStream, css::uno::UNO_QUERY); if (xSeek.is()) xSeek->seek(0); - + // add accelerators to the cache (the cache is not cleared) // SAFE -> ---------------------------------- aWriteLock.lock(); @@ -554,29 +554,29 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c // Use further a temp cache for reading! AcceleratorConfigurationReader* pReader = new AcceleratorConfigurationReader(m_aReadCache); css::uno::Reference< css::xml::sax::XDocumentHandler > xReader (static_cast< ::cppu::OWeakObject* >(pReader), css::uno::UNO_QUERY_THROW); - SaxNamespaceFilter* pFilter = new SaxNamespaceFilter(xReader); + SaxNamespaceFilter* pFilter = new SaxNamespaceFilter(xReader); css::uno::Reference< css::xml::sax::XDocumentHandler > xFilter (static_cast< ::cppu::OWeakObject* >(pFilter), css::uno::UNO_QUERY_THROW); // connect parser, filter and stream css::uno::Reference< css::xml::sax::XParser > xParser(xSMGR->createInstance(SERVICENAME_SAXPARSER), css::uno::UNO_QUERY_THROW); xParser->setDocumentHandler(xFilter); - + css::xml::sax::InputSource aSource; aSource.aInputStream = xStream; // TODO think about error handling xParser->parseStream(aSource); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache aCache; sal_Bool bChanged = (m_pWriteCache != 0); if (bChanged) @@ -584,13 +584,13 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c else aCache.takeOver(m_aReadCache); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::io::XTruncate > xClearable(xStream, css::uno::UNO_QUERY_THROW); xClearable->truncate(); - + // TODO can be removed if seek(0) is done by truncate() automaticly! css::uno::Reference< css::io::XSeekable > xSeek(xStream, css::uno::UNO_QUERY); if (xSeek.is()) @@ -600,15 +600,15 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c css::uno::Reference< css::xml::sax::XDocumentHandler > xWriter (xSMGR->createInstance(SERVICENAME_SAXWRITER), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::io::XActiveDataSource> xDataSource(xWriter , css::uno::UNO_QUERY_THROW); xDataSource->setOutputStream(xStream); - + // write into the stream AcceleratorConfigurationWriter aWriter(aCache, xWriter); aWriter.flush(); - + // take over all changes into the original container // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + // take over all changes into the readonly cache ... // and forget the copy-on-write copied cache if (bChanged) @@ -619,12 +619,12 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c m_pWriteCache = 0; delete pTemp; } - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested) { // SAFE -> ---------------------------------- @@ -639,7 +639,7 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA { m_pWriteCache = new AcceleratorCache(m_aReadCache); } - + // in case, we have a writeable cache, we use it for reading too! // Otherwhise the API user cant find its own changes ... if (m_pWriteCache) @@ -649,37 +649,37 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const { static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"); static ::rtl::OUString LOCALE_PATH = ::rtl::OUString::createFromAscii("L10N" ); static ::rtl::OUString LOCALE_KEY = ::rtl::OUString::createFromAscii("ooLocale" ); - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::uno::XInterface > xCFG = fpc::ConfigurationHelper::openConfig(xSMGR, LOCALE_PACKAGE, LOCALE_PATH, fpc::ConfigurationHelper::E_READONLY); css::uno::Reference< css::beans::XPropertySet > xProp (xCFG, css::uno::UNO_QUERY_THROW); ::rtl::OUString sISOLocale; xProp->getPropertyValue(LOCALE_KEY) >>= sISOLocale; - + if (!sISOLocale.getLength()) return ::comphelper::Locale::EN_US(); return ::comphelper::Locale(sISOLocale); } /******************************************************************************* -* +* * XCU based accelerator configuration -* +* *******************************************************************************/ -//----------------------------------------------- -// XInterface, XTypeProvider +//----------------------------------------------- +// XInterface, XTypeProvider DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), @@ -691,7 +691,7 @@ DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration , DIRECT_INTERFACE(css::ui::XUIConfiguration )) DEFINE_XTYPEPROVIDER_7(XCUBasedAcceleratorConfiguration , - css::lang::XTypeProvider , + css::lang::XTypeProvider , css::ui::XAcceleratorConfiguration , css::util::XChangesListener , css::form::XReset , @@ -699,7 +699,7 @@ DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration , css::ui::XUIConfigurationStorage , css::ui::XUIConfiguration ) -//----------------------------------------------- +//----------------------------------------------- XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xSMGR (xSMGR ) @@ -707,17 +707,17 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un , m_pSecondaryWriteCache(0 ) { static const ::rtl::OUString CFG_ENTRY_ACCELERATORS(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Accelerators")); - m_xCfg = css::uno::Reference< css::container::XNameAccess > ( - ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), + m_xCfg = css::uno::Reference< css::container::XNameAccess > ( + ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), css::uno::UNO_QUERY ); } -//----------------------------------------------- +//----------------------------------------------- XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration() { } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException) { @@ -738,7 +738,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -762,7 +762,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -832,7 +832,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE rPrimaryCache.setKeyCommandPair(aKeyEvent, sCommand); } } - + else { if (rPrimaryCache.hasCommand(sCommand)) @@ -849,7 +849,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 ) @@ -892,7 +892,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -938,7 +938,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator const css::awt::KeyEvent& rAWTKey = *pIt; const KeyCode aVCLKey = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(rAWTKey); const String sName = aVCLKey.GetName(); - + if (sName.Len () > 0) return pIt; } @@ -955,7 +955,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g ReadGuard aReadLock(m_aLock); sal_Int32 i = 0; - sal_Int32 c = lCommandList.getLength(); + sal_Int32 c = lCommandList.getLength(); css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! AcceleratorCache& rCache = impl_getCFG(sal_True); @@ -989,7 +989,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g return lPreferredOnes; } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -1013,15 +1013,15 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasCommand(sCommand)) - rPrimaryCache.removeCommand(sCommand); + rPrimaryCache.removeCommand(sCommand); if (rSecondaryCache.hasCommand(sCommand)) - rSecondaryCache.removeCommand(sCommand); + rSecondaryCache.removeCommand(sCommand); aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException) @@ -1042,8 +1042,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() AcceleratorCache* pTemp = m_pPrimaryWriteCache; m_pPrimaryWriteCache = 0; delete pTemp; - } - m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; + } + m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; impl_ts_load(bPreferred, xAccess); // load the preferred keys bPreferred = sal_False; @@ -1055,14 +1055,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() m_pSecondaryWriteCache = 0; delete pTemp; } - m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; + m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; impl_ts_load(bPreferred, xAccess); // load the secondary keys - aWriteLock.unlock(); + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException) @@ -1071,32 +1071,32 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store() // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + sal_Bool bPreferred; css::uno::Reference< css::container::XNameAccess > xAccess; bPreferred = sal_True; // on-demand creation of the primary write cache impl_getCFG(bPreferred, sal_True); - m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; + m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; impl_ts_save(bPreferred, xAccess); bPreferred = sal_False; // on-demand creation of the secondary write cache impl_getCFG(bPreferred, sal_True); - m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; + m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; impl_ts_save(bPreferred, xAccess); aReadLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException) { - // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ... + // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ... if (!xStorage.is()) return; @@ -1158,28 +1158,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) { LOG_WARNING("XCUBasedAcceleratorConfiguration::setStorage()", "TODO implement this HACK .-)") } -//----------------------------------------------- +//----------------------------------------------- ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -1187,21 +1187,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) { LOG_WARNING("XCUBasedAcceleratorConfiguration::addConfigurationListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::removeConfigurationListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { @@ -1209,35 +1209,35 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() ::rtl::OUString sConfig = xNamed->getName(); if ( sConfig.equalsAscii("Global") ) { - m_xCfg = css::uno::Reference< css::container::XNameAccess > ( - ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), - css::uno::UNO_QUERY ); + m_xCfg = css::uno::Reference< css::container::XNameAccess > ( + ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), + css::uno::UNO_QUERY ); XCUBasedAcceleratorConfiguration::reload(); } else if ( sConfig.equalsAscii("Modules") ) { - m_xCfg = css::uno::Reference< css::container::XNameAccess > ( - ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), + m_xCfg = css::uno::Reference< css::container::XNameAccess > ( + ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), css::uno::UNO_QUERY ); XCUBasedAcceleratorConfiguration::reload(); } } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::addResetListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::removeResetListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException) { @@ -1259,7 +1259,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: // be interesting for use. Sometimes short path values are given also by the broadcaster ... but they must be ignored :-) // So we try to split the path into 3 parts (module isnt important here, because we already know it ... because // these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all. - + ::rtl::OUString sOrgPath ; ::rtl::OUString sPath ; ::rtl::OUString sKey; @@ -1268,7 +1268,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: sPath = sOrgPath; ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); - + if ( sGlobalModules.equals(CFG_ENTRY_GLOBAL) ) { ::rtl::OUString sModule; @@ -1280,7 +1280,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: { ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); - + if (( sKey.getLength() > 0 ) && ( sPath.getLength() > 0 )) { reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); @@ -1289,13 +1289,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: } } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/) throw(css::uno::RuntimeException) { } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg ) { AcceleratorCache aReadCache = AcceleratorCache(); @@ -1321,7 +1321,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const for ( sal_Int32 i=0; i<nKeys; ++i ) { ::rtl::OUString sKey = lKeys[i]; - xAccess->getByName(sKey) >>= xKey; + xAccess->getByName(sKey) >>= xKey; xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; css::uno::Sequence< ::rtl::OUString > lLocales = xCommand->getElementNames(); @@ -1405,7 +1405,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) @@ -1455,7 +1455,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c { AcceleratorCache::TKeyList::const_iterator pIt; AcceleratorCache::TKeyList lSecondaryReadKeys = m_aSecondaryReadCache.getAllKeys(); - AcceleratorCache::TKeyList lSecondaryWriteKeys = m_pSecondaryWriteCache->getAllKeys(); + AcceleratorCache::TKeyList lSecondaryWriteKeys = m_pSecondaryWriteCache->getAllKeys(); for ( pIt = lSecondaryReadKeys.begin(); pIt != lSecondaryReadKeys.end(); ++pIt) { @@ -1498,7 +1498,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 ::rtl::OUString& sCommand, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1519,8 +1519,8 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules; if ( !xModules->hasByName(m_sModuleCFG) ) { - xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xModules, css::uno::UNO_QUERY); - xInst = xFac->createInstance(); + xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xModules, css::uno::UNO_QUERY); + xInst = xFac->createInstance(); xModules->insertByName(m_sModuleCFG, css::uno::makeAny(xInst)); } xModules->getByName(m_sModuleCFG) >>= xContainer; @@ -1545,7 +1545,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; @@ -1571,7 +1571,7 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw xContainer->removeByName(sKey); } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1622,7 +1622,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr { ::rtl::OUString sLocale = impl_ts_getLocale().toISO(); xContainer->getByName(sKey) >>= xKey; - xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; + xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; xCommand->getByName(sLocale) >>= sCommand; } @@ -1642,7 +1642,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr } } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested) { // SAFE -> ---------------------------------- @@ -1691,7 +1691,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const { static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"); diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx index 9ed0e1178618..98fe7bb7630b 100644 --- a/framework/source/accelerators/acceleratorexecute.cxx +++ b/framework/source/accelerators/acceleratorexecute.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic // take over the uno service manager m_xSMGR = xSMGR; - + // specify our internal dispatch provider // frame or desktop?! => document or global config. sal_Bool bDesktopIsUsed = sal_False; @@ -118,33 +118,33 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic { aLock.clear(); // <- SAFE ------------------------------ - + css::uno::Reference< css::frame::XDispatchProvider > xDispatcher( xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); - + // SAFE -> ------------------------------ aLock.reset(); - + m_xDispatcher = xDispatcher; bDesktopIsUsed = sal_True; } aLock.clear(); // <- SAFE ---------------------------------- - + // open all needed configuration objects css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg ; - + // global cfg xGlobalCfg = AcceleratorExecute::impl_st_openGlobalConfig(xSMGR); if (!bDesktopIsUsed) - { + { // module cfg xModuleCfg = AcceleratorExecute::impl_st_openModuleConfig(xSMGR, xEnv); - + // doc cfg css::uno::Reference< css::frame::XController > xController; css::uno::Reference< css::frame::XModel > xModel; @@ -154,14 +154,14 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic if (xModel.is()) xDocCfg = AcceleratorExecute::impl_st_openDocConfig(xModel); } - + // SAFE -> ------------------------------ aLock.reset(); - + m_xGlobalCfg = xGlobalCfg; m_xModuleCfg = xModuleCfg; m_xDocCfg = xDocCfg ; - + aLock.clear(); // <- SAFE ---------------------------------- } @@ -181,13 +181,13 @@ void AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) // No Command found? Do nothing! User isnt interested on any error handling .-) if (!sCommand.getLength()) return; - + // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + m_lCommandQueue.push_back(sCommand); m_aAsyncCallback.Post(0); - + aLock.clear(); // <- SAFE ---------------------------------- } @@ -198,24 +198,24 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey) css::awt::KeyEvent aAWTKey; aAWTKey.Modifiers = 0; aAWTKey.KeyCode = (sal_Int16)aVCLKey.GetCode(); - + if (aVCLKey.IsShift()) - aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; + aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; if (aVCLKey.IsMod1()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; if (aVCLKey.IsMod2()) aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2; if (aVCLKey.IsMod3()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; - - return aAWTKey; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; + + return aAWTKey; } /* -ViewFrame->GetObjectShell +ViewFrame->GetObjectShell ObjectShell->GetStyleSheetPool */ - + //----------------------------------------------- KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { @@ -224,7 +224,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 ); sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 ); USHORT nKey = (USHORT)aAWTKey.KeyCode; - + return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } @@ -233,14 +233,14 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg = m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg = m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg = m_xDocCfg ; - - aLock.clear(); + + aLock.clear(); // <- SAFE ---------------------------------- - + ::rtl::OUString sCommand; try { @@ -265,7 +265,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) {} } } - + return sCommand; } @@ -275,9 +275,9 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg( xSMGR->createInstance(SERVICENAME_GLOBALACCELERATORCONFIGURATION), css::uno::UNO_QUERY_THROW); - return xAccCfg; + return xAccCfg; } - + //----------------------------------------------- css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::impl_st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame) @@ -286,20 +286,20 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sModule; + ::rtl::OUString sModule; try - { + { sModule = xModuleDetection->identify(xFrame); } catch(const css::uno::RuntimeException& exRuntime) { throw exRuntime; } catch(const css::uno::Exception&) { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); } - + css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUISupplier( xSMGR->createInstance(SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER), css::uno::UNO_QUERY_THROW); - + css::uno::Reference< css::ui::XUIConfigurationManager > xUIManager = xUISupplier->getUIConfigurationManager(sModule); css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW); return xAccCfg; @@ -313,7 +313,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW); return xAccCfg; } - + //----------------------------------------------- css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_getURLParser() { @@ -323,37 +323,37 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge if (m_xURLParser.is()) return m_xURLParser; css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; - + aLock.clear(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::util::XURLTransformer > xParser( xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW); - + // SAFE -> ---------------------------------- aLock.reset(); m_xURLParser = xParser; aLock.clear(); // <- SAFE ---------------------------------- - + return xParser; -} - +} + //----------------------------------------------- IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + TCommandQueue::iterator pIt = m_lCommandQueue.begin(); if (pIt == m_lCommandQueue.end()) return 0; ::rtl::OUString sCommand = *pIt; m_lCommandQueue.erase(pIt); - + css::uno::Reference< css::frame::XDispatchProvider > xProvider = m_xDispatcher; - + aLock.clear(); // <- SAFE ---------------------------------- diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx index 87c5717d65c1..07f6348184e2 100644 --- a/framework/source/accelerators/acceleratorexecute.hxx +++ b/framework/source/accelerators/acceleratorexecute.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,27 +65,27 @@ namespace svt { - + #ifdef css #error "Who define css? I need it as namespace alias." #else #define css ::com::sun::star #endif - + //=============================================== // definitions struct TMutexInit { ::osl::Mutex m_aLock; -}; - +}; + //=============================================== /** @descr implements a helper, which can be used to convert vcl key codes into awt key codes ... and reverse. - + Further such key code can be triggered. Doing so different accelerator configurations are merged together; a suitable @@ -102,41 +102,41 @@ struct TMutexInit queued internal and dispatched ASAP. Of course this queue will be stopped if the environment - will be destructed ... + will be destructed ... */ class AcceleratorExecute : private TMutexInit { //------------------------------------------- // const, types private: - + /** TODO document me */ typedef ::std::vector< ::rtl::OUString > TCommandQueue; - + //------------------------------------------- // member private: /** TODO document me */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /** TODO document me */ css::uno::Reference< css::util::XURLTransformer > m_xURLParser; - + /** TODO document me */ css::uno::Reference< css::frame::XDispatchProvider > m_xDispatcher; - + /** TODO document me */ css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; - + /** TODO document me */ TCommandQueue m_lCommandQueue; - + /** TODO document me */ ::vcl::EventPoster m_aAsyncCallback; - + //------------------------------------------- // interface public: @@ -144,39 +144,39 @@ class AcceleratorExecute : private TMutexInit //--------------------------------------- /** @short factory method to create new accelerator helper instance. - + @descr Such helper instance must be initialized at first. So it can know its environment (global/module or document specific). - + Afterwards it can be used to execute incoming accelerator requests. - + The "end of life" of such helper can be reached as follow: - + - delete the object => If it stands currently in its execute method, they will be finished. All further queued requests will be removed and further not executed! - - Other modes are possible and will be implemented ASAP :-) + + Other modes are possible and will be implemented ASAP :-) */ static AcceleratorExecute* createAcceleratorHelper(); - + //--------------------------------------- - /** @short fight against inlining ... */ + /** @short fight against inlining ... */ virtual ~AcceleratorExecute(); - + //--------------------------------------- /** @short init this instance. - + @descr It must be called as first method after creation. And further it can be called more then once ... but at least its should be used one times only. Otherwhise nobody can say, which asynchronous executions will be used inside the old and which one will be used inside the new environment. - + @param xSMGR reference to an uno service manager. @@ -186,62 +186,62 @@ class AcceleratorExecute : private TMutexInit is used to locate the right module configuration and use it merged together with the document and the global configuration. - + If this parameter is set to NULL, the global configuration is used only. Further the global Desktop instance is - used for dispatch. + used for dispatch. */ - virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, + virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, const css::uno::Reference< css::frame::XFrame >& xEnv ); - + //--------------------------------------- /** @short trigger this accelerator. - + @descr The internal configuartions are used to find as suitable command for this key code. This command will be queued and executed later asynchronous. - + @param aKey specify the accelerator for execute. */ virtual void execute(const KeyCode& aKey); virtual void execute(const css::awt::KeyEvent& aKey); - + //--------------------------------------- /** TODO document me */ static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); - + //------------------------------------------- // internal private: - + //--------------------------------------- /** @short allow creation of instances of this class by using our factory only! - */ + */ AcceleratorExecute(); AcceleratorExecute(const AcceleratorExecute& rCopy); void operator=(const AcceleratorExecute& rCopy) {}; - + //--------------------------------------- /** TODO document me */ css::uno::Reference< css::ui::XAcceleratorConfiguration > impl_st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > impl_st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > impl_st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); - + //--------------------------------------- /** TODO document me */ ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); - + //--------------------------------------- /** TODO document me */ css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - + //--------------------------------------- /** TODO document me */ DECL_LINK(impl_ts_asyncCallback, void*); diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 644b41b70663..81edb165653c 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_2(DocumentAcceleratorConfiguration , XMLBasedAcceleratorConfiguration , @@ -104,7 +104,7 @@ DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(DocumentAcceleratorConfiguration , css::lang::XServiceInfo , css::lang::XInitialization) // css::ui::XUIConfigurationStorage) - + DEFINE_XSERVICEINFO_MULTISERVICE(DocumentAcceleratorConfiguration , ::cppu::OWeakObject , SERVICENAME_DOCUMENTACCELERATORCONFIGURATION , @@ -119,39 +119,39 @@ DEFINE_INIT_SERVICE(DocumentAcceleratorConfiguration, */ } ) - -//----------------------------------------------- + +//----------------------------------------------- DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : XMLBasedAcceleratorConfiguration(xSMGR) { } -//----------------------------------------------- +//----------------------------------------------- DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration() { m_aPresetHandler.removeStorageListener(this); } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + ::comphelper::SequenceAsHashMap lArgs(lArguments); m_xDocumentRoot = lArgs.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("DocumentRoot"), css::uno::Reference< css::embed::XStorage >()); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- - + impl_ts_fillCache(); } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::RuntimeException) { @@ -171,7 +171,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer impl_ts_fillCache(); } -//----------------------------------------------- +//----------------------------------------------- sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -181,7 +181,7 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void DocumentAcceleratorConfiguration::impl_ts_fillCache() { // SAFE -> ---------------------------------- @@ -231,7 +231,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 ba103a9e273e..dc040479d854 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_2(GlobalAcceleratorConfiguration , XCUBasedAcceleratorConfiguration , @@ -67,7 +67,7 @@ DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(GlobalAcceleratorConfiguration, XCUBasedAcceleratorConfiguration , css::lang::XServiceInfo , css::lang::XInitialization) - + DEFINE_XSERVICEINFO_MULTISERVICE(GlobalAcceleratorConfiguration , ::cppu::OWeakObject , SERVICENAME_GLOBALACCELERATORCONFIGURATION , @@ -83,36 +83,36 @@ DEFINE_INIT_SERVICE(GlobalAcceleratorConfiguration, impl_ts_fillCache(); } ) - -//----------------------------------------------- + +//----------------------------------------------- GlobalAcceleratorConfiguration::GlobalAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : XCUBasedAcceleratorConfiguration(xSMGR) { } -//----------------------------------------------- +//----------------------------------------------- GlobalAcceleratorConfiguration::~GlobalAcceleratorConfiguration() { } void SAL_CALL GlobalAcceleratorConfiguration::initialize(const css::uno::Sequence< css::uno::Any >& /*lArguments*/) - throw(css::uno::Exception , + throw(css::uno::Exception , css::uno::RuntimeException) { } -//----------------------------------------------- +//----------------------------------------------- void GlobalAcceleratorConfiguration::impl_ts_fillCache() { // get current office locale ... but dont cache it. // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) ::comphelper::Locale aLocale = ::comphelper::Locale(m_sLocale); - + // May be there exists no accelerator config? Handle it gracefully :-) try - { - m_sGlobalOrModules = CFG_ENTRY_GLOBAL; + { + m_sGlobalOrModules = CFG_ENTRY_GLOBAL; XCUBasedAcceleratorConfiguration::reload(); css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfg, css::uno::UNO_QUERY_THROW); diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index b1d00d0ef966..7d4054014524 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace framework { - + //_______________________________________________ // helper @@ -155,9 +155,9 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = {css::awt::Key::TILDE , "KEY_TILDE" }, {css::awt::Key::QUOTELEFT , "KEY_QUOTELEFT" }, {0 , "" } // mark the end of this array! -}; +}; -//----------------------------------------------- +//----------------------------------------------- KeyMapping::KeyMapping() { sal_Int32 i = 0; @@ -165,27 +165,27 @@ KeyMapping::KeyMapping() { ::rtl::OUString sIdentifier = ::rtl::OUString::createFromAscii(KeyIdentifierMap[i].Identifier); sal_Int16 nCode = KeyIdentifierMap[i].Code; - + m_lIdentifierHash[sIdentifier] = nCode ; m_lCodeHash [nCode] = sIdentifier; - + ++i; } } -//----------------------------------------------- +//----------------------------------------------- KeyMapping::~KeyMapping() { } -//----------------------------------------------- +//----------------------------------------------- sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) throw(css::lang::IllegalArgumentException) { Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier); if (pIt != m_lIdentifierHash.end()) - return pIt->second; - + return pIt->second; + // Its not well known identifier - but may be a pure key code formated as string ... // Check and convert it! sal_uInt16 nCode = 0; @@ -194,32 +194,32 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) DECLARE_ASCII("Cant map given identifier to a valid key code value."), css::uno::Reference< css::uno::XInterface >(), 0); - + return (sal_uInt16)nCode; } - -//----------------------------------------------- + +//----------------------------------------------- ::rtl::OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) { Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode); if (pIt != m_lCodeHash.end()) return pIt->second; - + // If we have no well known identifier - use the pure code value! - return ::rtl::OUString::valueOf((sal_Int32)nCode); + return ::rtl::OUString::valueOf((sal_Int32)nCode); } -//----------------------------------------------- +//----------------------------------------------- sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, sal_uInt16& rCode ) { - sal_Int32 nCode = sIdentifier.toInt32(); + sal_Int32 nCode = sIdentifier.toInt32(); if (nCode > 0) { rCode = (sal_uInt16)nCode; return sal_True; } - + // 0 is normaly an error of the called method toInt32() ... // But we must be aware, that the identifier is "0"! rCode = 0; diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index c85cb404ffb4..566311d6f5be 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_2(ModuleAcceleratorConfiguration , XCUBasedAcceleratorConfiguration , @@ -86,7 +86,7 @@ DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(ModuleAcceleratorConfiguration, XCUBasedAcceleratorConfiguration , css::lang::XServiceInfo , css::lang::XInitialization ) - + DEFINE_XSERVICEINFO_MULTISERVICE(ModuleAcceleratorConfiguration , ::cppu::OWeakObject , SERVICENAME_MODULEACCELERATORCONFIGURATION , @@ -101,21 +101,21 @@ DEFINE_INIT_SERVICE(ModuleAcceleratorConfiguration, */ } ) - -//----------------------------------------------- + +//----------------------------------------------- ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : XCUBasedAcceleratorConfiguration(xSMGR) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration" ); } -//----------------------------------------------- +//----------------------------------------------- ModuleAcceleratorConfiguration::~ModuleAcceleratorConfiguration() { // m_aPresetHandler.removeStorageListener(this); } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -123,23 +123,23 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::initialize" ); // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + ::comphelper::SequenceAsHashMap lArgs(lArguments); m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Locale") , ::rtl::OUString::createFromAscii("x-default")); - + if (!m_sModule.getLength()) throw css::uno::RuntimeException( ::rtl::OUString::createFromAscii("The module dependend accelerator configuration service was initialized with an empty module identifier!"), static_cast< ::cppu::OWeakObject* >(this)); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- - + impl_ts_fillCache(); } - -//----------------------------------------------- + +//----------------------------------------------- void ModuleAcceleratorConfiguration::impl_ts_fillCache() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::impl_ts_fillCache" ); @@ -154,7 +154,7 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache() // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) ::comphelper::Locale aLocale = ::comphelper::Locale(m_sLocale); - + // May be the current app module does not have any // accelerator config? Handle it gracefully :-) try diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index f35d8ac84a79..ecfe6d2a0a5f 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,49 +105,49 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; namespace framework { -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::PRESET_DEFAULT() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("default"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::TARGET_CURRENT() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("current"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_MENUBAR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("menubar"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_TOOLBAR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("toolbar"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_ACCELERATOR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("accelerator"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_STATUSBAR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("statusbar"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase (&Application::GetSolarMutex() ) , m_xSMGR (xSMGR ) @@ -157,7 +157,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiService { } -//----------------------------------------------- +//----------------------------------------------- PresetHandler::PresetHandler(const PresetHandler& rCopy) : ThreadHelpBase (&Application::GetSolarMutex() ) { @@ -178,7 +178,7 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy) m_sRelPathUser = rCopy.m_sRelPathUser; } -//----------------------------------------------- +//----------------------------------------------- PresetHandler::~PresetHandler() { m_xWorkingStorageShare.clear(); @@ -205,26 +205,26 @@ PresetHandler::~PresetHandler() m_lDocumentStorages.forgetCachedStorages(); } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::forgetCachedStorages() { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + if (m_eConfigType == E_DOCUMENT) { m_xWorkingStorageShare.clear(); m_xWorkingStorageNoLang.clear(); m_xWorkingStorageUser.clear(); } - + m_lDocumentStorages.forgetCachedStorages(); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID) { ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error."); @@ -234,11 +234,11 @@ void PresetHandler::forgetCachedStorages() case ID_CORRUPT_UICONFIG_SHARE : sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE ))); break; - + case ID_CORRUPT_UICONFIG_USER : sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_USER ))); break; - + case ID_CORRUPT_UICONFIG_GENERAL : sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL ))); break; @@ -247,36 +247,36 @@ void PresetHandler::forgetCachedStorages() return sMessage; } -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageShare() { - css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesShare.getRootStorage(); + css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesShare.getRootStorage(); if (xRoot.is()) return xRoot; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::beans::XPropertySet > xPathSettings( - xSMGR->createInstance(SERVICENAME_PATHSETTINGS), + xSMGR->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - + ::rtl::OUString sShareLayer; xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer; - + // "UIConfig" is a "multi path" ... use first part only here! sal_Int32 nPos = sShareLayer.indexOf(';'); if (nPos > 0) sShareLayer = sShareLayer.copy(0, nPos); - - // Note: May be an user uses URLs without a final slash! Check it ... + + // Note: May be an user uses URLs without a final slash! Check it ... nPos = sShareLayer.lastIndexOf('/'); if (nPos != sShareLayer.getLength()-1) sShareLayer += ::rtl::OUString::createFromAscii("/"); - + sShareLayer += RELPATH_SHARE_LAYER; // folder /* // TODO remove me! @@ -287,10 +287,10 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= sShareLayer; lArgs[1] <<= css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE; - + css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_FILESYSTEMSTORAGEFACTORY) , css::uno::UNO_QUERY_THROW); css::uno::Reference< css::embed::XStorage > xStorage; - + try { xStorage = css::uno::Reference< css::embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); @@ -302,46 +302,46 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag css::uno::Reference< css::uno::XInterface >(), ex.Message); } - + m_aSharedStorages->m_lStoragesShare.setRootStorage(xStorage); - + return xStorage; -} +} -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageUser() { - css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage(); + css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage(); if (xRoot.is()) return xRoot; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::beans::XPropertySet > xPathSettings( - xSMGR->createInstance(SERVICENAME_PATHSETTINGS), + xSMGR->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - + ::rtl::OUString sUserLayer; xPathSettings->getPropertyValue(BASEPATH_USER_LAYER) >>= sUserLayer ; - - // Note: May be an user uses URLs without a final slash! Check it ... + + // Note: May be an user uses URLs without a final slash! Check it ... sal_Int32 nPos = sUserLayer.lastIndexOf('/'); if (nPos != sUserLayer.getLength()-1) sUserLayer += ::rtl::OUString::createFromAscii("/"); - + sUserLayer += RELPATH_USER_LAYER; // storage file - + css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= sUserLayer; lArgs[1] <<= css::embed::ElementModes::READWRITE; - + css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_FILESYSTEMSTORAGEFACTORY) , css::uno::UNO_QUERY_THROW); css::uno::Reference< css::embed::XStorage > xStorage; - + try { xStorage = css::uno::Reference< css::embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); @@ -355,7 +355,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag } m_aSharedStorages->m_lStoragesUser.setRootStorage(xStorage); - + return xStorage; } @@ -385,7 +385,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare css::uno::Reference< css::embed::XStorage > xWorking = m_xWorkingStorageShare; aReadLock.unlock(); // <- SAFE ---------------------------------- - + return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking); } @@ -397,7 +397,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser( css::uno::Reference< css::embed::XStorage > xWorking = m_xWorkingStorageUser; aReadLock.unlock(); // <- SAFE ---------------------------------- - + return m_aSharedStorages->m_lStoragesUser.getParentStorage(xWorking); } @@ -406,18 +406,18 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType const ::rtl::OUString& sResource , const ::rtl::OUString& sModule , const css::uno::Reference< css::embed::XStorage >& xDocumentRoot, - const ::comphelper::Locale& aLocale ) + const ::comphelper::Locale& aLocale ) { // TODO free all current open storages! - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_eConfigType = eConfigType ; m_sResourceType = sResource ; m_sModule = sModule ; - m_aLocale = aLocale ; - + m_aLocale = aLocale ; + aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -439,7 +439,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } else { - xShare = getOrCreateRootStorageShare(); + xShare = getOrCreateRootStorageShare(); xUser = getOrCreateRootStorageUser(); } @@ -451,7 +451,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // existing ones only! // b) inside user layer we can (SOFT mode!) but sometimes we shouldnt (HARD mode!) // create new empty structures. We should preferr using of any existing structure. - sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); + sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); sal_Int32 eUserMode = (css::embed::ElementModes::READWRITE ); ::rtl::OUStringBuffer sRelPathBuf(1024); @@ -465,14 +465,14 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sRelPathBuf.append(SUBSTORAGE_GLOBAL); sRelPathBuf.append(PATH_SEPERATOR ); sRelPathBuf.append(sResource ); - sRelPathShare = sRelPathBuf.makeStringAndClear(); + sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, sal_True ); xUser = impl_openPathIgnoringErrors(sRelPathUser , eUserMode , sal_False); } break; - + case E_MODULES : { sRelPathBuf.append(SUBSTORAGE_MODULES); @@ -480,7 +480,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sRelPathBuf.append(sModule ); sRelPathBuf.append(PATH_SEPERATOR ); sRelPathBuf.append(sResource ); - sRelPathShare = sRelPathBuf.makeStringAndClear(); + sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, sal_True ); @@ -495,7 +495,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // So we open the user layer here only and set the share layer equals to it .-) sRelPathBuf.append(sResource); - sRelPathUser = sRelPathBuf.makeStringAndClear(); + sRelPathUser = sRelPathBuf.makeStringAndClear(); sRelPathShare = sRelPathUser; try @@ -524,7 +524,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // Fallbacks are allowed there. ::comphelper::Locale aShareLocale = aLocale ; ::rtl::OUString sLocalizedSharePath(sRelPathShare); - sal_Bool bAllowFallbacks = sal_True ; + sal_Bool bAllowFallbacks = sal_True ; xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks); // The try to locate the right sub dir inside user layer ... without using fallbacks! @@ -532,30 +532,30 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // Because we allow creation of storages inside user layer by default. ::comphelper::Locale aUserLocale = aLocale ; ::rtl::OUString sLocalizedUserPath(sRelPathUser); - bAllowFallbacks = sal_False ; + bAllowFallbacks = sal_False ; xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks); - + sRelPathShare = sLocalizedSharePath; sRelPathUser = sLocalizedUserPath ; } - + // read content of level 3 (presets, targets) css::uno::Reference< css::container::XNameAccess > xAccess ; css::uno::Sequence< ::rtl::OUString > lNames ; const ::rtl::OUString* pNames ; sal_Int32 c ; sal_Int32 i ; - OUStringList lPresets; - OUStringList lTargets; - - // read preset names of share layer + OUStringList lPresets; + OUStringList lTargets; + + // read preset names of share layer xAccess = css::uno::Reference< css::container::XNameAccess >(xShare, css::uno::UNO_QUERY); if (xAccess.is()) { lNames = xAccess->getElementNames(); pNames = lNames.getConstArray(); c = lNames.getLength(); - + for (i=0; i<c; ++i) { ::rtl::OUString sTemp = pNames[i]; @@ -565,15 +565,15 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType lPresets.push_back(sTemp); } } - - // read preset names of user layer + + // read preset names of user layer xAccess = css::uno::Reference< css::container::XNameAccess >(xUser, css::uno::UNO_QUERY); if (xAccess.is()) { lNames = xAccess->getElementNames(); pNames = lNames.getConstArray(); c = lNames.getLength(); - + for (i=0; i<c; ++i) { ::rtl::OUString sTemp = pNames[i]; @@ -583,10 +583,10 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType lTargets.push_back(sTemp); } } - + // SAFE -> ---------------------------------- aWriteLock.lock(); - + m_xWorkingStorageShare = xShare ; m_xWorkingStorageNoLang= xNoLang; m_xWorkingStorageUser = xUser ; @@ -595,7 +595,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType m_sRelPathShare = sRelPathShare; m_sRelPathNoLang = sRelPathNoLang; m_sRelPathUser = sRelPathUser; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -609,13 +609,13 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, const ::rtl::OUString& sTarget) { // dont check our preset list, if element exists - // We try to open it and forward all errors to the user! - + // We try to open it and forward all errors to the user! + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::embed::XStorage > xWorkingShare = m_xWorkingStorageShare; @@ -629,13 +629,13 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, (!xWorkingShare.is()) || (!xWorkingUser.is() ) ) - { + { return; } - + ::rtl::OUString sPresetFile(sPreset); sPresetFile += FILE_EXTENSION; - + ::rtl::OUString sTargetFile(sTarget); sTargetFile += FILE_EXTENSION; @@ -646,13 +646,13 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, xWorkingUser->removeElement(sTargetFile); xWorkingShare->copyElementTo(sPresetFile, xWorkingUser, sTargetFile); - + // If our storages work in transacted mode, we have // to commit all changes from bottom to top! commitUserChanges(); } -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::OUString& sPreset, sal_Bool bUseNoLangGlobal) { @@ -661,11 +661,11 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O css::uno::Reference< css::embed::XStorage > xFolder = bUseNoLangGlobal? m_xWorkingStorageNoLang: m_xWorkingStorageShare; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // e.g. module without any config data ?! if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - + ::rtl::OUString sFile(sPreset); sFile += FILE_EXTENSION; @@ -674,7 +674,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O return xStream; } -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::OUString& sTarget , sal_Bool bCreateIfMissing) { @@ -683,14 +683,14 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O css::uno::Reference< css::embed::XStorage > xFolder = m_xWorkingStorageUser; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // e.g. module without any config data ?! if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - + ::rtl::OUString sFile(sTarget); sFile += FILE_EXTENSION; - + sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE; if (!bCreateIfMissing) nOpenMode |= css::embed::ElementModes::NOCREATE; @@ -703,7 +703,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O return xStream; } catch(const css::uno::RuntimeException&) - { throw; } + { throw; } catch(const css::uno::Exception&) { xStream.clear(); } @@ -711,7 +711,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O // inform user about errors (use original exceptions!) nOpenMode &= ~css::embed::ElementModes::WRITE; xStream = xFolder->openStreamElement(sFile, nOpenMode); - + return xStream; } @@ -724,15 +724,15 @@ void PresetHandler::commitUserChanges() EConfigType eCfgType = m_eConfigType; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // e.g. module without any config data ?! if (!xWorking.is()) return; - + ::rtl::OUString sPath; - + switch(eCfgType) - { + { case E_GLOBAL : case E_MODULES : { @@ -741,7 +741,7 @@ void PresetHandler::commitUserChanges() m_aSharedStorages->m_lStoragesUser.notifyPath(sPath); } break; - + case E_DOCUMENT : { sPath = m_lDocumentStorages.getPathOfStorage(xWorking); @@ -752,7 +752,7 @@ void PresetHandler::commitUserChanges() } } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::addStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- @@ -764,7 +764,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) if (!sRelPath.getLength()) return; - + switch(eCfgType) { case E_GLOBAL : @@ -773,7 +773,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) m_aSharedStorages->m_lStoragesUser.addStorageListener(pListener, sRelPath); } break; - + case E_DOCUMENT : { m_lDocumentStorages.addStorageListener(pListener, sRelPath); @@ -782,7 +782,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) } } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::removeStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- @@ -794,7 +794,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) if (!sRelPath.getLength()) return; - + switch(eCfgType) { case E_GLOBAL : @@ -803,7 +803,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) m_aSharedStorages->m_lStoragesUser.removeStorageListener(pListener, sRelPath); } break; - + case E_DOCUMENT : { m_lDocumentStorages.removeStorageListener(pListener, sRelPath); @@ -840,7 +840,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring ::std::vector< ::rtl::OUString >::const_iterator pFound = lLocalizedValues.end(); if (bAllowFallbacks) { - pFound = ::comphelper::Locale::getFallback(lLocalizedValues, aLocale.toISO()); + pFound = ::comphelper::Locale::getFallback(lLocalizedValues, aLocale.toISO()); } else { @@ -861,7 +861,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring const ::rtl::OUString& sISOLocale = *pFound; aLocale.fromISO(sISOLocale); } - + return pFound; } @@ -881,8 +881,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat (pLocaleFolder == lSubFolders.end() ) && ((eMode & css::embed::ElementModes::NOCREATE) == css::embed::ElementModes::NOCREATE) ) - return css::uno::Reference< css::embed::XStorage >(); - + return css::uno::Reference< css::embed::XStorage >(); + // it doesnt matter, if there is a locale fallback or not // If creation of storages is allowed, we do it anyway. // Otherwhise we have no acc config at all, which can make other trouble. @@ -900,7 +900,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat sPath = sLocalizedPath; else sPath = ::rtl::OUString(); - + return xLocalePath; } @@ -916,7 +916,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat const ::rtl::OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { try @@ -933,5 +933,5 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return lSubFolders; } -//----------------------------------------------- +//----------------------------------------------- } // namespace framework diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 48c45e819334..33776d8c7fc1 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ namespace framework { -namespace css = ::com::sun::star; +namespace css = ::com::sun::star; //----------------------------------------------- StorageHolder::StorageHolder() @@ -126,7 +126,7 @@ void StorageHolder::forgetCachedStorages() rInfo.Storage.clear(); } m_lStorages.clear(); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } @@ -156,7 +156,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::embed::XStorage > xParent = m_xRoot; @@ -164,9 +164,9 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: // <- SAFE ---------------------------------- css::uno::Reference< css::embed::XStorage > xChild ; - ::rtl::OUString sRelPath; + ::rtl::OUString sRelPath; OUStringList::const_iterator pIt ; - + for ( pIt = lFolders.begin(); pIt != lFolders.end() ; ++pIt ) @@ -175,7 +175,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: ::rtl::OUString sCheckPath (sRelPath); sCheckPath += sChild; sCheckPath += PATH_SEPERATOR; - + // SAFE -> ------------------------------ aReadLock.lock(); @@ -188,7 +188,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: pInfo = &(pCheck->second); ++(pInfo->UseCount); xChild = pInfo->Storage; - } + } else { aReadLock.unlock(); @@ -214,24 +214,24 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: */ throw exAny; } - + // SAFE -> ------------------------------ WriteGuard aWriteLock(m_aLock); - pInfo = &(m_lStorages[sCheckPath]); + pInfo = &(m_lStorages[sCheckPath]); pInfo->Storage = xChild; - pInfo->UseCount = 1; + pInfo->UseCount = 1; aWriteLock.unlock(); // <- SAFE ------------------------------ } - + xParent = xChild; sRelPath += sChild; sRelPath += PATH_SEPERATOR; - } - + } + // TODO think about return last storage as working storage ... but dont caching it inside this holder! // => otherwhise the same storage is may be commit more then once. - + return xChild; } @@ -240,14 +240,14 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - + StorageHolder::TStorageList lStoragesOfPath; - ::rtl::OUString sRelPath ; + ::rtl::OUString sRelPath ; OUStringList::const_iterator pIt ; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + for ( pIt = lFolders.begin(); pIt != lFolders.end() ; ++pIt ) @@ -256,7 +256,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr ::rtl::OUString sCheckPath (sRelPath); sCheckPath += sChild; sCheckPath += PATH_SEPERATOR; - + TPath2StorageInfo::iterator pCheck = m_lStorages.find(sCheckPath); if (pCheck == m_lStorages.end()) { @@ -271,11 +271,11 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr sRelPath += sChild; sRelPath += PATH_SEPERATOR; - } - + } + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lStoragesOfPath; } @@ -283,25 +283,25 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr void StorageHolder::commitPath(const ::rtl::OUString& sPath) { StorageHolder::TStorageList lStorages = getAllPathStorages(sPath); - + css::uno::Reference< css::embed::XTransactedObject > xCommit; StorageHolder::TStorageList::reverse_iterator pIt; for ( pIt = lStorages.rbegin(); // order of commit is important ... otherwhise changes are not recognized! pIt != lStorages.rend() ; - ++pIt ) + ++pIt ) { xCommit = css::uno::Reference< css::embed::XTransactedObject >(*pIt, css::uno::UNO_QUERY); if (!xCommit.is()) continue; - xCommit->commit(); + xCommit->commit(); } - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); xCommit = css::uno::Reference< css::embed::XTransactedObject >(m_xRoot, css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE ------------------------------ - + if (xCommit.is()) xCommit->commit(); } @@ -311,7 +311,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - + /* convert list of pathes in the following way: [0] = "path_1" => "path_1 [1] = "path_2" => "path_1/path_2" @@ -326,13 +326,13 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) ::rtl::OUString sCurrentRelPath = sParentPath; sCurrentRelPath += *pIt1; sCurrentRelPath += PATH_SEPERATOR; - *pIt1 = sCurrentRelPath; - sParentPath = sCurrentRelPath; + *pIt1 = sCurrentRelPath; + sParentPath = sCurrentRelPath; } // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + OUStringList::reverse_iterator pIt2; for ( pIt2 = lFolders.rbegin(); pIt2 != lFolders.rend() ; @@ -342,16 +342,16 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) TPath2StorageInfo::iterator pPath = m_lStorages.find(sPath); if (pPath == m_lStorages.end()) continue; // ??? - + TStorageInfo& rInfo = pPath->second; --rInfo.UseCount; if (rInfo.UseCount < 1) { rInfo.Storage.clear(); m_lStorages.erase(pPath); - } + } } - + aReadLock.unlock(); // <- SAFE ------------------------------ } @@ -360,25 +360,25 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) void StorageHolder::notifyPath(const ::rtl::OUString& sPath) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::iterator pIt1 = m_lStorages.find(sNormedPath); if (pIt1 == m_lStorages.end()) return; - + TStorageInfo& rInfo = pIt1->second; TStorageListenerList::iterator pIt2; for ( pIt2 = rInfo.Listener.begin(); pIt2 != rInfo.Listener.end() ; ++pIt2 ) - { + { IStorageListener* pListener = *pIt2; if (pListener) pListener->changesOccured(sNormedPath); } - + aReadLock.unlock(); // <- SAFE ------------------------------ } @@ -388,19 +388,19 @@ void StorageHolder::addStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::iterator pIt1 = m_lStorages.find(sNormedPath); if (pIt1 == m_lStorages.end()) return; - + TStorageInfo& rInfo = pIt1->second; TStorageListenerList::iterator pIt2 = ::std::find(rInfo.Listener.begin(), rInfo.Listener.end(), pListener); if (pIt2 == rInfo.Listener.end()) rInfo.Listener.push_back(pListener); - + aReadLock.unlock(); // <- SAFE ------------------------------ } @@ -410,29 +410,29 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::iterator pIt1 = m_lStorages.find(sNormedPath); if (pIt1 == m_lStorages.end()) return; - + TStorageInfo& rInfo = pIt1->second; TStorageListenerList::iterator pIt2 = ::std::find(rInfo.Listener.begin(), rInfo.Listener.end(), pListener); if (pIt2 != rInfo.Listener.end()) rInfo.Listener.erase(pIt2); - + aReadLock.unlock(); // <- SAFE ------------------------------ } - + //----------------------------------------------- ::rtl::OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) { // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::const_iterator pIt; for ( pIt = m_lStorages.begin(); pIt != m_lStorages.end() ; @@ -447,7 +447,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, return ::rtl::OUString(); return pIt->first; - + // <- SAFE ------------------------------ } @@ -464,7 +464,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons // normed path = "a/b/c/" ... we search for "a/b/" ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - sal_Int32 c = lFolders.size(); + sal_Int32 c = lFolders.size(); // a) "" => - => no parent // b) "a/b/c/" => "a/b/" => return storage "a/b/" @@ -472,20 +472,20 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons // a) if (c < 1) - return css::uno::Reference< css::embed::XStorage >(); + return css::uno::Reference< css::embed::XStorage >(); // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + // b) if (c < 2) return m_xRoot; - + // c) ::rtl::OUString sParentPath; sal_Int32 i = 0; for (i=0; i<c-1; ++i) - { + { sParentPath += lFolders[i]; sParentPath += PATH_SEPERATOR; } @@ -493,10 +493,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons TPath2StorageInfo::const_iterator pParent = m_lStorages.find(sParentPath); if (pParent != m_lStorages.end()) return pParent->second.Storage; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + // ? LOG_WARNING("StorageHolder::getParentStorage()", "Unexpected situation. Cached storage item seems to be wrong.") return css::uno::Reference< css::embed::XStorage >(); @@ -511,7 +511,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy) m_xSMGR = rCopy.m_xSMGR; // ??? m_xRoot = rCopy.m_xRoot; m_lStorages = rCopy.m_lStorages; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } @@ -535,7 +535,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal { throw; } catch(const css::uno::Exception& ex) { exResult = ex; } - + // b) readonly already tried? => forward last error! if ( (!bAllowFallback ) || // fallback allowed ? @@ -550,10 +550,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal css::uno::Reference< css::embed::XStorage > xSubStorage = xBaseStorage->openStorageElement(sSubStorage, eNewMode); if (xSubStorage.is()) return xSubStorage; - + // d) no chance! - LOG_WARNING("openSubStorageWithFallback()", "Unexpected situation! Got no exception for missing storage ...") - return css::uno::Reference< css::embed::XStorage >(); + LOG_WARNING("openSubStorageWithFallback()", "Unexpected situation! Got no exception for missing storage ...") + return css::uno::Reference< css::embed::XStorage >(); } //----------------------------------------------- @@ -575,7 +575,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback { throw; } catch(const css::uno::Exception& ex) { exResult = ex; } - + // b) readonly already tried? => forward last error! if ( (!bAllowFallback ) || // fallback allowed ? @@ -590,19 +590,19 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback css::uno::Reference< css::io::XStream > xSubStream = xBaseStorage->openStreamElement(sSubStream, eNewMode); if (xSubStream.is()) return xSubStream; - + // d) no chance! - LOG_WARNING("openSubStreamWithFallbacks()", "Unexpected situation! Got no exception for missing stream ...") - return css::uno::Reference< css::io::XStream >(); + LOG_WARNING("openSubStreamWithFallbacks()", "Unexpected situation! Got no exception for missing stream ...") + return css::uno::Reference< css::io::XStream >(); } //----------------------------------------------- ::rtl::OUString StorageHolder::impl_st_normPath(const ::rtl::OUString& sPath) { // path must start without "/" but end with "/"! - + ::rtl::OUString sNormedPath = sPath; - + // "/bla" => "bla" && "/" => "" (!) if (sNormedPath.indexOf(PATH_SEPERATOR) == 0) sNormedPath += sNormedPath.copy(1); @@ -610,12 +610,12 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback // "/" => "" || "" => "" ? if (sNormedPath.getLength() < 1) return ::rtl::OUString(); - + // "bla" => "bla/" if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1)) sNormedPath += PATH_SEPERATOR; - - return sNormedPath; + + return sNormedPath; } //----------------------------------------------- @@ -630,8 +630,8 @@ OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath) break; lToken.push_back(sToken); } - return lToken; -} + return lToken; +} //=============================================== } // namespace framework diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx index 5533b1f32ad4..76044ae6bb51 100644 --- a/framework/source/application/framework.cxx +++ b/framework/source/application/framework.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_HELPER_OINSTANCEPROVIDER_HXX_ @@ -43,7 +43,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -65,7 +65,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -78,43 +78,43 @@ #include <vos/process.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::vos ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::util ; -using namespace ::com::sun::star::connection ; -using namespace ::com::sun::star::bridge ; +using namespace ::rtl ; +using namespace ::vos ; +using namespace ::comphelper ; +using namespace ::framework ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::util ; +using namespace ::com::sun::star::connection ; +using namespace ::com::sun::star::bridge ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define APPLICATIONNAME "FrameWork" -#define COMMANDARGUMENT_PLUGIN DECLARE_ASCII("-plugin" ) -#define NAME_PLUGINBRIDGE DECLARE_ASCII("mozilla plugin bridge" ) -#define PROTOCOL_PLUGINBRIDGE DECLARE_ASCII("urp" ) +#define APPLICATIONNAME "FrameWork" +#define COMMANDARGUMENT_PLUGIN DECLARE_ASCII("-plugin" ) +#define NAME_PLUGINBRIDGE DECLARE_ASCII("mozilla plugin bridge" ) +#define PROTOCOL_PLUGINBRIDGE DECLARE_ASCII("urp" ) //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short normal application - @descr An instance of these class can be a normal node in frame tree only. The highest level to be allowed is 3! + @short normal application + @descr An instance of these class can be a normal node in frame tree only. The highest level to be allowed is 3! On 1 stand the desktop himself as the only one, on 2 are all tasks present ... and then comes frames only. A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as set/get of a frame window, component or controller. - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XFramesSupplier @@ -129,15 +129,15 @@ using namespace ::com::sun::star::bridge ; XWindowListener XTopWindowListener [ XDebugging, if TEST_TREE is defined! ] - @base OMutexMember + @base OMutexMember OWeakObject - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ class FrameWork : public Application { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -147,36 +147,36 @@ class FrameWork : public Application void impl_analyzeCommandArguments(); private: - sal_Bool m_bUsePlugIn ; + sal_Bool m_bUsePlugIn ; -}; // class FrameWork +}; // class FrameWork //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ -FrameWork aFrameWork ; +FrameWork aFrameWork ; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// private methods +// private methods //***************************************************************************************************************** void FrameWork::impl_analyzeCommandArguments() { // First reset all member variables which present states of incoming arguments! - m_bUsePlugIn = sal_False; // depends from "/plugin" + m_bUsePlugIn = sal_False; // depends from "/plugin" // Then step over all given arguments and search for supported one. - OStartupInfo aInfo ; - OUString sArgument ; - sal_uInt32 nCount = aInfo.getCommandArgCount(); + OStartupInfo aInfo ; + OUString sArgument ; + sal_uInt32 nCount = aInfo.getCommandArgCount(); for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument ) { // If extraction of current argument successfull ... @@ -193,7 +193,7 @@ void FrameWork::impl_analyzeCommandArguments() } //_________________________________________________________________________________________________________________ -// main +// main //_________________________________________________________________________________________________________________ void FrameWork::Main() @@ -229,17 +229,17 @@ void FrameWork::Main() #if 0 if ( m_bUsePlugIn == sal_True ) { - Reference< XConnection > xConnection = new OPipeConnection( xGlobalServiceManager ); - Reference< XBridgeFactory > xBridgeFactory ( xGlobalServiceManager->createInstance( SERVICENAME_BRIDGEFACTORY ), UNO_QUERY ); - if ( - ( xConnection.is() == sal_True ) && - ( xBridgeFactory.is() == sal_True ) + Reference< XConnection > xConnection = new OPipeConnection( xGlobalServiceManager ); + Reference< XBridgeFactory > xBridgeFactory ( xGlobalServiceManager->createInstance( SERVICENAME_BRIDGEFACTORY ), UNO_QUERY ); + if ( + ( xConnection.is() == sal_True ) && + ( xBridgeFactory.is() == sal_True ) ) { - Reference< XBridge > xBridge = xBridgeFactory->createBridge( NAME_PLUGINBRIDGE , - PROTOCOL_PLUGINBRIDGE , - xConnection , - new OInstanceProvider( xGlobalServiceManager ) ); + Reference< XBridge > xBridge = xBridgeFactory->createBridge( NAME_PLUGINBRIDGE , + PROTOCOL_PLUGINBRIDGE , + xConnection , + new OInstanceProvider( xGlobalServiceManager ) ); } else { @@ -267,7 +267,7 @@ void FrameWork::Main() xDispatch->dispatch( aURL, Sequence< PropertyValue >() ); // Use special feature of desktop service and log current tree state in file. -// LOG_TREE( xDesktop ) +// LOG_TREE( xDesktop ) // Build URL ... sURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "file://d|/menu.htm" )); @@ -277,7 +277,7 @@ void FrameWork::Main() xDispatch->dispatch( aURL, Sequence< PropertyValue >() ); // Use special feature of desktop service and log current tree state in file. -// LOG_TREE( xDesktop ) +// LOG_TREE( xDesktop ) } // Set running-mode for application. diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx index a8b7df2d74b3..b3cad049ba95 100644 --- a/framework/source/application/login.cxx +++ b/framework/source/application/login.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_ @@ -41,14 +41,14 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -63,11 +63,11 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define TEMPFILE_ENCODING RTL_TEXTENCODING_UTF8 // encoding of written temp. ascii file -#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - neccessary to create own servicemanager +#define TEMPFILE_ENCODING RTL_TEXTENCODING_UTF8 // encoding of written temp. ascii file +#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - neccessary to create own servicemanager #define SEPERATOR "\n" // used to seperate parts in temp. file #define MINARGUMENTCOUNT 1 // count of min. required arguments @@ -78,68 +78,68 @@ #define ARGUMENT_DIALOGPARENT DECLARE_ASCII("-p=") // we support "-p=36748322" as window handle of parent for vcl dialog //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::vos ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; +using namespace ::rtl ; +using namespace ::vos ; +using namespace ::comphelper ; +using namespace ::framework ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement command application to show login dialog and save his information in temp. file! - @descr We need this temp. file to share informations between our dialog and different processes, which + @short implement command application to show login dialog and save his information in temp. file! + @descr We need this temp. file to share informations between our dialog and different processes, which can't use vcl directly. Caller of this executable give us the file name as an argument - we save all informations in it - caller can read it and MUST delete temp. file. This is neccessary for example; to hide the password! - @implements - + @implements - - @base Application + @base Application *//*-*************************************************************************************************************/ class LoginApplication : public Application { //************************************************************************************************************* - // public methods + // public methods //************************************************************************************************************* public: void Main(); //************************************************************************************************************* - // private methods + // private methods //************************************************************************************************************* private: - void impl_parseCommandline(); // search supported arguments on command line + void impl_parseCommandline(); // search supported arguments on command line //************************************************************************************************************* - // private variables + // private variables //************************************************************************************************************* private: OString m_sTempFile ; // name of temp. file in system notation sal_Int32 m_nParentHandle ; // a parent window handle for used vcl dialog -}; // class LoginApplication +}; // class LoginApplication //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ -LoginApplication gLoginApplication; +LoginApplication gLoginApplication; //_________________________________________________________________________________________________________________ -// main +// main //_________________________________________________________________________________________________________________ void LoginApplication::Main() @@ -156,14 +156,14 @@ void LoginApplication::Main() // Try to get neccessary dialog service. // By the way - cast it to interface XPropertySet too - we need it later. // (define SERVICENAME... comes from defines.hxx!) - Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY ); - Reference< XPropertySet > xPropertySet( xLoginDialog , UNO_QUERY ); + Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY ); + Reference< XPropertySet > xPropertySet( xLoginDialog , UNO_QUERY ); // Work with valid ressources only! // Otherwise do nothing ... - if ( - ( xLoginDialog.is() == sal_True ) && - ( xPropertySet.is() == sal_True ) && + if ( + ( xLoginDialog.is() == sal_True ) && + ( xPropertySet.is() == sal_True ) && ( m_sTempFile.getLength() > 0 ) ) { @@ -182,21 +182,21 @@ void LoginApplication::Main() // Show login dialog and get decision of user. sal_Bool bDecision = (sal_Bool)(xLoginDialog->execute()); - OUString sUserName ; - OUString sPassword ; - OUString sServer ; - OUString sConnectionType ; - sal_Int32 nPort=0 ; // We need this default if follow "if"-statement "failed"! + OUString sUserName ; + OUString sPassword ; + OUString sServer ; + OUString sConnectionType ; + sal_Int32 nPort=0 ; // We need this default if follow "if"-statement "failed"! // If user say "OK" ... get values from dialog. // If user say "NO" ... leave it. Then we save empty informations later ... if( bDecision == sal_True ) { // defines PROPERTYNAME... comes from logindialog.hxx! - xPropertySet->getPropertyValue( PROPERTYNAME_USERNAME ) >>= sUserName ; - xPropertySet->getPropertyValue( PROPERTYNAME_PASSWORD ) >>= sPassword ; - xPropertySet->getPropertyValue( PROPERTYNAME_SERVER ) >>= sServer ; - xPropertySet->getPropertyValue( PROPERTYNAME_CONNECTIONTYPE ) >>= sConnectionType ; + xPropertySet->getPropertyValue( PROPERTYNAME_USERNAME ) >>= sUserName ; + xPropertySet->getPropertyValue( PROPERTYNAME_PASSWORD ) >>= sPassword ; + xPropertySet->getPropertyValue( PROPERTYNAME_SERVER ) >>= sServer ; + xPropertySet->getPropertyValue( PROPERTYNAME_CONNECTIONTYPE ) >>= sConnectionType ; if( sConnectionType.getLength() > 0 ) { xPropertySet->getPropertyValue( sConnectionType ) >>= nPort; @@ -221,15 +221,15 @@ void LoginApplication::Main() sBuffer.appendAscii( "0" ); } sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sUserName ); + sBuffer.append ( sUserName ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sPassword ); + sBuffer.append ( sPassword ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sServer ); + sBuffer.append ( sServer ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sConnectionType ); + sBuffer.append ( sConnectionType ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( nPort ); + sBuffer.append ( nPort ); sBuffer.appendAscii ( SEPERATOR ); // Write informations in temp. file. @@ -240,14 +240,14 @@ void LoginApplication::Main() if( pFile != NULL ) { OString sEncodedOut = U2B_ENC( sBuffer.makeStringAndClear(), TEMPFILE_ENCODING ); - fprintf( pFile, sEncodedOut.getStr() ); - fclose ( pFile ); + fprintf( pFile, sEncodedOut.getStr() ); + fclose ( pFile ); } } } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void LoginApplication::impl_parseCommandline() { @@ -256,9 +256,9 @@ void LoginApplication::impl_parseCommandline() // Set it on our member. Caller of this method must control setted values. OStartupInfo aInfo; - sal_uInt32 nCount = aInfo.getCommandArgCount() ; - sal_uInt32 nArgument = 0 ; - OUString sArgument ; + sal_uInt32 nCount = aInfo.getCommandArgCount() ; + sal_uInt32 nArgument = 0 ; + OUString sArgument ; OUString sValue ; // Warn programmer if argument count isnt ok! diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/classes/actiontriggercontainer.cxx index 6152ab5f0969..ea549fd3fda8 100644 --- a/framework/source/classes/actiontriggercontainer.cxx +++ b/framework/source/classes/actiontriggercontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,12 +156,12 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , - ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , - ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , - ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; + ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , + ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , + ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , + ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; diff --git a/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/classes/actiontriggerpropertyset.cxx index 8c30fde1379f..e72efe6e7cba 100644 --- a/framework/source/classes/actiontriggerpropertyset.cxx +++ b/framework/source/classes/actiontriggerpropertyset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace framework ActionTriggerPropertySet::ActionTriggerPropertySet( const Reference< XMultiServiceFactory >& /*xServiceManager*/ ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this )) + , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this )) , OWeakObject () , m_xBitmap ( 0 ) , m_xActionTriggerContainer( 0 ) @@ -147,11 +147,11 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; + ::getCppuType(( const Reference< XPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; @@ -190,21 +190,21 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() th } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper implementation +// OPropertySetHelper implementation //--------------------------------------------------------------------------------------------------------- sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue( - Any& aConvertedValue, - Any& aOldValue, - sal_Int32 nHandle, - const Any& aValue ) + Any& aConvertedValue, + Any& aOldValue, + sal_Int32 nHandle, + const Any& aValue ) throw( IllegalArgumentException ) { - // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". - // Return TRUE, if changed - else return FALSE. - // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! - // Initialize return value with FALSE !!! - // (Handle can be invalid) + // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". + // Return TRUE, if changed - else return FALSE. + // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! + // Initialize return value with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -350,11 +350,11 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr { static const Property pActionTriggerPropertys[] = { - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )), HANDLE_COMMANDURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), HANDLE_HELPURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )), HANDLE_SUBCONTAINER , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )), HANDLE_COMMANDURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), HANDLE_HELPURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )), HANDLE_SUBCONTAINER , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! @@ -366,13 +366,13 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr //****************************************************************************************************************************** -// private method +// private method //****************************************************************************************************************************** sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const ::rtl::OUString& sCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + const ::rtl::OUString& sCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -386,16 +386,16 @@ throw( IllegalArgumentException ) if( sValue != sCurrentValue ) { // ... set information of change. - aOldValue <<= sCurrentValue ; - aConvertedValue <<= sValue ; + aOldValue <<= sCurrentValue ; + aConvertedValue <<= sValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } @@ -405,10 +405,10 @@ throw( IllegalArgumentException ) sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const Reference< XBitmap > aCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + const Reference< XBitmap > aCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -422,16 +422,16 @@ throw( IllegalArgumentException ) if( aValue != aCurrentValue ) { // ... set information of change. - aOldValue <<= aCurrentValue ; - aConvertedValue <<= aValue ; + aOldValue <<= aCurrentValue ; + aConvertedValue <<= aValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } @@ -440,10 +440,10 @@ throw( IllegalArgumentException ) } sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const Reference< XInterface > aCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + const Reference< XInterface > aCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -457,16 +457,16 @@ throw( IllegalArgumentException ) if( aValue != aCurrentValue ) { // ... set information of change. - aOldValue <<= aCurrentValue ; - aConvertedValue <<= aValue ; + aOldValue <<= aCurrentValue ; + aConvertedValue <<= aValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/classes/actiontriggerseparatorpropertyset.cxx index aea4934f2012..f68c293fcef4 100644 --- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/classes/actiontriggerseparatorpropertyset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ namespace framework ActionTriggerSeparatorPropertySet::ActionTriggerSeparatorPropertySet( const Reference< XMultiServiceFactory >& /*ServiceManager*/ ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this ) ) - , OWeakObject ( ) - , m_nSeparatorType( 0 ) + , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this ) ) + , OWeakObject ( ) + , m_nSeparatorType( 0 ) { } @@ -141,11 +141,11 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; + ::getCppuType(( const Reference< XPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; @@ -184,21 +184,21 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementati } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper implementation +// OPropertySetHelper implementation //--------------------------------------------------------------------------------------------------------- sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue( - Any& aConvertedValue, - Any& aOldValue, - sal_Int32 nHandle, - const Any& aValue ) + Any& aConvertedValue, + Any& aOldValue, + sal_Int32 nHandle, + const Any& aValue ) throw( IllegalArgumentException ) { - // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". - // Return TRUE, if changed - else return FALSE. - // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! - // Initialize return value with FALSE !!! - // (Handle can be invalid) + // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". + // Return TRUE, if changed - else return FALSE. + // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! + // Initialize return value with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -308,13 +308,13 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp //****************************************************************************************************************************** -// private method +// private method //****************************************************************************************************************************** sal_Bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty( - sal_Int16 aCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + sal_Int16 aCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -328,16 +328,16 @@ throw( IllegalArgumentException ) if( aValue != aCurrentValue ) { // ... set information of change. - aOldValue <<= aCurrentValue ; - aConvertedValue <<= aValue ; + aOldValue <<= aCurrentValue ; + aConvertedValue <<= aValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/classes/addonmenu.cxx index 7105da2d68d1..4961a8f7c1f2 100644 --- a/framework/source/classes/addonmenu.cxx +++ b/framework/source/classes/addonmenu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "classes/addonmenu.hxx" #include "classes/addonsoptions.hxx" @@ -39,7 +39,7 @@ #include <xml/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/URL.hpp> @@ -47,14 +47,14 @@ #include <com/sun/star/lang/XServiceInfo.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <vcl/svapp.hxx> #include <svtools/menuoptions.hxx> #include <svl/solar.hrc> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -272,13 +272,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me // Merge the addon popup menus into the given menu bar at the provided pos. void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, const Reference< XModel >& rModel, - USHORT nMergeAtPos, + USHORT nMergeAtPos, MenuBar* pMergeMenuBar ) { if ( pMergeMenuBar ) { - AddonsOptions aAddonsOptions; - USHORT nInsertPos = nMergeAtPos; + AddonsOptions aAddonsOptions; + USHORT nInsertPos = nMergeAtPos; ::rtl::OUString aTitle; ::rtl::OUString aURL; @@ -288,7 +288,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, Sequence< Sequence< PropertyValue > > aAddonSubMenu; USHORT nUniqueMenuId = ADDONMENU_ITEMID_START; - const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart(); + const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart(); for ( sal_Int32 i = 0; i < rAddonMenuEntries.getLength(); i++ ) { AddonMenuManager::GetMenuEntry( rAddonMenuEntries[i], @@ -333,12 +333,12 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent const Reference< XFrame >& rFrame, const Reference< XModel >& rModel ) { - Sequence< Sequence< PropertyValue > > aAddonSubMenu; + Sequence< Sequence< PropertyValue > > aAddonSubMenu; BOOL bInsertSeparator = FALSE; - UINT32 i = 0; + UINT32 i = 0; UINT32 nElements = 0; - UINT32 nCount = aAddonMenuDefinition.getLength(); - AddonsOptions aAddonsOptions; + UINT32 nCount = aAddonMenuDefinition.getLength(); + AddonsOptions aAddonsOptions; ::rtl::OUString aTitle; ::rtl::OUString aURL; @@ -406,10 +406,10 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu ::rtl::OUString& rTarget, ::rtl::OUString& rImageId, ::rtl::OUString& rContext, - Sequence< Sequence< PropertyValue > >& rAddonSubMenu ) + Sequence< Sequence< PropertyValue > >& rAddonSubMenu ) { // Reset submenu parameter - rAddonSubMenu = Sequence< Sequence< PropertyValue > >(); + rAddonSubMenu = Sequence< Sequence< PropertyValue > >(); for ( int i = 0; i < rAddonMenuEntry.getLength(); i++ ) { diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx index a1b22c2de5b8..9bdaeb7dfda3 100644 --- a/framework/source/classes/addonsoptions.cxx +++ b/framework/source/classes/addonsoptions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> #include <unotools/configmgr.hxx> @@ -54,46 +54,46 @@ #include <vector> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::std ; -using namespace ::utl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::lang ; +using namespace ::std ; +using namespace ::utl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::lang ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) -#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) -#define TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" )) -#define SEPARATOR_URL_STR "private:separator" -#define SEPARATOR_URL_LEN 17 -#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR )) +#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) +#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) +#define TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" )) +#define SEPARATOR_URL_STR "private:separator" +#define SEPARATOR_URL_LEN 17 +#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR )) #define PROPERTYNAME_URL ADDONSMENUITEM_PROPERTYNAME_URL #define PROPERTYNAME_TITLE ADDONSMENUITEM_PROPERTYNAME_TITLE #define PROPERTYNAME_TARGET ADDONSMENUITEM_PROPERTYNAME_TARGET #define PROPERTYNAME_IMAGEIDENTIFIER ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER -#define PROPERTYNAME_CONTEXT ADDONSMENUITEM_PROPERTYNAME_CONTEXT -#define PROPERTYNAME_SUBMENU ADDONSMENUITEM_PROPERTYNAME_SUBMENU +#define PROPERTYNAME_CONTEXT ADDONSMENUITEM_PROPERTYNAME_CONTEXT +#define PROPERTYNAME_SUBMENU ADDONSMENUITEM_PROPERTYNAME_SUBMENU #define PROPERTYNAME_CONTROLTYPE ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE #define PROPERTYNAME_WIDTH ADDONSMENUITEM_PROPERTYNAME_WIDTH -#define PROPERTYNAME_IMAGESMALL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" )) -#define PROPERTYNAME_IMAGEBIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" )) -#define PROPERTYNAME_IMAGESMALLHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" )) -#define PROPERTYNAME_IMAGEBIGHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" )) -#define PROPERTYNAME_IMAGESMALL_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" )) -#define PROPERTYNAME_IMAGEBIG_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" )) -#define PROPERTYNAME_IMAGESMALLHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" )) -#define PROPERTYNAME_IMAGEBIGHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" )) +#define PROPERTYNAME_IMAGESMALL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" )) +#define PROPERTYNAME_IMAGEBIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" )) +#define PROPERTYNAME_IMAGESMALLHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" )) +#define PROPERTYNAME_IMAGEBIGHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" )) +#define PROPERTYNAME_IMAGESMALL_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" )) +#define PROPERTYNAME_IMAGEBIG_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" )) +#define PROPERTYNAME_IMAGESMALLHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" )) +#define PROPERTYNAME_IMAGEBIGHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" )) -#define IMAGES_NODENAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" )) +#define IMAGES_NODENAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" )) #define PRIVATE_IMAGE_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:image/" )) #define PROPERTYNAME_MERGEMENU_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" )) @@ -116,50 +116,50 @@ using namespace ::com::sun::star::lang ; #define INDEX_URL 0 #define INDEX_TITLE 1 #define INDEX_IMAGEIDENTIFIER 2 -#define INDEX_TARGET 3 -#define INDEX_CONTEXT 4 -#define INDEX_SUBMENU 5 +#define INDEX_TARGET 3 +#define INDEX_CONTEXT 4 +#define INDEX_SUBMENU 5 #define INDEX_CONTROLTYPE 6 #define INDEX_WIDTH 7 #define PROPERTYCOUNT_INDEX 8 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_MENUITEM 6 +#define PROPERTYCOUNT_MENUITEM 6 #define OFFSET_MENUITEM_URL 0 #define OFFSET_MENUITEM_TITLE 1 -#define OFFSET_MENUITEM_IMAGEIDENTIFIER 2 -#define OFFSET_MENUITEM_TARGET 3 -#define OFFSET_MENUITEM_CONTEXT 4 -#define OFFSET_MENUITEM_SUBMENU 5 +#define OFFSET_MENUITEM_IMAGEIDENTIFIER 2 +#define OFFSET_MENUITEM_TARGET 3 +#define OFFSET_MENUITEM_CONTEXT 4 +#define OFFSET_MENUITEM_SUBMENU 5 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_POPUPMENU 4 -#define OFFSET_POPUPMENU_TITLE 0 -#define OFFSET_POPUPMENU_CONTEXT 1 -#define OFFSET_POPUPMENU_SUBMENU 2 -#define OFFSET_POPUPMENU_URL 3 // Used for property set +#define PROPERTYCOUNT_POPUPMENU 4 +#define OFFSET_POPUPMENU_TITLE 0 +#define OFFSET_POPUPMENU_CONTEXT 1 +#define OFFSET_POPUPMENU_SUBMENU 2 +#define OFFSET_POPUPMENU_URL 3 // Used for property set // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_TOOLBARITEM 7 -#define OFFSET_TOOLBARITEM_URL 0 -#define OFFSET_TOOLBARITEM_TITLE 1 -#define OFFSET_TOOLBARITEM_IMAGEIDENTIFIER 2 -#define OFFSET_TOOLBARITEM_TARGET 3 -#define OFFSET_TOOLBARITEM_CONTEXT 4 +#define PROPERTYCOUNT_TOOLBARITEM 7 +#define OFFSET_TOOLBARITEM_URL 0 +#define OFFSET_TOOLBARITEM_TITLE 1 +#define OFFSET_TOOLBARITEM_IMAGEIDENTIFIER 2 +#define OFFSET_TOOLBARITEM_TARGET 3 +#define OFFSET_TOOLBARITEM_CONTEXT 4 #define OFFSET_TOOLBARITEM_CONTROLTYPE 5 #define OFFSET_TOOLBARITEM_WIDTH 6 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_IMAGES 8 +#define PROPERTYCOUNT_IMAGES 8 #define PROPERTYCOUNT_EMBEDDED_IMAGES 4 -#define OFFSET_IMAGES_SMALL 0 -#define OFFSET_IMAGES_BIG 1 -#define OFFSET_IMAGES_SMALLHC 2 -#define OFFSET_IMAGES_BIGHC 3 -#define OFFSET_IMAGES_SMALL_URL 4 -#define OFFSET_IMAGES_BIG_URL 5 -#define OFFSET_IMAGES_SMALLHC_URL 6 -#define OFFSET_IMAGES_BIGHC_URL 7 +#define OFFSET_IMAGES_SMALL 0 +#define OFFSET_IMAGES_BIG 1 +#define OFFSET_IMAGES_SMALLHC 2 +#define OFFSET_IMAGES_BIGHC 3 +#define OFFSET_IMAGES_SMALL_URL 4 +#define OFFSET_IMAGES_BIG_URL 5 +#define OFFSET_IMAGES_SMALLHC_URL 6 +#define OFFSET_IMAGES_BIGHC_URL 7 #define PROPERTYCOUNT_MERGE_MENUBAR 6 #define OFFSET_MERGEMENU_MERGEPOINT 0 @@ -184,7 +184,7 @@ const Size aImageSizeSmall( 16, 16 ); const Size aImageSizeBig( 26, 26 ); //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /*-**************************************************************************************************************** @@ -197,54 +197,54 @@ namespace framework class AddonsOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- AddonsOptions_Impl(); ~AddonsOptions_Impl(); //--------------------------------------------------------------------------------------------------------- - // overloaded methods of baseclass + // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short called for notify of configmanager - @descr These method is called from the ConfigManager before application ends or from the + @short called for notify of configmanager + @descr These method is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. You must update your internal values. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem @param "lPropertyNames" is the list of properties which should be updated. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< ::rtl::OUString >& lPropertyNames ); /*-****************************************************************************************************//** - @short write changes to configuration - @descr These method writes the changed values into the sub tree + @short write changes to configuration + @descr These method writes the changed values into the sub tree and should always called in our destructor to guarantee consistency of config data. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Commit(); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @@ -252,30 +252,30 @@ class AddonsOptions_Impl : public ConfigItem @descr These class is used as static member of "SvtDynamicMenuOptions" ... => The code exist only for one time and isn't duplicated for every instance! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool HasAddonsMenu () const ; - sal_Bool HasAddonsHelpMenu () const ; + sal_Bool HasAddonsMenu () const ; + sal_Bool HasAddonsHelpMenu () const ; sal_Int32 GetAddonsToolBarCount() const ; - const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ; - const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ; - const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ; + const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ; + const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ; + const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ; const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ; - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; + const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ; + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const; void ReadConfigurationData(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -289,10 +289,10 @@ class AddonsOptions_Impl : public ConfigItem struct ImageEntry { - Image aImageSmall; - Image aImageBig; - Image aImageSmallHC; - Image aImageBigHC; + Image aImageSmall; + Image aImageBig; + Image aImageSmallHC; + Image aImageBigHC; Image aImageSmallNoScale; Image aImageBigNoScale; @@ -313,56 +313,56 @@ class AddonsOptions_Impl : public ConfigItem /*-****************************************************************************************************//** @short return list of key names of our configuration management which represent oue module tree - @descr These methods return the current list of key names! We need it to get needed values from our + @descr These methods return the current list of key names! We need it to get needed values from our configuration management! - @seealso - + @seealso - @param "nCount" , returns count of menu entries for "new" - @return A list of configuration key names is returned. + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq ); - sal_Bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq ); - sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ); - sal_Bool ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq ); - sal_Bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq ); - sal_Bool ReadImages( ImageManager& aImageManager ); + sal_Bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq ); + sal_Bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq ); + sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ); + sal_Bool ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq ); + sal_Bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq ); + sal_Bool ReadImages( ImageManager& aImageManager ); sal_Bool ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer ); sal_Bool ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap ); sal_Bool ReadMergeMenuData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ); sal_Bool ReadMergeToolbarData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ); - sal_Bool ReadMenuItem( const ::rtl::OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False ); - sal_Bool ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ); + sal_Bool ReadMenuItem( const ::rtl::OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False ); + sal_Bool ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ); sal_Bool AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ); - sal_Bool ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ); - sal_Bool ReadImagesItem( const ::rtl::OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem ); - ImageEntry* ReadImageData( const ::rtl::OUString& aImagesNodeName ); + sal_Bool ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ); + sal_Bool ReadImagesItem( const ::rtl::OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem ); + ImageEntry* ReadImageData( const ::rtl::OUString& aImagesNodeName ); void ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId ); void ReadImageFromURL( ImageSize nImageSize, const ::rtl::OUString& aURL, Image& aImage, Image& aNoScaleImage ); sal_Bool HasAssociatedImages( const ::rtl::OUString& aURL ); void SubstituteVariables( ::rtl::OUString& aURL ); - sal_Bool ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu ); - void InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ); - ::rtl::OUString GeneratePrefixURL(); + sal_Bool ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu ); + void InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ); + ::rtl::OUString GeneratePrefixURL(); Sequence< ::rtl::OUString > GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootName ) const; Sequence< ::rtl::OUString > GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const; - sal_Bool CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const; + sal_Bool CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const; //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName ); + ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName ); sal_Int32 m_nRootAddonPopupMenuId; ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX]; @@ -387,11 +387,11 @@ class AddonsOptions_Impl : public ConfigItem }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** AddonsOptions_Impl::AddonsOptions_Impl() // Init baseclasses first @@ -403,24 +403,24 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPrivateImageURL( PRIVATE_IMAGE_URL ) { // initialize array with fixed property names - m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL; - m_aPropNames[ INDEX_TITLE ] = PROPERTYNAME_TITLE; - m_aPropNames[ INDEX_TARGET ] = PROPERTYNAME_TARGET; - m_aPropNames[ INDEX_IMAGEIDENTIFIER ] = PROPERTYNAME_IMAGEIDENTIFIER; - m_aPropNames[ INDEX_CONTEXT ] = PROPERTYNAME_CONTEXT; - m_aPropNames[ INDEX_SUBMENU ] = PROPERTYNAME_SUBMENU; // Submenu set! + m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL; + m_aPropNames[ INDEX_TITLE ] = PROPERTYNAME_TITLE; + m_aPropNames[ INDEX_TARGET ] = PROPERTYNAME_TARGET; + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] = PROPERTYNAME_IMAGEIDENTIFIER; + m_aPropNames[ INDEX_CONTEXT ] = PROPERTYNAME_CONTEXT; + m_aPropNames[ INDEX_SUBMENU ] = PROPERTYNAME_SUBMENU; // Submenu set! m_aPropNames[ INDEX_CONTROLTYPE ] = PROPERTYNAME_CONTROLTYPE; m_aPropNames[ INDEX_WIDTH ] = PROPERTYNAME_WIDTH; // initialize array with fixed images property names - m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] = PROPERTYNAME_IMAGESMALL; - m_aPropImagesNames[ OFFSET_IMAGES_BIG ] = PROPERTYNAME_IMAGEBIG; - m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] = PROPERTYNAME_IMAGESMALLHC; - m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] = PROPERTYNAME_IMAGEBIGHC; - m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] = PROPERTYNAME_IMAGESMALL_URL; - m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] = PROPERTYNAME_IMAGEBIG_URL; - m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL ] = PROPERTYNAME_IMAGESMALLHC_URL; - m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] = PROPERTYNAME_IMAGEBIGHC_URL; + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] = PROPERTYNAME_IMAGESMALL; + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] = PROPERTYNAME_IMAGEBIG; + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] = PROPERTYNAME_IMAGESMALLHC; + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] = PROPERTYNAME_IMAGEBIGHC; + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] = PROPERTYNAME_IMAGESMALL_URL; + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] = PROPERTYNAME_IMAGEBIG_URL; + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL ] = PROPERTYNAME_IMAGESMALLHC_URL; + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] = PROPERTYNAME_IMAGEBIGHC_URL; // initialize array with fixed merge menu property names m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGEPOINT ] = PROPERTYNAME_MERGEMENU_MERGEPOINT; @@ -458,7 +458,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** AddonsOptions_Impl::~AddonsOptions_Impl() { @@ -493,7 +493,7 @@ void AddonsOptions_Impl::ReadConfigurationData() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyNames*/ ) { @@ -501,7 +501,7 @@ void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyN } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void AddonsOptions_Impl::Commit() { @@ -509,7 +509,7 @@ void AddonsOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::HasAddonsMenu() const { @@ -517,15 +517,15 @@ sal_Bool AddonsOptions_Impl::HasAddonsMenu() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -sal_Bool AddonsOptions_Impl::HasAddonsHelpMenu () const +sal_Bool AddonsOptions_Impl::HasAddonsHelpMenu () const { return ( m_aCachedHelpMenuProperties.getLength() > 0 ); } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const { @@ -533,7 +533,7 @@ sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const { @@ -541,7 +541,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const { @@ -549,7 +549,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBa } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { @@ -560,7 +560,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const ::rtl::OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { @@ -571,15 +571,15 @@ const ::rtl::OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const +const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const { return m_aCachedHelpMenuProperties; } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const { @@ -587,7 +587,7 @@ const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstruction } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** bool AddonsOptions_Impl::GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, @@ -604,7 +604,7 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions( } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const { @@ -633,26 +633,26 @@ Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool b } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq ) { // Read the AddonMenu set and fill property sequences - ::rtl::OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" )); - Sequence< ::rtl::OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName ); - ::rtl::OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter ); + ::rtl::OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" )); + Sequence< ::rtl::OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName ); + ::rtl::OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter ); - sal_uInt32 nCount = aAddonMenuNodeSeq.getLength(); - sal_uInt32 nIndex = 0; + sal_uInt32 nCount = aAddonMenuNodeSeq.getLength(); + sal_uInt32 nIndex = 0; Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); // Init the property value sequence - aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! for ( sal_uInt32 n = 0; n < nCount; n++ ) { @@ -672,26 +672,26 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq ) { // Read the AddonMenu set and fill property sequences - ::rtl::OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" )); - Sequence< ::rtl::OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName ); - ::rtl::OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter ); + ::rtl::OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" )); + Sequence< ::rtl::OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName ); + ::rtl::OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter ); - sal_uInt32 nCount = aAddonHelpMenuNodeSeq.getLength(); - sal_uInt32 nIndex = 0; + sal_uInt32 nCount = aAddonHelpMenuNodeSeq.getLength(); + sal_uInt32 nIndex = 0; Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); // Init the property value sequence - aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! for ( sal_uInt32 n = 0; n < nCount; n++ ) { @@ -711,24 +711,24 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq ) { // Read the OfficeMenuBar set and fill property sequences - ::rtl::OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" )); - Sequence< ::rtl::OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName ); - ::rtl::OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter ); + ::rtl::OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" )); + Sequence< ::rtl::OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName ); + ::rtl::OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter ); - sal_uInt32 nCount = aAddonMenuBarNodeSeq.getLength(); - sal_uInt32 nIndex = 0; + sal_uInt32 nCount = aAddonMenuBarNodeSeq.getLength(); + sal_uInt32 nIndex = 0; Sequence< PropertyValue > aPopupMenu( PROPERTYCOUNT_POPUPMENU ); // Init the property value sequence - aPopupMenu[ OFFSET_POPUPMENU_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT]; - aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU]; - aPopupMenu[ OFFSET_POPUPMENU_URL ].Name = m_aPropNames[ INDEX_URL ]; + aPopupMenu[ OFFSET_POPUPMENU_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT]; + aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU]; + aPopupMenu[ OFFSET_POPUPMENU_URL ].Name = m_aPropNames[ INDEX_URL ]; StringToIndexMap aTitleToIndexMap; @@ -767,7 +767,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ) { @@ -791,24 +791,24 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { - sal_Bool bInsertSeparator = sal_False; - sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); - ::rtl::OUString aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter ); - Sequence< ::rtl::OUString > aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName ); - Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); + sal_Bool bInsertSeparator = sal_False; + sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); + ::rtl::OUString aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter ); + Sequence< ::rtl::OUString > aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName ); + Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); // Init the property value sequence - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Name = m_aPropNames[ INDEX_CONTROLTYPE ]; - aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Name = m_aPropNames[ INDEX_WIDTH ]; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Name = m_aPropNames[ INDEX_CONTROLTYPE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Name = m_aPropNames[ INDEX_WIDTH ]; sal_uInt32 nCount = aAddonToolBarItemSetNodeSeq.getLength(); for ( sal_uInt32 n = 0; n < nCount; n++ ) @@ -835,23 +835,23 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarIte } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { - Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); + Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= SEPARATOR_URL; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= SEPARATOR_URL; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); rAddonOfficeToolBarSeq.realloc( nToolBarItemCount+1 ); @@ -859,19 +859,19 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) { // Read the user-defined Images set and fill image manager ::rtl::OUString aAddonImagesNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/Images" )); - Sequence< ::rtl::OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName ); + Sequence< ::rtl::OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName ); ::rtl::OUString aAddonImagesNode( aAddonImagesNodeName + m_aPathDelimiter ); sal_uInt32 nCount = aAddonImagesNodeSeq.getLength(); // Init the property value sequence - Sequence< ::rtl::OUString > aAddonImageItemNodePropNames( 1 ); + Sequence< ::rtl::OUString > aAddonImageItemNodePropNames( 1 ); ::rtl::OUString aURL; for ( sal_uInt32 n = 0; n < nCount; n++ ) @@ -913,7 +913,7 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** ::rtl::OUString AddonsOptions_Impl::GeneratePrefixURL() @@ -929,20 +929,20 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer ) { const ::rtl::OUString aMenuMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBarMerging/" )); - Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName ); + Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName ); ::rtl::OUString aAddonMergeNode( aMenuMergeRootName ); sal_uInt32 nCount = aAddonMergeNodesSeq.getLength(); // Init the property value sequence - Sequence< ::rtl::OUString > aNodePropNames( 5 ); + Sequence< ::rtl::OUString > aNodePropNames( 5 ); ::rtl::OUString aURL; for ( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1000,7 +1000,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ) { @@ -1017,19 +1017,19 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const ::rtl::OUString& aMergeAdd } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions ) { const ::rtl::OUString aToolbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolbarMerging/" )); - Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName ); + Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName ); ::rtl::OUString aAddonMergeNode( aToolbarMergeRootName ); sal_uInt32 nCount = aAddonMergeNodesSeq.getLength(); // Init the property value sequence - Sequence< ::rtl::OUString > aNodePropNames( 6 ); + Sequence< ::rtl::OUString > aNodePropNames( 6 ); ::rtl::OUString aURL; for ( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1093,7 +1093,7 @@ sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruc } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) { @@ -1106,14 +1106,14 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const ::rtl::OUString& aMerge } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu ) { - sal_Bool bResult = sal_False; - ::rtl::OUString aStrValue; - ::rtl::OUString aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter ); - Sequence< Any > aMenuItemNodePropValues; + sal_Bool bResult = sal_False; + ::rtl::OUString aStrValue; + ::rtl::OUString aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter ); + Sequence< Any > aMenuItemNodePropValues; aMenuItemNodePropValues = GetProperties( GetPropertyNamesMenuItem( aAddonMenuItemTreeNode ) ); if (( aMenuItemNodePropValues[ OFFSET_MENUITEM_TITLE ] >>= aStrValue ) && aStrValue.getLength() > 0 ) @@ -1133,10 +1133,10 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, // A popup menu must have a title and can have a URL and ImageIdentifier // Set the other property values to empty - aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aPopupMenuURL; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aPopupMenuImageId; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aPopupMenuURL; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aPopupMenuImageId; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; // Continue to read the sub menu nodes Sequence< Sequence< PropertyValue > > aSubMenuSeq; @@ -1155,11 +1155,11 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, aMenuItemNodePropValues[ OFFSET_MENUITEM_IMAGEIDENTIFIER ] >>= aMenuImageId; ReadAndAssociateImages( aStrValue, aMenuImageId ); - aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_TARGET ]; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aMenuImageId; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_TARGET ]; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aMenuImageId; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! bResult = sal_True; } @@ -1168,11 +1168,11 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, aStrValue.equalsAsciiL( SEPARATOR_URL_STR, SEPARATOR_URL_LEN )) { // Separator - aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! bResult = sal_True; } @@ -1180,14 +1180,14 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ) { - sal_Bool bResult = sal_False; - ::rtl::OUString aStrValue; - ::rtl::OUString aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter ); - Sequence< Any > aPopupMenuNodePropValues; + sal_Bool bResult = sal_False; + ::rtl::OUString aStrValue; + ::rtl::OUString aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter ); + Sequence< Any > aPopupMenuNodePropValues; aPopupMenuNodePropValues = GetProperties( GetPropertyNamesPopupMenu( aAddonPopupMenuTreeNode ) ); if (( aPopupMenuNodePropValues[ OFFSET_POPUPMENU_TITLE ] >>= aStrValue ) && @@ -1203,8 +1203,8 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNod // Set a unique prefixed Add-On popup menu URL so it can be identified later ::rtl::OUString aPopupMenuURL = GeneratePrefixURL(); - aPopupMenu[ OFFSET_POPUPMENU_URL ].Value <<= aPopupMenuURL; - aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Value <<= aPopupMenuNodePropValues[ OFFSET_POPUPMENU_CONTEXT ]; + aPopupMenu[ OFFSET_POPUPMENU_URL ].Value <<= aPopupMenuURL; + aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Value <<= aPopupMenuNodePropValues[ OFFSET_POPUPMENU_CONTEXT ]; // Continue to read the sub menu nodes Sequence< Sequence< PropertyValue > > aSubMenuSeq; @@ -1221,7 +1221,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNod } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ) { @@ -1242,15 +1242,15 @@ sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTarget } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ) { - sal_Bool bResult = sal_False; - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter ); - Sequence< Any > aToolBarItemNodePropValues; + sal_Bool bResult = sal_False; + ::rtl::OUString aTitle; + ::rtl::OUString aURL; + ::rtl::OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter ); + Sequence< Any > aToolBarItemNodePropValues; aToolBarItemNodePropValues = GetProperties( GetPropertyNamesToolBarItem( aAddonToolBarItemTreeNode ) ); @@ -1260,17 +1260,17 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte if ( aURL.equals( SEPARATOR_URL )) { // A speparator toolbar item only needs a URL - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( 0 ); + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( 0 ); bResult = sal_True; } - else if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TITLE ] >>= aTitle ) && aTitle.getLength() > 0 ) + else if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TITLE ] >>= aTitle ) && aTitle.getLength() > 0 ) { // A normal toolbar item must also have title => read the other properties; ::rtl::OUString aImageId; @@ -1279,17 +1279,17 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ] >>= aImageId; ReadAndAssociateImages( aURL, aImageId ); - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= aTitle; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TARGET ]; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= aImageId; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTEXT ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTROLTYPE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= aTitle; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TARGET ]; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= aImageId; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTEXT ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTROLTYPE ]; // Configuration uses hyper for long. Therefore transform into sal_Int32 sal_Int64 nValue( 0 ); aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_WIDTH ] >>= nValue; - aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( nValue ); + aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( nValue ); bResult = sal_True; } @@ -1299,19 +1299,19 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq ) { Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); // Init the property value sequence - aMenuItem[ OFFSET_MENUITEM_URL ].Name = PROPERTYNAME_URL; - aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = PROPERTYNAME_TITLE; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = PROPERTYNAME_TARGET; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = PROPERTYNAME_IMAGEIDENTIFIER; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = PROPERTYNAME_CONTEXT; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = PROPERTYNAME_SUBMENU; // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Name = PROPERTYNAME_URL; + aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = PROPERTYNAME_TITLE; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = PROPERTYNAME_TARGET; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = PROPERTYNAME_IMAGEIDENTIFIER; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = PROPERTYNAME_CONTEXT; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = PROPERTYNAME_SUBMENU; // Submenu set! sal_uInt32 nIndex = 0; sal_uInt32 nCount = aSubMenuNodeNames.getLength(); @@ -1329,7 +1329,7 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< ::rtl::OUString } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL ) { @@ -1338,7 +1338,7 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL ) { @@ -1356,7 +1356,7 @@ void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OUString& aImageURL, Image& aImage, Image& aImageNoScale ) { @@ -1401,7 +1401,7 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId ) { @@ -1458,12 +1458,12 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::OUString& aImagesNodeName ) { Sequence< ::rtl::OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName ); - Sequence< Any > aPropertyData; + Sequence< Any > aPropertyData; Sequence< sal_Int8 > aImageDataSeq; ::rtl::OUString aImageURL; @@ -1546,17 +1546,17 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const { - sal_Bool bResult = sal_False; - Size aSize = bBig ? aImageSizeBig : aImageSizeSmall; // Sizes used for menu/toolbox images + sal_Bool bResult = sal_False; + Size aSize = bBig ? aImageSizeBig : aImageSizeSmall; // Sizes used for menu/toolbox images if ( rBitmapDataSeq.getLength() > 0 ) { - SvMemoryStream aMemStream( rBitmapDataSeq.getArray(), rBitmapDataSeq.getLength(), STREAM_STD_READ ); - BitmapEx aBitmapEx; + SvMemoryStream aMemStream( rBitmapDataSeq.getArray(), rBitmapDataSeq.getLength(), STREAM_STD_READ ); + BitmapEx aBitmapEx; aMemStream >> aBitmapEx; @@ -1578,7 +1578,7 @@ sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bB } //***************************************************************************************************************** -// private methods +// private methods //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootNode ) const { @@ -1600,18 +1600,18 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_MENUITEM ); // Create property names dependent from the root node name - lResult[OFFSET_MENUITEM_URL] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[OFFSET_MENUITEM_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[OFFSET_MENUITEM_URL] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); + lResult[OFFSET_MENUITEM_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] ); - lResult[OFFSET_MENUITEM_TARGET] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); - lResult[OFFSET_MENUITEM_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[OFFSET_MENUITEM_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); + lResult[OFFSET_MENUITEM_TARGET] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); + lResult[OFFSET_MENUITEM_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[OFFSET_MENUITEM_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); return lResult; } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const { @@ -1619,62 +1619,62 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 ); // Create property names dependent from the root node name - lResult[OFFSET_POPUPMENU_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); - lResult[OFFSET_POPUPMENU_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[OFFSET_POPUPMENU_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); + lResult[OFFSET_POPUPMENU_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[OFFSET_POPUPMENU_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[OFFSET_POPUPMENU_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); return lResult; } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const { Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_TOOLBARITEM ); // Create property names dependent from the root node name - lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); + lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] ); - lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); - lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] ); - lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); + lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); + lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] ); + lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); return lResult; } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const { Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_IMAGES ); // Create property names dependent from the root node name - lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] ); - lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] ); - lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] ); - lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] ); + lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] ); + lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] ); + lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] ); + lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] ); lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] ); - lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] ); + lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] ); lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] ); - lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] ); + lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] ); return lResult; } //***************************************************************************************************************** -// initialize static member -// DON'T DO IT IN YOUR HEADER! -// see definition for further informations +// initialize static member +// DON'T DO IT IN YOUR HEADER! +// see definition for further informations //***************************************************************************************************************** -AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; -sal_Int32 AddonsOptions::m_nRefCount = 0 ; +AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; +sal_Int32 AddonsOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** AddonsOptions::AddonsOptions() { @@ -1690,7 +1690,7 @@ AddonsOptions::AddonsOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** AddonsOptions::~AddonsOptions() { @@ -1708,7 +1708,7 @@ AddonsOptions::~AddonsOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool AddonsOptions::HasAddonsMenu() const { @@ -1717,7 +1717,7 @@ sal_Bool AddonsOptions::HasAddonsMenu() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool AddonsOptions::HasAddonsHelpMenu() const @@ -1727,7 +1727,7 @@ sal_Bool AddonsOptions::HasAddonsHelpMenu() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 AddonsOptions::GetAddonsToolBarCount() const @@ -1737,7 +1737,7 @@ sal_Int32 AddonsOptions::GetAddonsToolBarCount() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() const { @@ -1746,7 +1746,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() cons } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart() const { @@ -1755,7 +1755,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { @@ -1764,7 +1764,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const ::rtl::OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { @@ -1773,7 +1773,7 @@ const ::rtl::OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nI } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() const { @@ -1782,7 +1782,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() const { @@ -1791,7 +1791,7 @@ const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() c } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** bool AddonsOptions::GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, @@ -1803,7 +1803,7 @@ bool AddonsOptions::GetMergeToolbarInstructions( } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const { @@ -1812,7 +1812,7 @@ Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const { @@ -1820,7 +1820,7 @@ Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& AddonsOptions::GetOwnStaticMutex() { @@ -1845,7 +1845,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) { diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx index b595cce880b1..aa2aef3b9d2b 100644 --- a/framework/source/classes/bmkmenu.cxx +++ b/framework/source/classes/bmkmenu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <limits.h> @@ -41,7 +41,7 @@ #include <xml/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/URL.hpp> @@ -54,7 +54,7 @@ #include <com/sun/star/util/DateTime.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <vcl/svapp.hxx> @@ -63,7 +63,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::comphelper; @@ -77,26 +77,26 @@ namespace framework { void GetMenuEntry( - Sequence< PropertyValue >& aDynamicMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rFrame, - ::rtl::OUString& rImageId ); + Sequence< PropertyValue >& aDynamicMenuEntry, + ::rtl::OUString& rTitle, + ::rtl::OUString& rURL, + ::rtl::OUString& rFrame, + ::rtl::OUString& rImageId ); class BmkMenu_Impl { private: - static USHORT m_nMID; + static USHORT m_nMID; public: - BmkMenu* m_pRoot; + BmkMenu* m_pRoot; BOOL m_bInitialized; BmkMenu_Impl( BmkMenu* pRoot ); BmkMenu_Impl(); ~BmkMenu_Impl(); - static USHORT GetMID(); + static USHORT GetMID(); }; USHORT BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START; @@ -186,8 +186,8 @@ void BmkMenu::Initialize() InsertSeparator(); else { - sal_Bool bImageSet = sal_False; - USHORT nId = CreateMenuId(); + sal_Bool bImageSet = sal_False; + USHORT nId = CreateMenuId(); if ( bShowMenuImages ) { diff --git a/framework/source/classes/converter.cxx b/framework/source/classes/converter.cxx index 72fdb5d33306..d70b099c9e03 100644 --- a/framework/source/classes/converter.cxx +++ b/framework/source/classes/converter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -154,7 +154,7 @@ css::uno::Sequence< ::rtl::OUString > Converter::convert_OUStringList2seqOUStrin css::uno::Sequence< css::beans::PropertyValue > Converter::convert_OUStringHash2seqProp( const OUStringHash& lSource ) { css::uno::Sequence< css::beans::PropertyValue > lDestination (lSource.size()); - css::beans::PropertyValue* pDestination = lDestination.getArray(); + css::beans::PropertyValue* pDestination = lDestination.getArray(); sal_Int32 nItem = 0; for (OUStringHash::const_iterator pItem=lSource.begin(); pItem!=lSource.end(); ++pItem) { @@ -172,7 +172,7 @@ css::uno::Sequence< css::beans::PropertyValue > Converter::convert_OUStringHash2 OUStringHash Converter::convert_seqProp2OUStringHash( const css::uno::Sequence< css::beans::PropertyValue >& lSource ) { OUStringHash lDestination; - sal_Int32 nCount = lSource.getLength(); + sal_Int32 nCount = lSource.getLength(); const css::beans::PropertyValue* pSource = lSource.getConstArray(); for (sal_Int32 nItem=0; nItem<nCount; ++nItem) { @@ -313,4 +313,4 @@ DateTime Converter::convert_String2DateTime( /*IN*/ const ::rtl::OUString& sSour return sBuffer.makeStringAndClear(); } -} // namespace framework +} // namespace framework diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index 1223b05ff593..69226cba3162 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/droptargetlistener.hxx> #include <threadhelp/readguard.hxx> @@ -38,7 +38,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/transfer.hxx> #include <unotools/localfilehelper.hxx> @@ -57,7 +57,7 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 3b48c715054e..af25e786dbf1 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_FRAMECONTAINER_HXX_ @@ -43,7 +43,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_ @@ -51,26 +51,26 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /**-*************************************************************************************************************** diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/classes/framelistanalyzer.cxx index 80702d8108e0..22f019e78df5 100644 --- a/framework/source/classes/framelistanalyzer.cxx +++ b/framework/source/classes/framelistanalyzer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "classes/framelistanalyzer.hxx" //_______________________________________________ -// my own includes +// my own includes #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> #include <targets.h> @@ -39,29 +39,29 @@ #include <services.h> //_______________________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> //_______________________________________________ -// includes of other projects +// includes of other projects #include <unotools/processfactory.hxx> #include <vcl/svapp.hxx> //_______________________________________________ -// namespace +// namespace namespace framework{ //_______________________________________________ -// non exported const +// non exported const //_______________________________________________ -// non exported definitions +// non exported definitions //_______________________________________________ -// declarations +// declarations //_______________________________________________ diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx index 43e03b67594f..54b37da6dbf7 100644 --- a/framework/source/classes/fwkresid.cxx +++ b/framework/source/classes/fwkresid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,19 +38,19 @@ namespace framework { -ResMgr* FwkResId::GetResManager() +ResMgr* FwkResId::GetResManager() { - static ResMgr* pResMgr = NULL; - + static ResMgr* pResMgr = NULL; + if ( !pResMgr ) { rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } - + return pResMgr; } diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index f463a6c499d7..aa550807460c 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ void FwkTabPage::CreateDialog() m_xPage = uno::Reference < awt::XWindow >( m_xWinProvider->createContainerWindow( m_sPageURL, rtl::OUString(), xParent, xHandler ), uno::UNO_QUERY ); - + uno::Reference< awt::XControl > xPageControl( m_xPage, uno::UNO_QUERY ); if ( xPageControl.is() ) { @@ -376,7 +376,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea m_aTabCtrl.SetPageImage( nIdx, Image( xImage ) ); if ( bDisabled ) m_aTabCtrl.EnablePage( nIdx, false ); - + return pEntry->m_pPage; } diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 0dbc626faddc..e3f3e26ce995 100755 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,19 +38,19 @@ namespace framework { -ResMgr* FwlResId::GetResManager() +ResMgr* FwlResId::GetResManager() { - static ResMgr* pResMgr = NULL; - + static ResMgr* pResMgr = NULL; + if ( !pResMgr ) { rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } - + return pResMgr; } diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/classes/imagewrapper.cxx index b348e0cb9069..82a7f684413c 100644 --- a/framework/source/classes/imagewrapper.cxx +++ b/framework/source/classes/imagewrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() ImageWrapper::ImageWrapper( const Image& aImage ) : ThreadHelpBase( &Application::GetSolarMutex() ) - , m_aImage( aImage ) + , m_aImage( aImage ) { } @@ -69,17 +69,17 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() // XBitmap com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); - BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); - Size aBitmapSize( aBitmapEx.GetSizePixel() ); + BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); + Size aBitmapSize( aBitmapEx.GetSizePixel() ); return com::sun::star::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() ); } Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); SvMemoryStream aMem; aMem << m_aImage.GetBitmapEx().GetBitmap(); @@ -88,8 +88,8 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); - BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); + BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); if ( aBmpEx.IsAlpha() ) { diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/classes/menuextensionsupplier.cxx index d6ed70103bf8..07991c61f90f 100644 --- a/framework/source/classes/menuextensionsupplier.cxx +++ b/framework/source/classes/menuextensionsupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace framework pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFuncArg ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - + pfunc_setMenuExtensionSupplier pOldMenuExtensionSupplierFunc = pMenuExtensionSupplierFunc; pMenuExtensionSupplierFunc = pMenuExtensionSupplierFuncArg; return pOldMenuExtensionSupplierFunc; @@ -47,7 +47,7 @@ pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuE MenuExtensionItem SAL_CALL GetMenuExtension() { MenuExtensionItem aItem; - + pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( 0 ); { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 825a4b278c90..61cb8eb4a253 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/menumanager.hxx> #include <xml/menuconfiguration.hxx> @@ -44,7 +44,7 @@ #include "classes/resource.hrc" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -57,7 +57,7 @@ #include <com/sun/star/util/XStringWidth.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> @@ -80,7 +80,7 @@ #include <cppuhelper/implbase1.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::cppu; @@ -111,15 +111,15 @@ namespace framework { // special menu ids/command ids for dynamic popup menus -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) -#define SID_MDIWINDOWLIST (SID_SFX_START + 610) -#define SID_ADDONLIST (SID_SFX_START + 1677) -#define SID_HELPMENU (SID_SFX_START + 410) +#define SID_SFX_START 5000 +#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) +#define SID_PICKLIST (SID_SFX_START + 510) +#define SID_MDIWINDOWLIST (SID_SFX_START + 610) +#define SID_ADDONLIST (SID_SFX_START + 1677) +#define SID_HELPMENU (SID_SFX_START + 410) -#define SFX_REFERER_USER "private:user" +#define SFX_REFERER_USER "private:user" const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" )); const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" )); @@ -140,22 +140,22 @@ const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) -: // #110897# +: // #110897# ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) { - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pMenu; - m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_False; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pMenu; + m_xFrame = rFrame; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_False; SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); - m_bShowMenuImages = rSettings.GetUseImagesInMenus(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); #if 0 @@ -251,7 +251,7 @@ MenuManager::MenuManager( if ( pMenu->GetItemText( nItemId ).Len() == 0 ) aQueryLabelItemIdVector.push_back( nItemId ); #endif - + if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); @@ -276,7 +276,7 @@ MenuManager::MenuManager( if ( pMenu->GetItemText( nItemId ).Len() == 0 ) aQueryLabelItemIdVector.push_back( nItemId ); #endif - + if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); @@ -362,20 +362,20 @@ MenuManager::MenuManager( MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) -: // #110897# +: // #110897# ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) { - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pAddonMenu; - m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_True; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pAddonMenu; + m_xFrame = rFrame; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_True; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire(); @@ -483,13 +483,13 @@ throw ( RuntimeException ) if ( pStatusChangedMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + OGuard aSolarGuard( Application::GetSolarMutex() ); { ResetableGuard aGuard( m_aLock ); sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; - sal_Bool bMenuItemEnabled = m_pVCLMenu->IsItemEnabled( pStatusChangedMenu->nItemId ); + sal_Bool bCheckmark = sal_False; + sal_Bool bMenuItemEnabled = m_pVCLMenu->IsItemEnabled( pStatusChangedMenu->nItemId ); if ( Event.IsEnabled != bMenuItemEnabled ) m_pVCLMenu->EnableItem( pStatusChangedMenu->nItemId, Event.IsEnabled ); @@ -515,8 +515,8 @@ throw ( RuntimeException ) if ( xMenuItemDispatch.is() ) { - pStatusChangedMenu->xMenuItemDispatch = xMenuItemDispatch; - pStatusChangedMenu->aMenuItemURL = aTargetURL.Complete; + pStatusChangedMenu->xMenuItemDispatch = xMenuItemDispatch; + pStatusChangedMenu->aMenuItemURL = aTargetURL.Complete; xMenuItemDispatch->addStatusListener( SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); } } @@ -543,7 +543,7 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly) if ( pItemHandler->xMenuItemDispatch.is() ) { URL aTargetURL; - aTargetURL.Complete = pItemHandler->aMenuItemURL; + aTargetURL.Complete = pItemHandler->aMenuItemURL; m_xURLTransformer->parseStrict( aTargetURL ); pItemHandler->xMenuItemDispatch->removeStatusListener( @@ -591,7 +591,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM if ( pMenuItemDisposing ) { URL aTargetURL; - aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; + aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; // #110897# m_xURLTransformer->parseStrict( aTargetURL ); @@ -611,8 +611,8 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) ::std::vector< MenuItemHandler* > aNewPickVector; Reference< XStringWidth > xStringLength( new StringLength ); - USHORT nPickItemId = START_ITEMID_PICKLIST; - int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); + USHORT nPickItemId = START_ITEMID_PICKLIST; + int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); aNewPickVector.reserve(nPickListMenuItems); for ( int i = 0; i < nPickListMenuItems; i++ ) @@ -669,15 +669,15 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) if ( xMenuItemDispatch.is() ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; - pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; + pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; } } { ResetableGuard aGuard( m_aLock ); - int nRemoveItemCount = 0; - int nItemCount = pMenu->GetItemCount(); + int nRemoveItemCount = 0; + int nItemCount = pMenu->GetItemCount(); if ( nItemCount > 0 ) { @@ -730,10 +730,10 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) } // Abbreviate URL - rtl::OUString aURLString( aNewPickVector.at( i )->aMenuItemURL ); - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; - INetURLObject aURL( aURLString ); + rtl::OUString aURLString( aNewPickVector.at( i )->aMenuItemURL ); + rtl::OUString aTipHelpText; + rtl::OUString aMenuTitle; + INetURLObject aURL( aURLString ); if ( aURL.GetProtocol() == INET_PROT_FILE ) { @@ -741,8 +741,8 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) // path and abbreviate it with a special function: String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + ::rtl::OUString aSystemPath( aFileSystemPath ); + ::rtl::OUString aCompactedSystemPath; aTipHelpText = aSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); @@ -754,7 +754,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) else { // Use INetURLObject to abbreviate all other URLs - String aShortURL; + String aShortURL; aShortURL = aURL.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); aMenuTitle += aShortURL; aTipHelpText = aURLString; @@ -779,8 +779,8 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe // #110897# Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); - USHORT nActiveItemId = 0; - USHORT nItemId = START_ITEMID_WINDOWLIST; + USHORT nActiveItemId = 0; + USHORT nItemId = START_ITEMID_WINDOWLIST; if ( xDesktop.is() ) { @@ -812,7 +812,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe { ResetableGuard aGuard( _rMutex ); - int nItemCount = pMenu->GetItemCount(); + int nItemCount = pMenu->GetItemCount(); if ( nItemCount > 0 ) { @@ -891,9 +891,9 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( pMenu == m_pVCLMenu ) { // set/unset hiding disabled menu entries - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_uInt16 nFlag = pMenu->GetMenuFlags(); if ( bDontHide ) @@ -929,8 +929,8 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages ) { // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; - m_bShowMenuImages = bShowMenuImages; + m_bWasHiContrast = bIsHiContrast; + m_bShowMenuImages = bShowMenuImages; FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); } @@ -981,7 +981,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( xMenuItemDispatch.is() ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; - pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; + pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; xMenuItemDispatch->addStatusListener( SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); } else @@ -1008,9 +1008,9 @@ IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu ) IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { - URL aTargetURL; - Sequence<PropertyValue> aArgs; - REFERENCE< XDISPATCH > xDispatch; + URL aTargetURL; + Sequence<PropertyValue> aArgs; + REFERENCE< XDISPATCH > xDispatch; { ResetableGuard aGuard( m_aLock ); @@ -1026,7 +1026,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) // #110897# // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( - // DESKTOP_SERVICE ), UNO_QUERY ); + // DESKTOP_SERVICE ), UNO_QUERY ); Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); if ( xDesktop.is() ) @@ -1129,7 +1129,7 @@ USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu, } void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages) { - AddonsOptions aAddonOptions; + AddonsOptions aAddonOptions; for ( USHORT nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ ) { @@ -1144,7 +1144,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B if ( bTmpShowMenuImages ) { - sal_Bool bImageSet = sal_False; + sal_Bool bImageSet = sal_False; ::rtl::OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/classes/propertysethelper.cxx index 7f05c15c1d38..2e41106a9ceb 100644 --- a/framework/source/classes/propertysethelper.cxx +++ b/framework/source/classes/propertysethelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes #include <classes/propertysethelper.hxx> #include <threadhelp/transactionguard.hxx> @@ -37,13 +37,13 @@ #include <threadhelp/writeguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx index 82fded63fc51..266100ce4f43 100644 --- a/framework/source/classes/protocolhandlercache.cxx +++ b/framework/source/classes/protocolhandlercache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ */ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/protocolhandlercache.hxx> @@ -45,18 +45,18 @@ #include <threadhelp/lockhelper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <tools/wldcrd.hxx> #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -234,7 +234,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) HandlerHash* pOldHandler = m_pHandler; PatternHash* pOldPattern = m_pPattern; - + m_pHandler = pHandler; m_pPattern = pPattern; @@ -242,7 +242,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) pOldPattern->free(); delete pOldHandler; delete pOldPattern; - + aWriteLock.unlock(); // <- SAFE } @@ -343,7 +343,7 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lProp { HandlerHash* pHandler = new HandlerHash; PatternHash* pPattern = new PatternHash; - + read(&pHandler, &pPattern); if (m_pCache) m_pCache->takeOver(pHandler, pPattern); diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 5c0f7d087ab7..2f8e1bdf2f16 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -159,14 +159,14 @@ String STR_STATUSBAR_LOGOTEXT #define LICENSE_COL_4 (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - PD_WIDTH) #define LICENSE_WIDTH (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - LICENSE_ROW_1) -#define COL3_WIDTH (LICENSE_COL_4 - LICENSE_COL_3) +#define COL3_WIDTH (LICENSE_COL_4 - LICENSE_COL_3) ModalDialog DLG_LICENSE { HelpId = HID_LICENSEDIALOG; - Moveable = TRUE ; - Closeable = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -293,7 +293,7 @@ String STR_FULL_DISC_MSG String STR_RESTORE_TOOLBARS { - Text [ en-US ] = "~Reset" ; + Text [ en-US ] = "~Reset" ; }; String STR_CORRUPT_UICFG_SHARE @@ -324,31 +324,31 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES }; String STR_LANGSTATUS_NONE { - Text [ en-US ] = "None (Do not check spelling)" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "None (Do not check spelling)" ; + Text [ x-comment ] = " "; }; String STR_RESET_TO_DEFAULT_LANGUAGE { - Text [ en-US ] = "Reset to Default Language" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Reset to Default Language" ; + Text [ x-comment ] = " "; }; String STR_LANGSTATUS_MORE { - Text [ en-US ] = "More..." ; - Text [ x-comment ] = " "; + Text [ en-US ] = "More..." ; + Text [ x-comment ] = " "; }; String STR_SET_LANGUAGE_FOR_SELECTION { - Text [ en-US ] = "Set Language for Selection" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Set Language for Selection" ; + Text [ x-comment ] = " "; }; String STR_SET_LANGUAGE_FOR_PARAGRAPH { - Text [ en-US ] = "Set Language for Paragraph" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Set Language for Paragraph" ; + Text [ x-comment ] = " "; }; String STR_SET_LANGUAGE_FOR_ALL_TEXT { - Text [ en-US ] = "Set Language for all Text" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Set Language for all Text" ; + Text [ x-comment ] = " "; }; diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/classes/rootactiontriggercontainer.cxx index 9af6a4dfeb6e..c78d398b39a7 100644 --- a/framework/source/classes/rootactiontriggercontainer.cxx +++ b/framework/source/classes/rootactiontriggercontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,9 +59,9 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const Reference< XMultiServiceFactory >& rServiceManager ) : PropertySetContainer( rServiceManager ) - , m_bContainerCreated( sal_False ) - , m_bContainerChanged( sal_False ) - , m_bInContainerCreation( sal_False ) + , m_bContainerCreated( sal_False ) + , m_bContainerChanged( sal_False ) + , m_bInContainerCreation( sal_False ) , m_pMenu( pMenu ) , m_pMenuIdentifier( pMenuIdentifier ) { @@ -101,9 +101,9 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XMultiServiceFactory* , this ), - SAL_STATIC_CAST( XServiceInfo* , this ), - SAL_STATIC_CAST( XUnoTunnel* , this ), + SAL_STATIC_CAST( XMultiServiceFactory* , this ), + SAL_STATIC_CAST( XServiceInfo* , this ), + SAL_STATIC_CAST( XUnoTunnel* , this ), SAL_STATIC_CAST( XTypeProvider* , this ), SAL_STATIC_CAST( XNamed* , this )); @@ -307,12 +307,12 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , - ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , - ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , - ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) , + ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , + ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , + ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , + ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) , ::getCppuType(( const Reference< XUnoTunnel >*)NULL ) , ::getCppuType(( const Reference< XNamed >*)NULL )) ; @@ -363,7 +363,7 @@ void RootActionTriggerContainer::FillContainer() m_pMenu ); m_bInContainerCreation = sal_False; } -::rtl::OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) +::rtl::OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) { ::rtl::OUString sRet; if( m_pMenuIdentifier ) @@ -373,7 +373,7 @@ void RootActionTriggerContainer::FillContainer() void RootActionTriggerContainer::setName( const ::rtl::OUString& ) throw ( RuntimeException) { - throw RuntimeException(); + throw RuntimeException(); } } diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/classes/sfxhelperfunctions.cxx index d6acc6a879b0..c6953b1ea2b9 100644 --- a/framework/source/classes/sfxhelperfunctions.cxx +++ b/framework/source/classes/sfxhelperfunctions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL; static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL; -static pfunc_getRefreshToolbars pRefreshToolbars = NULL; -static pfunc_createDockingWindow pCreateDockingWindow = NULL; +static pfunc_getRefreshToolbars pRefreshToolbars = NULL; +static pfunc_createDockingWindow pCreateDockingWindow = NULL; static pfunc_isDockingWindowVisible pIsDockingWindowVisible = NULL; static pfunc_activateToolPanel pActivateToolPanel = NULL; @@ -64,7 +64,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pToolBoxControllerCreator; } - + if ( pFactory ) return (*pFactory)( rFrame, pToolbox, nID, aCommandURL ); else @@ -86,7 +86,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pStatusBarControllerCreator; } - + if ( pFactory ) return (*pFactory)( rFrame, pStatusBar, nID, aCommandURL ); else @@ -109,7 +109,7 @@ void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::sta ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pCallback = pRefreshToolbars; } - + if ( pCallback ) (*pCallback)( rFrame ); } @@ -130,7 +130,7 @@ void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pCreateDockingWindow; } - + if ( pFactory ) (*pFactory)( rFrame, rResourceURL ); } @@ -151,7 +151,7 @@ bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< :: ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pCall = pIsDockingWindowVisible; } - + if ( pIsDockingWindowVisible ) return (*pIsDockingWindowVisible)( rFrame, rResourceURL ); else diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index cdf19a25a832..162c10e5cfa0 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/taskcreator.hxx> #include "services/taskcreatorsrv.hxx" @@ -38,37 +38,37 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/configurationhelper.hxx> #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-****************************************************************************************************//** @@ -140,30 +140,30 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl:: if ( ! xCreator.is()) xCreator = css::uno::Reference< css::lang::XSingleServiceFactory >( xSMGR->createInstance(IMPLEMENTATIONNAME_FWK_TASKCREATOR), css::uno::UNO_QUERY_THROW); - + css::uno::Sequence< css::uno::Any > lArgs(5); css::beans::NamedValue aArg ; - + aArg.Name = TaskCreatorService::ARGUMENT_PARENTFRAME; aArg.Value <<= css::uno::Reference< css::frame::XFrame >(xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); lArgs[0] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_CREATETOPWINDOW; aArg.Value <<= sal_True; lArgs[1] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_MAKEVISIBLE; aArg.Value <<= bVisible; lArgs[2] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE; aArg.Value <<= sal_True; lArgs[3] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_FRAMENAME; aArg.Value <<= sName; lArgs[4] <<= aArg; - + css::uno::Reference< css::frame::XFrame > xTask(xCreator->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); return xTask; } diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx index 75f77c626195..5468e2fe721b 100644 --- a/framework/source/constant/containerquery.cxx +++ b/framework/source/constant/containerquery.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx index 22565cc65219..239b365f565b 100644 --- a/framework/source/constant/contenthandler.cxx +++ b/framework/source/constant/contenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx index b42c1b082af2..bfa125aa04cb 100644 --- a/framework/source/constant/frameloader.cxx +++ b/framework/source/constant/frameloader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 8bec3e8c8d46..ee84de9d7dd4 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -632,7 +632,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( - (pWindow ) && + (pWindow ) && (pWindow->IsSystemWindow()) ) return xTarget; diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 5f7cd37076f7..e8447c04c3c7 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/dispatchinformationprovider.hxx> #include <dispatch/closedispatcher.hxx> @@ -39,30 +39,30 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/CommandGroup.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/sequenceasvector.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ - -namespace css = ::com::sun::star; + +namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ DEFINE_XINTERFACE_1(DispatchInformationProvider , OWeakObject , DIRECT_INTERFACE(css::frame::XDispatchInformationProvider)) - + //_________________________________________________________________________________________________________________ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame) @@ -84,9 +84,9 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider(); sal_Int32 c1 = lProvider.getLength(); sal_Int32 i1 = 0; - + ::comphelper::SequenceAsVector< sal_Int16 > lGroups; - + for (i1=0; i1<c1; ++i1) { // ignore controller, which doesnt implement the right interface @@ -105,7 +105,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport lGroups.push_back(rGroup); } } - + return lGroups.getAsConstList(); } @@ -147,7 +147,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati c1 = (sal_Int32)lInfos.size(); i1 = 0; - + css::uno::Sequence< css::frame::DispatchInformation > lReturn(c1); BaseHash< css::frame::DispatchInformation >::const_iterator pStepp ; for ( pStepp = lInfos.begin() ; @@ -168,23 +168,23 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE ---------------------------------- - + if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - + CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString::createFromAscii("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xController (xFrame->getController() , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher(xSMGR->createInstance(IMPLEMENTATIONNAME_APPDISPATCHPROVIDER), css::uno::UNO_QUERY); - + css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider(3); - lProvider[0] = xController ; + lProvider[0] = xController ; lProvider[1] = xCloseDispatch; lProvider[2] = xAppDispatcher; - return lProvider; + return lProvider; } } // namespace framework diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index e97ada73c23f..d28839f1d440 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdio.h> @@ -52,7 +52,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/uno/Exception.hpp> @@ -61,7 +61,7 @@ #include <com/sun/star/lang/XInitialization.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <osl/diagnose.h> #include <rtl/string.h> @@ -69,25 +69,25 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_2( DispatchProvider , OWeakObject , @@ -120,7 +120,7 @@ DEFINE_XTYPEPROVIDER_2( DispatchProvider , */ DispatchProvider::DispatchProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const css::uno::Reference< css::frame::XFrame >& xFrame ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -181,7 +181,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis xDispatcher = implts_queryDesktopDispatch(xOwner, aURL, sTargetFrameName, nSearchFlags); else xDispatcher = implts_queryFrameDispatch(xOwner, aURL, sTargetFrameName, nSearchFlags); - + return xDispatcher; } @@ -283,7 +283,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt { if (implts_isLoadableContent(aURL)) xDispatcher = implts_getOrCreateDispatchHelper( E_DEFAULTDISPATCHER, xDesktop ); - + if (lcl_isStartModuleDispatch(aURL)) xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop ); } @@ -482,7 +482,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); // In case the frame is not a top one, is not based on system window and has a parent, - // the parent frame should to be queried for the correct dispatcher. + // the parent frame should to be queried for the correct dispatcher. // See i93473 if ( !WindowHelper::isTopWindow(xFrame->getContainerWindow()) && @@ -759,7 +759,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY ); } break; - + case E_STARTMODULEDISPATCHER : { StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( xFactory, xOwner, sTarget ); diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx index 3ae47562daea..efc373338cf8 100644 --- a/framework/source/dispatch/helpagentdispatcher.cxx +++ b/framework/source/dispatch/helpagentdispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,12 +60,12 @@ DEFINE_XTYPEPROVIDER_2(HelpAgentDispatcher , //-------------------------------------------------------------------- HelpAgentDispatcher::HelpAgentDispatcher( const css::uno::Reference< css::frame::XFrame >& xParentFrame) - : ThreadHelpBase (&Application::GetSolarMutex()) - , m_sCurrentURL ( ) - , m_xContainerWindow( ) - , m_xAgentWindow ( ) - , m_aTimer ( ) - , m_xSelfHold ( ) + : ThreadHelpBase (&Application::GetSolarMutex()) + , m_sCurrentURL ( ) + , m_xContainerWindow( ) + , m_xAgentWindow ( ) + , m_aTimer ( ) + , m_xSelfHold ( ) { // It's required that this class has to be contructed with a valid frame. // And "valid" means: the frame must already bound to a valid container window. @@ -77,7 +77,7 @@ HelpAgentDispatcher::~HelpAgentDispatcher() { implts_stopTimer(); implts_ignoreCurrentURL(); - + // Needed ... because it was create as "new VCLWindow()" ! Such windows must be disposed explicitly. css::uno::Reference< css::lang::XComponent > xAgentWindow(m_xAgentWindow, css::uno::UNO_QUERY); if (xAgentWindow.is()) @@ -85,7 +85,7 @@ HelpAgentDispatcher::~HelpAgentDispatcher() } //-------------------------------------------------------------------- -void SAL_CALL HelpAgentDispatcher::dispatch(const css::util::URL& aURL , +void SAL_CALL HelpAgentDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >&) throw(css::uno::RuntimeException) { @@ -98,13 +98,13 @@ void SAL_CALL HelpAgentDispatcher::dispatch(const css::util::URL& aUR // The timer will add the old URL to the list of ignorable URLs. // So m_sCurrentURL must be set AFTER the timer was stopped !!! implts_stopTimer(); - + // SAFE -> WriteGuard aWriteLock(m_aLock); m_sCurrentURL = aURL.Complete; aWriteLock.unlock(); // <- SAFE - + // start the expiration timer for the new URL implts_startTimer(); @@ -162,24 +162,24 @@ void SAL_CALL HelpAgentDispatcher::disposing(const css::lang::EventObject& aEven { // SAFE -> WriteGuard aWriteLock(m_aLock); - + // Already disposed ?! if (! m_xContainerWindow.is()) return; // Wrong broadcaster ?! if (aEvent.Source != m_xContainerWindow) return; - + css::uno::Reference< css::uno::XInterface > xSelfHoldUntilMethodEnds(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY_THROW); m_xSelfHold.clear(); - + aWriteLock.unlock(); // <- SAFE - + implts_stopTimer(); implts_hideAgentWindow(); implts_ignoreCurrentURL(); - + // SAFE -> aWriteLock.lock(); m_xContainerWindow.clear(); @@ -187,7 +187,7 @@ void SAL_CALL HelpAgentDispatcher::disposing(const css::lang::EventObject& aEven m_xAgentWindow.clear(); aWriteLock.unlock(); // <- SAFE - + // Needed ... because it was create as "new VCLWindow()" ! Such windows must be disposed explicitly. if (xAgentWindow.is()) xAgentWindow->dispose(); @@ -214,13 +214,13 @@ void HelpAgentDispatcher::implts_acceptCurrentURL() { // SAFE -> WriteGuard aWriteLock(m_aLock); - + ::rtl::OUString sAcceptedURL = m_sCurrentURL; m_sCurrentURL = ::rtl::OUString(); - + aWriteLock.unlock(); // <- SAFE - + // We must make sure that this URL isnt marked as ignored by the user. // Otherwhise the user wont see the corresponding help content in the future. SvtHelpOptions().resetAgentIgnoreURLCounter(sAcceptedURL); @@ -241,13 +241,13 @@ void HelpAgentDispatcher::implts_ignoreCurrentURL() { // SAFE -> WriteGuard aWriteLock(m_aLock); - + ::rtl::OUString sIgnoredURL = m_sCurrentURL; m_sCurrentURL = ::rtl::OUString(); - + aWriteLock.unlock(); // <- SAFE - + if (sIgnoredURL.getLength()) SvtHelpOptions().decAgentIgnoreURLCounter(sIgnoredURL); } @@ -260,7 +260,7 @@ void HelpAgentDispatcher::implts_stopTimer() m_xSelfHold.clear(); aWriteLock.unlock(); // <- SAFE - + // SOLAR SAFE -> // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. @@ -285,7 +285,7 @@ void HelpAgentDispatcher::implts_startTimer() return; } // <- SOLAR SAFE - + // SAFE -> // Timer uses pointer to this help agent dispatcher ... // But normaly we are ref counted. So we must make sure that this @@ -294,9 +294,9 @@ void HelpAgentDispatcher::implts_startTimer() m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY_THROW); aWriteLock.unlock(); // <- SAFE - + sal_Int32 nTime = SvtHelpOptions().GetHelpAgentTimeoutPeriod(); - + // SOLAR SAFE -> // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. @@ -323,7 +323,7 @@ IMPL_LINK(HelpAgentDispatcher, implts_timerExpired, void*,) implts_hideAgentWindow(); implts_ignoreCurrentURL(); - + return 0; } @@ -335,12 +335,12 @@ void HelpAgentDispatcher::implts_showAgentWindow() css::uno::Reference< css::awt::XWindow2 > xContainerWindow(m_xContainerWindow, css::uno::UNO_QUERY_THROW); aReadLock.unlock(); // <- SAFE - + css::uno::Reference< css::awt::XWindow > xAgentWindow = implts_ensureAgentWindow(); - + if ( - (xContainerWindow.is() ) && - (xAgentWindow.is() ) && + (xContainerWindow.is() ) && + (xAgentWindow.is() ) && (xContainerWindow->isVisible()) ) { @@ -366,17 +366,17 @@ void HelpAgentDispatcher::implts_positionAgentWindow() css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow; aReadLock.unlock(); // <- SAFE - + css::uno::Reference< css::awt::XWindow > xAgentWindow = implts_ensureAgentWindow(); if ( (! xContainerWindow.is()) || (! xAgentWindow.is() ) ) return; - + ::svt::HelpAgentWindow* pAgentWindow = (::svt::HelpAgentWindow*)VCLUnoHelper::GetWindow(xAgentWindow); - const css::awt::Rectangle aContainerSize = xContainerWindow->getPosSize(); - const Size aAgentSize = pAgentWindow->getPreferredSizePixel(); + const css::awt::Rectangle aContainerSize = xContainerWindow->getPosSize(); + const Size aAgentSize = pAgentWindow->getPreferredSizePixel(); sal_Int32 nW = aAgentSize.Width() ; sal_Int32 nH = aAgentSize.Height(); @@ -403,28 +403,28 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow; aReadLock.unlock(); // <- SAFE - + if (!xContainerWindow.is()) return css::uno::Reference< css::awt::XWindow >(); - + ::svt::HelpAgentWindow* pAgentWindow = 0; // SOLAR SAFE -> { ::vos::OGuard aSolarLock(Application::GetSolarMutex()); // create the agent window - Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); - pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); + Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); + pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); pAgentWindow->setCallback(this); } // <- SOLAR SAFE - + // SAFE -> WriteGuard aWriteLock(m_aLock); m_xAgentWindow = VCLUnoHelper::GetInterface(pAgentWindow); css::uno::Reference< css::awt::XWindow > xAgentWindow = m_xAgentWindow; aWriteLock.unlock(); // <- SAFE - + // add as window listener to the container window so we can maintain the property position of the agent window xContainerWindow->addWindowListener(this); @@ -436,7 +436,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent m_aTimer.SetTimeoutHdl(LINK(this, HelpAgentDispatcher, implts_timerExpired)); } // <- SOLAR SAFE - + return xAgentWindow; } diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/dispatch/interaction.cxx index 9cca0bb922cf..d1d14740956b 100644 --- a/framework/source/dispatch/interaction.cxx +++ b/framework/source/dispatch/interaction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/interaction.hxx> #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //--------------------------------------------------------------------------------------------------------- @@ -93,7 +93,7 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) ::rtl::OUString temp; css::uno::Reference< css::uno::XInterface > temp2; css::document::NoSuchFilterRequest aFilterRequest( temp , - temp2 , + temp2 , sURL ); m_aRequest <<= aFilterRequest; diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 2688aaf0ef93..17a29902466f 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ #include "precompiled_framework.hxx" //_______________________________________________ -// my own includes +// my own includes #ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> #endif //_______________________________________________ -// interface includes +// interface includes #include <com/sun/star/frame/XInterceptorInfo.hpp> //_______________________________________________ -// includes of other projects +// includes of other projects #include <vcl/svapp.hxx> //_______________________________________________ -// namespace +// namespace namespace framework{ //_______________________________________________ -// non exported const +// non exported const sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True; //_______________________________________________ -// non exported definitions +// non exported definitions //_______________________________________________ -// declarations +// declarations /*----------------------------------------------------------------------------- 31.03.2003 09:02 diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 51787d19204c..2791ee9402a9 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,12 +169,12 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, m_aLoader.startLoading(); m_aLoader.waitWhileLoading(); // wait for ever! xComponent = m_aLoader.getTargetComponent(); - + // TODO thinking about asynchronous operations and listener support } catch(const LoadEnvException&) { xComponent.clear(); } - + if (xListener.is()) { if (xComponent.is()) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 4064179e587e..d8aa310d6351 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/mailtodispatcher.hxx> #include <threadhelp/readguard.hxx> @@ -37,37 +37,37 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ #define PROTOCOL_VALUE "mailto:" #define PROTOCOL_LENGTH 7 //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ @@ -115,7 +115,7 @@ DEFINE_INIT_SERVICE(MailToDispatcher, @modified 30.04.2002 14:10, as96863 */ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 1688a8be77a3..718830545db2 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/menudispatcher.hxx> #include <general.h> @@ -38,7 +38,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/awt/XToolkit.hpp> @@ -63,50 +63,50 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <ucbhelper/content.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ using namespace ::com::sun::star ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::util ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::vos ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::util ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ const USHORT SLOTID_MDIWINDOWLIST = 5610; //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** MenuDispatcher::MenuDispatcher( const uno::Reference< XMultiServiceFactory >& xFactory , - const uno::Reference< XFrame >& xOwner ) - // Init baseclasses first + const uno::Reference< XFrame >& xOwner ) + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -126,7 +126,7 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XMultiServiceFactory > } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** MenuDispatcher::~MenuDispatcher() { @@ -136,37 +136,37 @@ MenuDispatcher::~MenuDispatcher() } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_4 ( MenuDispatcher , - OWeakObject , - DIRECT_INTERFACE( XTypeProvider ), - DIRECT_INTERFACE( XDispatch ), - DIRECT_INTERFACE( XEventListener ), - DERIVED_INTERFACE( XFrameActionListener, XEventListener ) + OWeakObject , + DIRECT_INTERFACE( XTypeProvider ), + DIRECT_INTERFACE( XDispatch ), + DIRECT_INTERFACE( XEventListener ), + DERIVED_INTERFACE( XFrameActionListener, XEventListener ) ) DEFINE_XTYPEPROVIDER_4 ( MenuDispatcher , - XTypeProvider , - XDispatch , - XEventListener , + XTypeProvider , + XDispatch , + XEventListener , XFrameActionListener ) //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , - const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -178,10 +178,10 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -193,7 +193,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X } //***************************************************************************************************************** -// XFrameActionListener +// XFrameActionListener //***************************************************************************************************************** void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) @@ -232,7 +232,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro } //***************************************************************************************************************** -// XEventListener +// XEventListener //***************************************************************************************************************** void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) { @@ -271,7 +271,7 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce } //***************************************************************************************************************** -// private method +// private method // // //***************************************************************************************************************** @@ -293,7 +293,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce } //***************************************************************************************************************** -// private method +// private method // // //***************************************************************************************************************** @@ -341,8 +341,8 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR { OUString aNoContext; - uno::Reference< XModel > xModel; - uno::Reference< XController > xController( xFrame->getController(), UNO_QUERY ); + uno::Reference< XModel > xModel; + uno::Reference< XController > xController( xFrame->getController(), UNO_QUERY ); if ( xController.is() ) xModel = uno::Reference< XModel >( xController->getModel(), UNO_QUERY ); @@ -406,7 +406,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -423,16 +423,16 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) //***************************************************************************************************************** sal_Bool MenuDispatcher::impldbg_checkParameter_MenuDispatcher( const uno::Reference< XMultiServiceFactory >& xFactory , - const uno::Reference< XFrame >& xOwner ) + const uno::Reference< XFrame >& xOwner ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFactory == NULL ) || - ( &xOwner == NULL ) || - ( xFactory.is() == sal_False ) || - ( xOwner.is() == sal_False ) + if ( + ( &xFactory == NULL ) || + ( &xOwner == NULL ) || + ( xFactory.is() == sal_False ) || + ( xOwner.is() == sal_False ) ) { bOK = sal_False ; @@ -445,15 +445,15 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_MenuDispatcher( const uno::R // We need a valid URL. What is meaning with "register for nothing"?! // xControl must correct to - nobody can advised otherwise! sal_Bool MenuDispatcher::impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xControl == NULL ) || - ( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) + if ( + ( &xControl == NULL ) || + ( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { bOK = sal_False ; @@ -466,15 +466,15 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_addStatusListener( const uno:: // The same goes for these case! We have added valid listener for correct URL only. // We can't remove invalid listener for nothing! sal_Bool MenuDispatcher::impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xControl == NULL ) || - ( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) + if ( + ( &xControl == NULL ) || + ( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { bOK = sal_False ; @@ -483,6 +483,6 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_removeStatusListener( const u return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 0a46de752a9f..54228db4b670 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_DISPATCH_OXT_HANDLER_HXX_ @@ -60,7 +60,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/io/XInputStream.hpp> @@ -68,7 +68,7 @@ #include <com/sun/star/task/XJobExecutor.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ @@ -80,23 +80,23 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ #define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** @@ -143,7 +143,7 @@ DEFINE_INIT_SERVICE ( Oxt_Handler, @threadsafe yes *//*-*************************************************************************************************************/ Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase ( ) , ::cppu::OWeakObject ( ) // Init member @@ -207,7 +207,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, rtl::OUString sServiceName = UNISTRING( "com.sun.star.deployment.ui.PackageManagerDialog" ); css::uno::Sequence< css::uno::Any > lParams(1); lParams[0] <<= aURL.Main; - + css::uno::Reference< css::uno::XInterface > xService; xService = m_xFactory->createInstanceWithArguments( sServiceName, lParams ); diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index d9ef9ed12dbf..834d11017ec8 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ //#include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/popupmenudispatcher.hxx> @@ -40,7 +40,7 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/awt/XToolkit.hpp> @@ -54,7 +54,7 @@ #include <com/sun/star/container/XEnumeration.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <ucbhelper/content.hxx> @@ -63,44 +63,44 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::util ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::vos ; +using namespace ::com::sun::star ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::util ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ const char* PROTOCOL_VALUE = "vnd.sun.star.popup:"; const sal_Int32 PROTOCOL_LENGTH = 19; //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** -PopupMenuDispatcher::PopupMenuDispatcher( +PopupMenuDispatcher::PopupMenuDispatcher( const uno::Reference< XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -112,7 +112,7 @@ PopupMenuDispatcher::PopupMenuDispatcher( } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** PopupMenuDispatcher::~PopupMenuDispatcher() { @@ -122,25 +122,25 @@ PopupMenuDispatcher::~PopupMenuDispatcher() } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_7 ( PopupMenuDispatcher , - ::cppu::OWeakObject , - DIRECT_INTERFACE( XTypeProvider ), + ::cppu::OWeakObject , + DIRECT_INTERFACE( XTypeProvider ), DIRECT_INTERFACE( XServiceInfo ), DIRECT_INTERFACE( XDispatchProvider ), - DIRECT_INTERFACE( XDispatch ), + DIRECT_INTERFACE( XDispatch ), DIRECT_INTERFACE( XEventListener ), DIRECT_INTERFACE( XInitialization ), DERIVED_INTERFACE( XFrameActionListener, XEventListener ) ) DEFINE_XTYPEPROVIDER_7 ( PopupMenuDispatcher , - XTypeProvider , + XTypeProvider , XServiceInfo , XDispatchProvider , - XDispatch , - XEventListener , + XDispatch , + XEventListener , XInitialization , XFrameActionListener ) @@ -161,14 +161,14 @@ DEFINE_INIT_SERVICE(PopupMenuDispatcher, ) //***************************************************************************************************************** -// XInitialization +// XInitialization //***************************************************************************************************************** -void SAL_CALL PopupMenuDispatcher::initialize( - const css::uno::Sequence< css::uno::Any >& lArguments ) +void SAL_CALL PopupMenuDispatcher::initialize( + const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception, css::uno::RuntimeException) { css::uno::Reference< css::frame::XFrame > xFrame; - + /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -180,7 +180,7 @@ throw( css::uno::Exception, css::uno::RuntimeException) m_xWeakFrame = xFrame; m_bActivateListener = sal_True; - uno::Reference< css::frame::XFrameActionListener > xFrameActionListener( + uno::Reference< css::frame::XFrameActionListener > xFrameActionListener( (OWeakObject *)this, css::uno::UNO_QUERY ); xFrame->addFrameActionListener( xFrameActionListener ); } @@ -191,29 +191,29 @@ throw( css::uno::Exception, css::uno::RuntimeException) } //***************************************************************************************************************** -// XDispatchProvider +// XDispatchProvider //***************************************************************************************************************** -css::uno::Reference< css::frame::XDispatch > -SAL_CALL PopupMenuDispatcher::queryDispatch( +css::uno::Reference< css::frame::XDispatch > +SAL_CALL PopupMenuDispatcher::queryDispatch( const css::util::URL& rURL , const ::rtl::OUString& sTarget , - sal_Int32 nFlags ) + sal_Int32 nFlags ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatch; - + if ( rURL.Complete.compareToAscii( PROTOCOL_VALUE, PROTOCOL_LENGTH ) == 0 ) { // --- SAFE --- ResetableGuard aGuard( m_aLock ); impl_RetrievePopupControllerQuery(); impl_CreateUriRefFactory(); - + css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery( m_xPopupCtrlQuery ); css::uno::Reference< css::uri::XUriReferenceFactory > xUriRefFactory( m_xUriRefFactory ); aGuard.unlock(); // --- SAFE --- - + if ( xPopupCtrlQuery.is() ) { try @@ -223,9 +223,9 @@ throw( css::uno::RuntimeException ) sal_Int32 nSchemePart( 0 ); rtl::OUString aBaseURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" )); rtl::OUString aURL( rURL.Complete ); - + nSchemePart = aURL.indexOf( ':' ); - if (( nSchemePart > 0 ) && + if (( nSchemePart > 0 ) && ( aURL.getLength() > ( nSchemePart+1 ))) { nQueryPart = aURL.indexOf( '?', nSchemePart ); @@ -234,13 +234,13 @@ throw( css::uno::RuntimeException ) else if ( nQueryPart == -1 ) aBaseURL += aURL.copy( nSchemePart+1 ); } - + css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider; - + // Find popup menu controller using the base URL xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider; aGuard.unlock(); - + // Ask popup menu dispatch provider for dispatch object if ( xDispatchProvider.is() ) xDispatch = xDispatchProvider->queryDispatch( rURL, sTarget, nFlags ); @@ -257,9 +257,9 @@ throw( css::uno::RuntimeException ) return xDispatch; } -css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL -PopupMenuDispatcher::queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL +PopupMenuDispatcher::queryDispatches( + const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) { sal_Int32 nCount = lDescriptor.getLength(); @@ -275,23 +275,23 @@ throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/ , - const Sequence< PropertyValue >& /*seqProperties*/ ) + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading @@ -302,12 +302,12 @@ throw( RuntimeException ) } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading @@ -318,12 +318,12 @@ throw( RuntimeException ) } //***************************************************************************************************************** -// XFrameActionListener +// XFrameActionListener //***************************************************************************************************************** -void -SAL_CALL PopupMenuDispatcher::frameAction( - const FrameActionEvent& aEvent ) +void +SAL_CALL PopupMenuDispatcher::frameAction( + const FrameActionEvent& aEvent ) throw ( RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -337,9 +337,9 @@ throw ( RuntimeException ) } //***************************************************************************************************************** -// XEventListener +// XEventListener //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) { // Ready for multithreading @@ -372,7 +372,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::frame::XFrame > xFrame( m_xWeakFrame ); - + if ( xFrame.is() ) { css::uno::Reference< css::beans::XPropertySet > xPropSet( xFrame, css::uno::UNO_QUERY ); @@ -388,7 +388,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() rtl::OUString aMenuBar( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )); xMenuBar = xLayoutManager->getElement( aMenuBar ); - m_xPopupCtrlQuery = css::uno::Reference< css::container::XNameAccess >( + m_xPopupCtrlQuery = css::uno::Reference< css::container::XNameAccess >( xMenuBar, css::uno::UNO_QUERY ); } } @@ -408,14 +408,14 @@ void PopupMenuDispatcher::impl_CreateUriRefFactory() { if ( !m_xUriRefFactory.is() ) { - rtl::OUString aUriRefFactoryService( + rtl::OUString aUriRefFactoryService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uri.UriReferenceFactory" )); - + m_xUriRefFactory = css::uno::Reference< css::uri::XUriReferenceFactory >( m_xFactory->createInstance( aUriRefFactoryService ), css::uno::UNO_QUERY); - + } } -} // namespace framework +} // namespace framework diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index e26ade6d7017..0316decd2b89 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/servicehandler.hxx> #include <threadhelp/readguard.hxx> @@ -37,36 +37,36 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ #define PROTOCOL_VALUE "service:" #define PROTOCOL_LENGTH 8 //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ @@ -114,7 +114,7 @@ DEFINE_INIT_SERVICE(ServiceHandler, @modified 02.05.2002 08:16, as96863 */ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -274,7 +274,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con if (!xFactory.is()) return css::uno::Reference< css::uno::XInterface >(); - + // extract service name and may optional given parameters from given URL // and use it to create and start the component ::rtl::OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH); @@ -295,7 +295,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con if (!sServiceName.getLength()) return css::uno::Reference< css::uno::XInterface >(); - + // If a service doesnt support an optional job executor interface - he can't get // any given parameters! // Because we can't know if we must call createInstanceWithArguments() or XJobExecutor::trigger() ... diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 48096762ecba..40def3f98488 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,24 +165,24 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere { if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) return sal_False; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::frame::XFramesSupplier > xDesktop( xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY); - + FrameListAnalyzer aCheck( xDesktop, css::uno::Reference< css::frame::XFrame >(), FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT); - + ::sal_Bool bIsPossible = sal_False; ::sal_Int32 nVisibleFrames = aCheck.m_lOtherVisibleFrames.getLength (); - + if ( ( ! aCheck.m_xBackingComponent.is ()) && ( nVisibleFrames < 1 ) @@ -190,7 +190,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere { bIsPossible = sal_True; } - + return bIsPossible; } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index ce3288edf248..2cdf28380480 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/systemexec.hxx> #include <threadhelp/readguard.hxx> @@ -37,7 +37,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> @@ -45,30 +45,30 @@ #include <com/sun/star/frame/DispatchResultState.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ #define PROTOCOL_VALUE "systemexecute:" #define PROTOCOL_LENGTH 14 //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ @@ -107,7 +107,7 @@ DEFINE_INIT_SERVICE(SystemExec, //_________________________________________________________________________________________________________________ SystemExec::SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 3baeb1ab9c13..789e07b58c52 100755 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) { if ( ! pParam) return 0L; - + const VclWindowEvent* pEvent = (VclWindowEvent*)pParam; if (pEvent->GetId() != VCLEVENT_WINDOW_COMMAND) return 0L; @@ -134,20 +134,20 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) const CommandDialogData* pData = pCommand->GetDialogData(); if ( ! pData) return 0L; - + const int nCommand = pData->GetDialogId(); ::rtl::OUString sCommand; - + switch (nCommand) { case SHOWDIALOG_ID_PREFERENCES : sCommand = WindowCommandDispatch::COMMAND_PREFERENCES; break; - + case SHOWDIALOG_ID_ABOUT : sCommand = WindowCommandDispatch::COMMAND_ABOUTBOX; break; - + default : return 0L; } @@ -170,16 +170,16 @@ void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SYNCHRONIZED - + // check provider ... we know it's weak reference only if ( ! xProvider.is()) return; - + css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW); css::util::URL aCommand; aCommand.Complete = sCommand; xParser->parseStrict(aCommand); - + css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aCommand, SPECIALTARGET_SELF, 0); if (xDispatch.is()) xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >()); diff --git a/framework/source/helper/acceleratorinfo.cxx b/framework/source/helper/acceleratorinfo.cxx index e3b22da2411b..3db17cf1db89 100644 --- a/framework/source/helper/acceleratorinfo.cxx +++ b/framework/source/helper/acceleratorinfo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,12 +33,12 @@ namespace framework { -static pfunc_getCommandURLFromKeyCode _pGetCommandURLFromKeyCode = NULL; -static pfunc_getKeyCodeFromCommandURL _pGetKeyCodeFromCommandURL = NULL; +static pfunc_getCommandURLFromKeyCode _pGetCommandURLFromKeyCode = NULL; +static pfunc_getKeyCodeFromCommandURL _pGetKeyCodeFromCommandURL = NULL; pfunc_getCommandURLFromKeyCode SAL_CALL SetCommandURLFromKeyCode( pfunc_getCommandURLFromKeyCode pNewFunc ) { - pfunc_getCommandURLFromKeyCode pOldFunc = _pGetCommandURLFromKeyCode; + pfunc_getCommandURLFromKeyCode pOldFunc = _pGetCommandURLFromKeyCode; _pGetCommandURLFromKeyCode = pNewFunc; return pOldFunc; @@ -54,7 +54,7 @@ pfunc_getCommandURLFromKeyCode SAL_CALL SetCommandURLFromKeyCode( pfunc_getComma pfunc_getKeyCodeFromCommandURL SAL_CALL SetKeyCodeFromCommandURL( pfunc_getKeyCodeFromCommandURL pNewFunc ) { - pfunc_getKeyCodeFromCommandURL pOldFunc = _pGetKeyCodeFromCommandURL; + pfunc_getKeyCodeFromCommandURL pOldFunc = _pGetKeyCodeFromCommandURL; _pGetKeyCodeFromCommandURL = pNewFunc; return pOldFunc; diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 1102ae57ac4d..b1c4e50dfe00 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta AddonsOptions aAddonOptions; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bHiContrast = rSettings.GetHighContrastMode(); - + OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ ) @@ -193,8 +193,8 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta { // This is an unknown implementation of a XBitmap interface. We have to // use a more time consuming way to build an Image! - Image aImage; - Bitmap aBitmap; + Image aImage; + Bitmap aBitmap; Sequence< sal_Int8 > aDIBSeq; { @@ -213,7 +213,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta } else aImage = Image( aBitmap ); - + if ( !!aImage ) pSubMenu->SetItemImage( nNewItemId, aImage ); } @@ -266,7 +266,7 @@ Reference< XPropertySet > CreateActionTrigger( USHORT nItemId, const Menu* pMenu Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY ); if ( xMultiServiceFactory.is() ) { - xPropSet = Reference< XPropertySet >( xMultiServiceFactory->createInstance( + xPropSet = Reference< XPropertySet >( xMultiServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTrigger" )) ), UNO_QUERY ); @@ -312,7 +312,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY ); if ( xMultiServiceFactory.is() ) { - return Reference< XPropertySet >( xMultiServiceFactory->createInstance( + return Reference< XPropertySet >( xMultiServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTriggerSeparator" )) ), UNO_QUERY ); } @@ -339,8 +339,8 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { - USHORT nItemId = pMenu->GetItemId( nPos ); - MenuItemType nType = pMenu->GetItemType( nPos ); + USHORT nItemId = pMenu->GetItemId( nPos ); + MenuItemType nType = pMenu->GetItemType( nPos ); try { @@ -396,7 +396,7 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu( FillActionTriggerContainerWithMenu( pMenu, xActionTriggerContainer ); } -Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( +Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( // #110897# const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Menu* pMenu, diff --git a/framework/source/helper/configimporter.cxx b/framework/source/helper/configimporter.cxx index a94db6d8dfe7..6f2c402da1e8 100644 --- a/framework/source/helper/configimporter.cxx +++ b/framework/source/helper/configimporter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ using namespace ::com::sun::star; namespace framework { -sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( +sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( const uno::Reference< ui::XUIConfigurationManager >& rContainerFactory, uno::Sequence< uno::Reference< container::XIndexContainer > >& rSeqContainer, const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 91dbe941d279..91cfc451fadd 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,70 +29,70 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/dockingareadefaultacceptor.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** -DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const Reference< XFrame >& xOwner ) - // Init baseclasses first - : ThreadHelpBase ( &Application::GetSolarMutex() ) +DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const Reference< XFrame >& xOwner ) + // Init baseclasses first + : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member - , m_xOwner ( xOwner ) + , m_xOwner ( xOwner ) { } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() { } //***************************************************************************************************************** -// XDockingAreaAcceptor +// XDockingAreaAcceptor //***************************************************************************************************************** css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException) { @@ -114,7 +114,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css // Try to "lock" the frame for access to taskscontainer. Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); aGuard.unlock(); - + if ( xFrame.is() == sal_True ) { Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx index 4e0e312578c3..c4cf5921ee11 100644 --- a/framework/source/helper/imageproducer.cxx +++ b/framework/source/helper/imageproducer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ namespace framework { -static pfunc_getImage _pGetImageFunc = NULL; +static pfunc_getImage _pGetImageFunc = NULL; pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) { - pfunc_getImage pOldFunc = _pGetImageFunc; + pfunc_getImage pOldFunc = _pGetImageFunc; _pGetImageFunc = pNewGetImageFunc; return pOldFunc; diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx index 6fce055238cc..deb5aa023c1b 100644 --- a/framework/source/helper/mischelper.cxx +++ b/framework/source/helper/mischelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,14 +71,14 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues { (void) r; DBG_ASSERT( 0, "failed to get language guessing component" ); - } + } } return m_xLanguageGuesser; } //////////////////////////////////////////////////////////// -::rtl::OUString RetrieveLabelFromCommand( +::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL, const uno::Reference< lang::XMultiServiceFactory >& _xServiceFactory, uno::Reference< container::XNameAccess >& _xUICommandLabels, @@ -148,10 +148,10 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues return aLabel; } - + //////////////////////////////////////////////////////////// -void FillLangItems( std::set< OUString > &rLangItems, +void FillLangItems( std::set< OUString > &rLangItems, const SvtLanguageTable & rLanguageTable, const uno::Reference< frame::XFrame > & rxFrame, const LanguageGuessingHelper & rLangGuessHelper, @@ -233,7 +233,7 @@ void FillLangItems( std::set< OUString > &rLangItems, } } } - + } // namespace framework diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/helper/networkdomain.cxx index d1a74b16e801..fcc966402944 100644 --- a/framework/source/helper/networkdomain.cxx +++ b/framework/source/helper/networkdomain.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace framework #ifdef WNT //_________________________________________________________________________________________________________________ -// Windows +// Windows //_________________________________________________________________________________________________________________ #define UNICODE @@ -47,7 +47,7 @@ namespace framework #endif //_________________________________________________________________________________________________________________ -// Win NT, Win 2000, Win XP +// Win NT, Win 2000, Win XP //_________________________________________________________________________________________________________________ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) @@ -56,37 +56,37 @@ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) } //_________________________________________________________________________________________________________________ -// Win 9x,Win ME +// Win 9x,Win ME //_________________________________________________________________________________________________________________ static DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) { - HKEY hkeyLogon; - HKEY hkeyWorkgroup; - DWORD dwResult = 0; + HKEY hkeyLogon; + HKEY hkeyWorkgroup; + DWORD dwResult = 0; - if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("Network\\Logon"), - 0, KEY_READ, &hkeyLogon ) ) + if ( ERROR_SUCCESS == RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + TEXT("Network\\Logon"), + 0, KEY_READ, &hkeyLogon ) ) { - DWORD dwLogon = 0; - DWORD dwLogonSize = sizeof(dwLogon); + DWORD dwLogon = 0; + DWORD dwLogonSize = sizeof(dwLogon); RegQueryValueEx( hkeyLogon, TEXT("LMLogon"), 0, NULL, (LPBYTE)&dwLogon, &dwLogonSize ); RegCloseKey( hkeyLogon ); if ( dwLogon ) { - HKEY hkeyNetworkProvider; + HKEY hkeyNetworkProvider; - if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), + if ( ERROR_SUCCESS == RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), 0, KEY_READ, &hkeyNetworkProvider ) ) { - DWORD dwBufferSize = nSize; - LONG lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); + DWORD dwBufferSize = nSize; + LONG lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult ) dwResult = dwBufferSize / sizeof(TCHAR); @@ -100,8 +100,8 @@ static DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) TEXT("SYSTEM\\CurrentControlSet\\Services\\VxD\\VNETSUP"), 0, KEY_READ, &hkeyWorkgroup ) ) { - DWORD dwBufferSize = nSize; - LONG lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); + DWORD dwBufferSize = nSize; + LONG lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult ) dwResult = dwBufferSize / sizeof(TCHAR); @@ -115,16 +115,16 @@ static DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) static rtl::OUString GetUserDomain() { - sal_Unicode aBuffer[256]; + sal_Unicode aBuffer[256]; - long nVersion = GetVersion(); - DWORD nResult; + long nVersion = GetVersion(); + DWORD nResult; if ( nVersion < 0 ) nResult = GetUserDomainW_WINDOWS( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) ); else nResult = GetUserDomainW_NT( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) ); - + if ( nResult > 0 ) return rtl::OUString( aBuffer ); else @@ -132,7 +132,7 @@ static rtl::OUString GetUserDomain() } //_________________________________________________________________________________________________________________ -// Windows +// Windows //_________________________________________________________________________________________________________________ rtl::OUString NetworkDomain::GetYPDomainName() @@ -153,13 +153,13 @@ rtl::OUString NetworkDomain::GetNTDomainName() #include <osl/thread.h> //_________________________________________________________________________________________________________________ -// Unix +// Unix //_________________________________________________________________________________________________________________ #if defined( SOLARIS ) //_________________________________________________________________________________________________________________ -// Solaris +// Solaris //_________________________________________________________________________________________________________________ #include <sys/systeminfo.h> @@ -168,44 +168,44 @@ rtl::OUString NetworkDomain::GetNTDomainName() static rtl_uString *getDomainName() { /* Initialize and assume failure */ - rtl_uString *ustrDomainName = NULL; - - char szBuffer[256]; - - long nCopied = sizeof(szBuffer); - char *pBuffer = szBuffer; - long nBufSize; - + rtl_uString *ustrDomainName = NULL; + + char szBuffer[256]; + + long nCopied = sizeof(szBuffer); + char *pBuffer = szBuffer; + long nBufSize; + do { nBufSize = nCopied; - nCopied = sysinfo( SI_SRPC_DOMAIN, pBuffer, nBufSize ); - - /* If nCopied is greater than buffersize we need to allocate + nCopied = sysinfo( SI_SRPC_DOMAIN, pBuffer, nBufSize ); + + /* If nCopied is greater than buffersize we need to allocate a buffer with suitable size */ - + if ( nCopied > nBufSize ) pBuffer = (char *)alloca( nCopied ); - + } while ( nCopied > nBufSize ); - if ( -1 != nCopied ) + if ( -1 != nCopied ) { - rtl_string2UString( + rtl_string2UString( &ustrDomainName, - pBuffer, - nCopied - 1, - osl_getThreadTextEncoding(), + pBuffer, + nCopied - 1, + osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); } - + return ustrDomainName; } #elif defined( LINUX ) /* endif SOLARIS */ //_________________________________________________________________________________________________________________ -// Linux +// Linux //_________________________________________________________________________________________________________________ #include <unistd.h> @@ -214,12 +214,12 @@ static rtl_uString *getDomainName() static rtl_uString *getDomainName() { /* Initialize and assume failure */ - rtl_uString *ustrDomainName = NULL; - - char *pBuffer; - int result; - size_t nBufSize = 0; - + rtl_uString *ustrDomainName = NULL; + + char *pBuffer; + int result; + size_t nBufSize = 0; + do { nBufSize += 256; /* Increase buffer size by steps of 256 bytes */ @@ -229,24 +229,24 @@ static rtl_uString *getDomainName() is set to EINVAL. This only applies to libc. With glibc the name is truncated. */ } while ( -1 == result && EINVAL == errno ); - + if ( 0 == result ) { - rtl_string2UString( + rtl_string2UString( &ustrDomainName, - pBuffer, - strlen( pBuffer ), - osl_getThreadTextEncoding(), + pBuffer, + strlen( pBuffer ), + osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); } - + return ustrDomainName; } -#else /* LINUX */ +#else /* LINUX */ //_________________________________________________________________________________________________________________ -// Other Unix +// Other Unix //_________________________________________________________________________________________________________________ static rtl_uString *getDomainName() @@ -257,12 +257,12 @@ static rtl_uString *getDomainName() #endif //_________________________________________________________________________________________________________________ -// Unix +// Unix //_________________________________________________________________________________________________________________ rtl::OUString NetworkDomain::GetYPDomainName() { - rtl_uString* pResult = getDomainName(); + rtl_uString* pResult = getDomainName(); if ( pResult ) return rtl::OUString( pResult ); else @@ -277,7 +277,7 @@ rtl::OUString NetworkDomain::GetNTDomainName() #else /* UNIX */ //_________________________________________________________________________________________________________________ -// Other operating systems (non-Windows and non-Unix) +// Other operating systems (non-Windows and non-Unix) //_________________________________________________________________________________________________________________ rtl::OUString NetworkDomain::GetYPDomainName() diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index b0baf1bcf81c..ce25ac0796fc 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/ocomponentaccess.hxx> #include <helper/ocomponentenumeration.hxx> @@ -39,46 +39,46 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member , m_xOwner ( xOwner ) @@ -88,14 +88,14 @@ OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner ) } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** OComponentAccess::~OComponentAccess() { } //***************************************************************************************************************** -// XEnumerationAccess +// XEnumerationAccess //***************************************************************************************************************** Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException ) { @@ -125,7 +125,7 @@ Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) { @@ -135,7 +135,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) { @@ -158,10 +158,10 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** -void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesSupplier >& xNode , - Sequence< Reference< XComponent > >& seqComponents ) +void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesSupplier >& xNode , + Sequence< Reference< XComponent > >& seqComponents ) { // If valid node was given ... if( xNode.is() == sal_True ) @@ -173,8 +173,8 @@ void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesS sal_Int32 nComponentCount = seqComponents.getLength(); - const Reference< XFrames > xContainer = xNode->getFrames(); - const Sequence< Reference< XFrame > > seqFrames = xContainer->queryFrames( FrameSearchFlag::CHILDREN ); + const Reference< XFrames > xContainer = xNode->getFrames(); + const Sequence< Reference< XFrame > > seqFrames = xContainer->queryFrames( FrameSearchFlag::CHILDREN ); const sal_Int32 nFrameCount = seqFrames.getLength(); for( sal_Int32 nFrame=0; nFrame<nFrameCount; ++nFrame ) @@ -192,7 +192,7 @@ void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesS } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Reference< XFrame >& xFrame ) const { @@ -225,7 +225,7 @@ Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Referenc } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -246,9 +246,9 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xOwner == NULL ) || - ( xOwner.is() == sal_False ) + if ( + ( &xOwner == NULL ) || + ( xOwner.is() == sal_False ) ) { bOK = sal_False ; @@ -257,6 +257,6 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 912d80c75d05..68237179d70d 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/ocomponentenumeration.hxx> @@ -38,49 +38,49 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XComponent > >& seqComponents ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! + // Init baseclasses first + // Attention: + // Don't change order of initialization! // ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! + // we must garant right initialization and a valid value of this! First initialize + // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member , m_nPosition ( 0 ) // 0 is the first position for a valid list and the right value for an invalid list to! @@ -92,7 +92,7 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XCompon } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** OComponentEnumeration::~OComponentEnumeration() { @@ -101,7 +101,7 @@ OComponentEnumeration::~OComponentEnumeration() } //***************************************************************************************************************** -// XEventListener +// XEventListener //***************************************************************************************************************** void SAL_CALL OComponentEnumeration::disposing( const EventObject& #if OSL_DEBUG_LEVEL > 0 @@ -121,7 +121,7 @@ aEvent } //***************************************************************************************************************** -// XEnumeration +// XEnumeration //***************************************************************************************************************** sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException ) { @@ -136,11 +136,11 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti } //***************************************************************************************************************** -// XEnumeration +// XEnumeration //***************************************************************************************************************** -Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , - WrappedTargetException , - RuntimeException ) +Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , + WrappedTargetException , + RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -163,7 +163,7 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException } //***************************************************************************************************************** -// proteced method +// proteced method //***************************************************************************************************************** void OComponentEnumeration::impl_resetObject() { @@ -183,7 +183,7 @@ void OComponentEnumeration::impl_resetObject() } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -205,7 +205,7 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( + if ( ( &seqComponents == NULL ) ) { @@ -221,9 +221,9 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + if ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ) { bOK = sal_False ; @@ -232,6 +232,6 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 405da6d91a6e..62f4b30de749 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/oframes.hxx> @@ -38,51 +38,51 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::std ; -using namespace ::vos ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; +using namespace ::std ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** -OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , - const Reference< XFrame >& xOwner , - FrameContainer* pFrameContainer ) - // Init baseclasses first +OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , + const Reference< XFrame >& xOwner , + FrameContainer* pFrameContainer ) + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member , m_xFactory ( xFactory ) @@ -96,7 +96,7 @@ OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , } //***************************************************************************************************************** -// (proteced!) destructor +// (proteced!) destructor //***************************************************************************************************************** OFrames::~OFrames() { @@ -105,7 +105,7 @@ OFrames::~OFrames() } //***************************************************************************************************************** -// XFrames +// XFrames //***************************************************************************************************************** void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( RuntimeException ) { @@ -131,7 +131,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim } //***************************************************************************************************************** -// XFrames +// XFrames //***************************************************************************************************************** void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( RuntimeException ) { @@ -158,7 +158,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim } //***************************************************************************************************************** -// XFrames +// XFrames //***************************************************************************************************************** Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException ) { @@ -196,8 +196,8 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch //_____________________________________________________________________________________________________________ // 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 + // ALL = PARENT + SELF + CHILDREN + SIBLINGS + // GLOBAL = ALL + TASKS //_____________________________________________________________________________________________________________ // Add parent to list ... if any exist! @@ -268,7 +268,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch } //***************************************************************************************************************** -// XIndexAccess +// XIndexAccess //***************************************************************************************************************** sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) { @@ -292,11 +292,11 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) } //***************************************************************************************************************** -// XIndexAccess +// XIndexAccess //***************************************************************************************************************** -Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , - WrappedTargetException , - RuntimeException ) +Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , + WrappedTargetException , + RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -324,7 +324,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) { @@ -333,7 +333,7 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) { @@ -359,7 +359,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) } //***************************************************************************************************************** -// proteced method +// proteced method //***************************************************************************************************************** void OFrames::impl_resetObject() { @@ -376,21 +376,21 @@ void OFrames::impl_resetObject() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** -void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestination , - const Sequence< Reference< XFrame > >& seqSource ) +void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestination , + const Sequence< Reference< XFrame > >& seqSource ) { // Get some informations about the sequences. - sal_Int32 nSourceCount = seqSource.getLength(); - sal_Int32 nDestinationCount = seqDestination.getLength(); - const Reference< XFrame >* pSourceAccess = seqSource.getConstArray(); - Reference< XFrame >* pDestinationAccess = seqDestination.getArray(); + sal_Int32 nSourceCount = seqSource.getLength(); + sal_Int32 nDestinationCount = seqDestination.getLength(); + const Reference< XFrame >* pSourceAccess = seqSource.getConstArray(); + Reference< XFrame >* pDestinationAccess = seqDestination.getArray(); // Get memory for result list. - Sequence< Reference< XFrame > > seqResult ( nSourceCount + nDestinationCount ); - Reference< XFrame >* pResultAccess = seqResult.getArray(); - sal_Int32 nResultPosition = 0; + Sequence< Reference< XFrame > > seqResult ( nSourceCount + nDestinationCount ); + Reference< XFrame >* pResultAccess = seqResult.getArray(); + sal_Int32 nResultPosition = 0; // Copy all items from first sequence. for ( sal_Int32 nSourcePosition=0; nSourcePosition<nSourceCount; ++nSourcePosition ) @@ -415,7 +415,7 @@ void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestina } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -434,19 +434,19 @@ void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestina // An instance of this class can only work with valid initialization. // We share the mutex with ouer owner class, need a valid factory to instanciate new services and // use the access to ouer owner for some operations. -sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const Reference< XMultiServiceFactory >& xFactory , - const Reference< XFrame >& xOwner , - FrameContainer* pFrameContainer ) +sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const Reference< XMultiServiceFactory >& xFactory , + const Reference< XFrame >& xOwner , + FrameContainer* pFrameContainer ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFactory == NULL ) || - ( &xOwner == NULL ) || - ( xFactory.is() == sal_False ) || - ( xOwner.is() == sal_False ) || - ( pFrameContainer == NULL ) + if ( + ( &xFactory == NULL ) || + ( &xOwner == NULL ) || + ( xFactory.is() == sal_False ) || + ( xOwner.is() == sal_False ) || + ( pFrameContainer == NULL ) ) { bOK = sal_False ; @@ -463,9 +463,9 @@ sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFra // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFrame == NULL ) || - ( xFrame.is() == sal_False ) + if ( + ( &xFrame == NULL ) || + ( xFrame.is() == sal_False ) ) { bOK = sal_False ; @@ -482,9 +482,9 @@ sal_Bool OFrames::impldbg_checkParameter_remove( const Reference< XFrame >& xFra // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFrame == NULL ) || - ( xFrame.is() == sal_False ) + if ( + ( &xFrame == NULL ) || + ( xFrame.is() == sal_False ) ) { bOK = sal_False ; @@ -501,16 +501,16 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( nSearchFlags != FrameSearchFlag::AUTO ) && - ( !( nSearchFlags & FrameSearchFlag::PARENT ) ) && - ( !( nSearchFlags & FrameSearchFlag::SELF ) ) && - ( !( nSearchFlags & FrameSearchFlag::CHILDREN ) ) && - ( !( nSearchFlags & FrameSearchFlag::CREATE ) ) && - ( !( nSearchFlags & FrameSearchFlag::SIBLINGS ) ) && - ( !( nSearchFlags & FrameSearchFlag::TASKS ) ) && - ( !( nSearchFlags & FrameSearchFlag::ALL ) ) && - ( !( nSearchFlags & FrameSearchFlag::GLOBAL ) ) + if ( + ( nSearchFlags != FrameSearchFlag::AUTO ) && + ( !( nSearchFlags & FrameSearchFlag::PARENT ) ) && + ( !( nSearchFlags & FrameSearchFlag::SELF ) ) && + ( !( nSearchFlags & FrameSearchFlag::CHILDREN ) ) && + ( !( nSearchFlags & FrameSearchFlag::CREATE ) ) && + ( !( nSearchFlags & FrameSearchFlag::SIBLINGS ) ) && + ( !( nSearchFlags & FrameSearchFlag::TASKS ) ) && + ( !( nSearchFlags & FrameSearchFlag::ALL ) ) && + ( !( nSearchFlags & FrameSearchFlag::GLOBAL ) ) ) { bOK = sal_False ; @@ -519,6 +519,6 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 23a638ea4ed1..ee0fceeebc7a 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <pattern/window.hxx> #include <helper/persistentwindowstate.hxx> @@ -39,7 +39,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/configurationhelper.hxx> #include <vcl/window.hxx> @@ -63,12 +63,12 @@ #include <vcl/wrkwin.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// definitions +// definitions //***************************************************************************************************************** // XInterface, XTypeProvider @@ -111,21 +111,21 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u DECLARE_ASCII("Empty argument list!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + lArguments[0] >>= xFrame; if (!xFrame.is()) throw css::lang::IllegalArgumentException( DECLARE_ASCII("No valid frame specified!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); // hold the frame as weak reference(!) so it can die everytimes :-) m_xFrame = xFrame; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + // start listening xFrame->addFrameActionListener(this); } @@ -145,12 +145,12 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv // frame already gone ? We hold it weak only ... if (!xFrame.is()) return; - + // no window -> no position and size available css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow(); if (!xWindow.is()) return; - + // unknown module -> no configuration available! ::rtl::OUString sModuleName = PersistentWindowState::implst_identifyModule(xSMGR, xFrame); if (!sModuleName.getLength()) @@ -172,14 +172,14 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } } break; - + case css::frame::FrameAction_COMPONENT_REATTACHED : { // nothing todo here, because its not allowed to change position and size // of an alredy existing frame! } break; - + case css::frame::FrameAction_COMPONENT_DETACHING : { ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow); @@ -187,7 +187,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } break; default: - break; + break; } } @@ -203,11 +203,11 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) const css::uno::Reference< css::frame::XFrame >& xFrame) { ::rtl::OUString sModuleName; - + css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + try { sModuleName = xModuleManager->identify(xFrame); @@ -216,25 +216,25 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) { throw exRun; } catch(const css::uno::Exception&) { sModuleName = ::rtl::OUString(); } - + return sModuleName; } - + //***************************************************************************************************************** ::rtl::OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const ::rtl::OUString& sModuleName) { ::rtl::OUString sWindowState; - + ::rtl::OUStringBuffer sRelPathBuf(256); sRelPathBuf.appendAscii("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - + ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); - + try { ::comphelper::ConfigurationHelper::readDirectKey(xSMGR, @@ -247,8 +247,8 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) { throw exRun; } catch(const css::uno::Exception&) { sWindowState = ::rtl::OUString(); } - - return sWindowState; + + return sWindowState; } //***************************************************************************************************************** @@ -260,11 +260,11 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere sRelPathBuf.appendAscii("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - + ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); - + try { ::comphelper::ConfigurationHelper::writeDirectKey(xSMGR, @@ -284,12 +284,12 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere ::rtl::OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { ::rtl::OUString sWindowState; - + if (xWindow.is()) { // SOLAR SAFE -> ------------------------ ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if ( @@ -303,14 +303,14 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere ((SystemWindow*)pWindow)->GetWindowState(nMask), RTL_TEXTENCODING_UTF8); } - + aSolarLock.clear(); // <- SOLAR SAFE ------------------------ } - + return sWindowState; } - + //********************************************************************************************************* void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , @@ -324,27 +324,27 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere // SOLAR SAFE -> ------------------------ ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if (!pWindow) return; - + // check for system and work window - its neccessary to guarantee correct pointer cast! - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + sal_Bool bSystemWindow = pWindow->IsSystemWindow(); + sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; SystemWindow* pSystemWindow = (SystemWindow*)pWindow; WorkWindow* pWorkWindow = (WorkWindow* )pWindow; - + // dont save this special state! if (pWorkWindow->IsMinimized()) return; - + pSystemWindow->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8)); - + aSolarLock.clear(); // <- SOLAR SAFE ------------------------ } diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx index 4f8eec9c2f80..0fe750f92fd9 100644 --- a/framework/source/helper/propertysetcontainer.cxx +++ b/framework/source/helper/propertysetcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <vcl/svapp.hxx> -#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" +#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" using namespace rtl; using namespace vos; @@ -47,7 +47,7 @@ namespace framework PropertySetContainer::PropertySetContainer( const Reference< XMultiServiceFactory >& ) : ThreadHelpBase( &Application::GetSolarMutex() ) - , OWeakObject() + , OWeakObject() { } @@ -60,7 +60,7 @@ PropertySetContainer::~PropertySetContainer() // XInterface void SAL_CALL PropertySetContainer::acquire() throw () -{ +{ OWeakObject::acquire(); } @@ -69,26 +69,26 @@ void SAL_CALL PropertySetContainer::release() throw () OWeakObject::release(); } -Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType ) +Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType ) throw ( RuntimeException ) { - Any a = ::cppu::queryInterface( + Any a = ::cppu::queryInterface( rType , SAL_STATIC_CAST( XIndexContainer*, this ), SAL_STATIC_CAST( XIndexReplace*, this ), SAL_STATIC_CAST( XIndexAccess*, this ), SAL_STATIC_CAST( XElementAccess*, this ) ); - + if( a.hasValue() ) { return a; } - + return OWeakObject::queryInterface( rType ); } // XIndexContainer -void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) +void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -98,7 +98,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: if ( nSize >= Index ) { Reference< XPropertySet > aPropertySetElement; - + if ( Element >>= aPropertySetElement ) { if ( nSize == Index ) @@ -112,7 +112,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: } else { - throw IllegalArgumentException( + throw IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), (OWeakObject *)this, 2 ); } @@ -121,7 +121,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } -void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index ) +void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index ) throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -137,20 +137,20 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index ) } // XIndexReplace -void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) +void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if ( (sal_Int32)m_aPropertySetVector.size() > Index ) { Reference< XPropertySet > aPropertySetElement; - + if ( Element >>= aPropertySetElement ) { m_aPropertySetVector[ Index ] = aPropertySetElement; } else { - throw IllegalArgumentException( + throw IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), (OWeakObject *)this, 2 ); } @@ -160,15 +160,15 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com } // XIndexAccess -sal_Int32 SAL_CALL PropertySetContainer::getCount() +sal_Int32 SAL_CALL PropertySetContainer::getCount() throw ( RuntimeException ) { ResetableGuard aGuard( m_aLock ); - + return m_aPropertySetVector.size(); } -Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) +Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -185,11 +185,11 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) } // XElementAccess -sal_Bool SAL_CALL PropertySetContainer::hasElements() +sal_Bool SAL_CALL PropertySetContainer::hasElements() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return !( m_aPropertySetVector.empty() ); } diff --git a/framework/source/helper/shareablemutex.cxx b/framework/source/helper/shareablemutex.cxx index bdc5f131aa62..b173c6c34a4f 100644 --- a/framework/source/helper/shareablemutex.cxx +++ b/framework/source/helper/shareablemutex.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ ShareableMutex::ShareableMutex( const ShareableMutex& rShareableMutex ) if ( pMutexRef ) pMutexRef->acquire(); } - + const ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex ) { if ( rShareableMutex.pMutexRef ) @@ -61,8 +61,8 @@ ShareableMutex::~ShareableMutex() pMutexRef->release(); } -void ShareableMutex::acquire() -{ +void ShareableMutex::acquire() +{ if ( pMutexRef ) pMutexRef->m_oslMutex.acquire(); } diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 9e2c1e794632..f38a84fdb75f 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index ecfe81a03498..4c0738b9fe85 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ namespace framework{ //----------------------------------------------- // definitions -sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling +sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar"); //----------------------------------------------- @@ -519,7 +519,7 @@ void StatusIndicatorFactory::impl_showProgress() // <- SAFE ---------------------------------- css::uno::Reference< css::task::XStatusIndicator > xProgress; - + if (xFrame.is()) { // use frame layouted progress implementation @@ -535,7 +535,7 @@ void StatusIndicatorFactory::impl_showProgress() // CreateElement does nothing if there is already a valid progress. xLayoutManager->createElement( PROGRESS_RESOURCE ); xLayoutManager->showElement( PROGRESS_RESOURCE ); - + css::uno::Reference< css::ui::XUIElement > xProgressBar = xLayoutManager->getElement(PROGRESS_RESOURCE); if (xProgressBar.is()) xProgress = css::uno::Reference< css::task::XStatusIndicator >(xProgressBar->getRealInterface(), css::uno::UNO_QUERY); diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 089cf3061e29..a71c5263455b 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/tagwindowasmodified.hxx> #include <pattern/window.hxx> @@ -39,7 +39,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/frame/FrameAction.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -64,12 +64,12 @@ #include <vcl/wintypes.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// definitions +// definitions //***************************************************************************************************************** // XInterface, XTypeProvider @@ -108,16 +108,16 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno if (lArguments.getLength() > 0) lArguments[0] >>= xFrame; - + if ( ! xFrame.is ()) return; - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_xFrame = xFrame ; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + xFrame->addFrameActionListener(this); impl_update (xFrame); } @@ -137,21 +137,21 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent (aEvent.Source != xModel) ) return; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + ::sal_Bool bModified = xModel->isModified (); - + // SYNCHRONIZED -> ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if ( ! pWindow) return; - - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + + sal_Bool bSystemWindow = pWindow->IsSystemWindow(); + sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; @@ -159,7 +159,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent pWindow->SetExtendedStyle(WB_EXT_DOCMODIFIED); else pWindow->SetExtendedStyle( ! WB_EXT_DOCMODIFIED); - + aSolarGuard.clear(); // <- SYNCHRONIZED } @@ -183,10 +183,10 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven (aEvent.Source != xFrame) ) return; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- - + impl_update (xFrame); } @@ -206,7 +206,7 @@ void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEven m_xFrame = css::uno::Reference< css::frame::XFrame >(); return; } - + css::uno::Reference< css::frame::XModel > xModel(m_xModel.get(), css::uno::UNO_QUERY); if ( (xModel.is () ) && @@ -232,13 +232,13 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF css::uno::Reference< css::frame::XModel > xModel ; if (xController.is ()) xModel = xController->getModel (); - + if ( ( ! xWindow.is ()) || ( ! xModel.is ()) ) return; - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); // Note: frame was set as member outside ! we have to refresh connections @@ -247,7 +247,7 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF m_xModel = xModel ; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::util::XModifyBroadcaster > xModifiable(xModel, css::uno::UNO_QUERY); if (xModifiable.is ()) xModifiable->addModifyListener (this); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index e2250f3faa66..9b6501af4c20 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_ @@ -61,7 +61,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ @@ -101,7 +101,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX @@ -137,18 +137,18 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const static const ::sal_Int32 INVALID_ICON_ID = -1; static const ::sal_Int32 DEFAULT_ICON_ID = 0; //_________________________________________________________________________________________________________________ -// definitions +// definitions //***************************************************************************************************************** // XInterface, XTypeProvider @@ -193,21 +193,21 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any DECLARE_ASCII("Empty argument list!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + lArguments[0] >>= xFrame; if (!xFrame.is()) throw css::lang::IllegalArgumentException( DECLARE_ASCII("No valid frame specified!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + // SYNCHRONIZED -> WriteGuard aWriteLock(m_aLock); // hold the frame as weak reference(!) so it can die everytimes :-) m_xFrame = xFrame; aWriteLock.unlock(); // <- SYNCHRONIZED - + // start listening xFrame->addFrameActionListener(this); @@ -258,23 +258,23 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SYNCHRONIZED - + try { css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + css::uno::Reference< css::container::XNameAccess > xConfig( xModuleManager, css::uno::UNO_QUERY_THROW); - + rInfo.sID = xModuleManager->identify(xFrame); ::comphelper::SequenceAsHashMap lProps = xConfig->getByName (rInfo.sID); - + rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); rInfo.nIcon = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ICON , INVALID_ICON_ID ); - + // Note: If we could retrieve a module id ... everything is OK. // UIName and Icon ID are optional values ! ::sal_Bool bSuccess = (rInfo.sID.getLength () > 0); @@ -282,7 +282,7 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) } catch(const css::uno::Exception&) {} - + return sal_False; } @@ -299,7 +299,7 @@ void TitleBarUpdate::impl_forceUpdate() // frame already gone ? We hold it weak only ... if ( ! xFrame.is()) return; - + // no window -> no chance to set/update title and icon css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow(); if ( ! xWindow.is()) @@ -320,7 +320,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra ( ! xWindow.is() ) ) return; - + // a) set default value to an invalid one. So we can start further searches for right icon id, if // first steps failed! sal_Int32 nIcon = INVALID_ICON_ID; @@ -355,10 +355,10 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra // e) set icon on container window now // Don't forget SolarMutex! We use vcl directly :-( // Check window pointer for right WorkWindow class too!!! - + // VCL SYNCHRONIZED -> ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() ); - + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); if ( ( pWindow ) && @@ -367,7 +367,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra { WorkWindow* pWorkWindow = (WorkWindow*)pWindow; pWorkWindow->SetIcon( (sal_uInt16)nIcon ); - + css::uno::Reference< css::frame::XModel > xModel = xController->getModel(); rtl::OUString aURL; if( xModel.is() ) @@ -386,7 +386,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow (); if ( ! xWindow.is() ) return; - + css::uno::Reference< css::frame::XTitle > xTitle(xFrame, css::uno::UNO_QUERY); if ( ! xTitle.is() ) return; @@ -395,7 +395,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr // VCL SYNCHRONIZED -> ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() ); - + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); if ( ( pWindow ) && diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx index e95617064bab..1ca884c27ca7 100644 --- a/framework/source/helper/titlehelper.cxx +++ b/framework/source/helper/titlehelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO impl_startListeningForModel (xModel); return; } - + css::uno::Reference< css::frame::XController > xController(xOwner, css::uno::UNO_QUERY); if (xController.is ()) { @@ -126,14 +126,14 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO // Even an empty string will be accepted as valid title ! if (m_bExternalTitle) return m_sTitle; - + // Title seams to be up-to-date. Return it directly. if (m_sTitle.getLength() > 0) return m_sTitle; - + // Title seams to be unused till now ... do bootstraping impl_updateTitle (); - + return m_sTitle; // <- SYNCHRONIZED @@ -173,7 +173,7 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css // container is threadsafe by himself 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) @@ -196,7 +196,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv if (aEvent.Source != xSubTitle) return; - + impl_updateTitle (); } @@ -207,7 +207,7 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) if ( ! aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnSaveAsDone") && ! aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged")) return; - + // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -218,12 +218,12 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) if ( aEvent.Source != xOwner || - (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is()) + (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is()) ) { return; } - + impl_updateTitle (); } @@ -305,7 +305,7 @@ void TitleHelper::impl_sendTitleChangedEvent () ::cppu::OInterfaceContainerHelper* pContainer = m_aListener.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTitleChangeListener >*) NULL ) ); if ( ! pContainer) return; - + ::cppu::OInterfaceIteratorHelper pIt( *pContainer ); while ( pIt.hasMoreElements() ) { @@ -325,7 +325,7 @@ void TitleHelper::impl_updateTitle () { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + css::uno::Reference< css::frame::XModel > xModel (m_xOwner.get(), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XController > xController(m_xOwner.get(), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XFrame > xFrame (m_xOwner.get(), css::uno::UNO_QUERY); @@ -338,7 +338,7 @@ void TitleHelper::impl_updateTitle () impl_updateTitleForModel (xModel); return; } - + if (xController.is ()) { impl_updateTitleForController (xController); @@ -357,33 +357,33 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + // external title wont be updated internaly ! // It has to be set from outside new. if (m_bExternalTitle) return; - + css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY); ::sal_Int32 nLeasedNumber = m_nLeasedNumber; - + aLock.clear (); // <- SYNCHRONIZED - + if ( ( ! xOwner.is ()) || ( ! xNumbers.is ()) || ( ! xModel.is ()) ) return; - + ::rtl::OUString sTitle; ::rtl::OUString sURL ; - + css::uno::Reference< css::frame::XStorable > xURLProvider(xModel , css::uno::UNO_QUERY); if (xURLProvider.is()) sURL = xURLProvider->getLocation (); - + if (sURL.getLength () > 0) { sTitle = impl_convertURL2Title(sURL); @@ -395,14 +395,14 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram { if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER) nLeasedNumber = xNumbers->leaseNumber (xOwner); - + ::rtl::OUStringBuffer sNewTitle(256); sNewTitle.append (xNumbers->getUntitledPrefix ()); if (nLeasedNumber != css::frame::UntitledNumbersConst::INVALID_NUMBER) sNewTitle.append ((::sal_Int32)nLeasedNumber); else sNewTitle.appendAscii ("?"); - + sTitle = sNewTitle.makeStringAndClear (); } @@ -428,31 +428,31 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + // external title wont be updated internaly ! // It has to be set from outside new. if (m_bExternalTitle) return; - + css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY); ::sal_Int32 nLeasedNumber = m_nLeasedNumber; - + aLock.clear (); // <- SYNCHRONIZED - + if ( ( ! xOwner.is ()) || ( ! xNumbers.is ()) || ( ! xController.is ()) ) return; - + ::rtl::OUStringBuffer sTitle(256); - + if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER) nLeasedNumber = xNumbers->leaseNumber (xOwner); - + css::uno::Reference< css::frame::XTitle > xModelTitle(xController->getModel (), css::uno::UNO_QUERY); if (!xModelTitle.is ()) xModelTitle.set(xController, css::uno::UNO_QUERY); @@ -481,7 +481,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: sal_Bool bChanged = (! m_sTitle.equals(sNewTitle)); m_sTitle = sNewTitle; m_nLeasedNumber = nLeasedNumber; - + aLock.clear (); // <- SYNCHRONIZED @@ -494,23 +494,23 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram { if ( ! xFrame.is ()) return; - + // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + // external title wont be updated internaly ! // It has to be set from outside new. if (m_bExternalTitle) return; - + aLock.clear (); // <- SYNCHRONIZED - + css::uno::Reference< css::uno::XInterface > xComponent; xComponent = xFrame->getController (); if ( ! xComponent.is ()) xComponent = xFrame->getComponentWindow (); - + ::rtl::OUStringBuffer sTitle (256); impl_appendComponentTitle (sTitle, xComponent); @@ -519,14 +519,14 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_appendProductExtension (sTitle); //impl_appendEvalVersion (sTitle); impl_appendDebugVersion (sTitle); - + // SYNCHRONIZED -> aLock.reset (); ::rtl::OUString sNewTitle = sTitle.makeStringAndClear (); sal_Bool bChanged = (! m_sTitle.equals(sNewTitle)); m_sTitle = sNewTitle; - + aLock.clear (); // <- SYNCHRONIZED @@ -555,7 +555,7 @@ void TitleHelper::impl_appendProductName (::rtl::OUStringBuffer& sTitle) { if (sTitle.getLength() > 0) sTitle.appendAscii (" - "); - + sTitle.append (sProductName); } } @@ -590,15 +590,15 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + css::uno::Reference< css::container::XNameAccess > xConfig( xModuleManager, css::uno::UNO_QUERY_THROW); - + const ::rtl::OUString sID = xModuleManager->identify(xOwner); ::comphelper::SequenceAsHashMap lProps = xConfig->getByName (sID); const ::rtl::OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); - + // An UIname property is an optional value ! // So please add it to the title in case it does realy exists only. if (sUIName.getLength() > 0) @@ -639,18 +639,18 @@ void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& /*sTitle*/) //css::uno::Reference< css::beans::XMaterialHolder > xHolder( // xSMGR->createInstance(SERVICENAME_TABREG), - // css::uno::UNO_QUERY); + // css::uno::UNO_QUERY); // if ( ! xHolder.is()) - // return; + // return; - // ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial()); - //const ::rtl::OUString sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString()); + // ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial()); + //const ::rtl::OUString sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString()); //if (sEvalTitle.getLength()) //{ - // sTitle.appendAscii (" " ); - // sTitle.append (sEvalTitle); + // sTitle.appendAscii (" " ); + // sTitle.append (sEvalTitle); //} } @@ -660,7 +660,7 @@ void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::f css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY); if ( ! xBroadcaster.is ()) return; - + xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this)); } @@ -697,17 +697,17 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl return; m_xSubTitle = xSubTitle; - + aLock.clear (); // <- SYNCHRONIZED - + css::uno::Reference< css::frame::XTitleChangeBroadcaster > xOldBroadcaster(xOldSubTitle , css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XTitleChangeBroadcaster > xNewBroadcaster(xSubTitle , css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XTitleChangeListener > xThis (static_cast< css::frame::XTitleChangeListener* >(this), css::uno::UNO_QUERY_THROW); - + if (xOldBroadcaster.is()) xOldBroadcaster->removeTitleChangeListener (xThis); - + if (xNewBroadcaster.is()) xNewBroadcaster->addTitleChangeListener (xThis); } @@ -725,7 +725,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl if (xSubTitle.is ()) return xSubTitle->getTitle (); - + return ::rtl::OUString (); } @@ -739,7 +739,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl { if (aURL.HasMark()) aURL = INetURLObject(aURL.GetURLNoMark()); - + sTitle = aURL.getName(INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::DECODE_WITH_CHARSET); } else diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index b982c3ea5985..030ec5bf8cf6 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uiconfigelementwrapperbase.hxx> #include <general.h> @@ -39,7 +39,7 @@ #include <uielement/rootitemcontainer.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/ui/XUIConfiguration.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> @@ -82,16 +82,16 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_10 ( UIConfigElementWrapperBase , OWeakObject , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementSettings ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ), DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), @@ -218,8 +218,8 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& sal_Int32 nHandle , const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -545,7 +545,7 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_ if ( bWriteable ) return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY ); - + return m_xConfigData; } diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 4d4d2e4fdbb8..6329f94b3063 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uielementwrapperbase.hxx> #include <general.h> @@ -37,14 +37,14 @@ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> @@ -66,15 +66,15 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_8 ( UIElementWrapperBase , OWeakObject , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ) @@ -128,7 +128,7 @@ void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArgument throw ( Exception, RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( !m_bInitialized ) { for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) @@ -180,8 +180,8 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a sal_Int32 /*nHandle*/ , const Any& /*aValue*/ ) throw( com::sun::star::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) return sal_False ; } @@ -195,10 +195,10 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A { switch( nHandle ) { - case UIELEMENT_PROPHANDLE_RESOURCEURL: + case UIELEMENT_PROPHANDLE_RESOURCEURL: aValue <<= m_aResourceURL; break; - case UIELEMENT_PROPHANDLE_TYPE: + case UIELEMENT_PROPHANDLE_TYPE: aValue <<= m_nType; break; case UIELEMENT_PROPHANDLE_FRAME: diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 40f278d14832..3845c09ffb6f 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,17 +66,17 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu , m_xSMGR (xSMGR ) , m_xParentWindow (xParentWindow ) , m_pStatusBar (0 ) - , m_nRange (0 ) - , m_nValue (0 ) + , m_nRange (0 ) + , m_nValue (0 ) { if (!m_xParentWindow.is()) throw css::uno::RuntimeException( ::rtl::OUString::createFromAscii("Cant work without a parent window!"), static_cast< css::task::XStatusIndicator* >(this)); } - + //----------------------------------------------- -VCLStatusIndicator::~VCLStatusIndicator() +VCLStatusIndicator::~VCLStatusIndicator() { } @@ -90,28 +90,28 @@ void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText , css::uno::Reference< css::awt::XWindow > xParentWindow = m_xParentWindow; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if (!m_pStatusBar) m_pStatusBar = new StatusBar(pParentWindow, WB_3DLOOK|WB_BORDER); - + VCLStatusIndicator::impl_recalcLayout(m_pStatusBar, pParentWindow); - + m_pStatusBar->Show(); m_pStatusBar->StartProgressMode(sText); m_pStatusBar->SetProgressValue(0); - + // force repaint! pParentWindow->Show(); pParentWindow->Invalidate(INVALIDATE_CHILDREN); pParentWindow->Flush(); - + aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_sText = sText; @@ -120,7 +120,7 @@ void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText , aWriteLock.unlock(); // <- SAFE ---------------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::reset() throw(css::uno::RuntimeException) @@ -135,7 +135,7 @@ void SAL_CALL VCLStatusIndicator::reset() aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException) @@ -147,21 +147,21 @@ void SAL_CALL VCLStatusIndicator::end() m_nValue = 0; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); if (m_pStatusBar) { m_pStatusBar->EndProgressMode(); m_pStatusBar->Show(sal_False); - + delete m_pStatusBar; m_pStatusBar = 0; } aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) throw(css::uno::RuntimeException) @@ -171,7 +171,7 @@ void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) m_sText = sText; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); if (m_pStatusBar) @@ -179,22 +179,22 @@ void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + if (nValue <= m_nRange) m_nValue = nValue; else m_nValue = m_nRange; - + sal_Int32 nRange = m_nRange; nValue = m_nValue; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -202,7 +202,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) USHORT nPercent = sal::static_int_cast< USHORT >( ::std::min( ((nValue*100) / ::std::max(nRange,(sal_Int32)1)), (sal_Int32)100)); - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); if (m_pStatusBar) @@ -210,7 +210,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , Window* pParentWindow) @@ -220,12 +220,12 @@ void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , (!pParentWindow) ) return; - + Size aParentSize = pParentWindow->GetSizePixel(); pStatusBar->SetPosSizePixel(0, 0, aParentSize.Width(), aParentSize.Height()); } - + } // namespace framework diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 8682dcd2ed19..0899611b4c03 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& x void SAL_CALL WakeUpThread::run() { ::osl::Condition aSleeper; - + TimeValue aTime; aTime.Seconds = 0; aTime.Nanosec = 25000000; // 25 msec @@ -62,13 +62,13 @@ void SAL_CALL WakeUpThread::run() { aSleeper.reset(); aSleeper.wait(&aTime); - + // SAFE -> ReadGuard aReadLock(m_aLock); css::uno::Reference< css::util::XUpdatable > xListener(m_xListener.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE - + if (xListener.is()) xListener->update(); } diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 2462ce455f3d..23ec86df8a00 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,11 +55,11 @@ namespace framework //__________________________________________ /** @short implements a cache for any accelerator configuration. - + @descr Its implemented threadsafe, supports copy-on-write pattern and a flush mechansim to support concurrent access to the same configuration. - + copy-on-write ... How? Do the following: */ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... @@ -68,14 +68,14 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b // const, types public: - + //--------------------------------------- /** TODO document me commands -> keys */ typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList; typedef BaseHash< TKeyList > TCommand2Keys; - + //--------------------------------------- /** TODO document me keys -> commands @@ -84,21 +84,21 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b ::rtl::OUString , KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; - + //______________________________________ // member private: - + //--------------------------------------- /** map commands to keys in relation 1:n. First key is interpreted as preferred one! */ TCommand2Keys m_lCommand2Keys; - + //--------------------------------------- /** map keys to commands in relation 1:1. */ TKey2Commands m_lKey2Commands; - + //______________________________________ // interface @@ -107,20 +107,20 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b //--------------------------------------- /** @short creates a new - but empty - cache instance. */ AcceleratorCache(); - + //--------------------------------------- /** @short make a copy of this cache. - @descr Used for the copy-on-write feature. + @descr Used for the copy-on-write feature. */ AcceleratorCache(const AcceleratorCache& rCopy); - + //--------------------------------------- /** @short does nothing real. */ virtual ~AcceleratorCache(); //--------------------------------------- /** @short write changes back to the original container. - + @param rCopy the (changed!) copy, which should be written back to this original container. @@ -130,30 +130,30 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b //--------------------------------------- /** TODO document me */ virtual AcceleratorCache& operator=(const AcceleratorCache& rCopy); - + //--------------------------------------- /** @short checks if the specified key exists. @param aKey the key, which should be checked. - + @return [bool] TRUE if the speicfied key exists inside this container. */ virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const; - + //--------------------------------------- /** TODO document me */ virtual TKeyList getAllKeys() const; - + //--------------------------------------- /** @short add a new or change an existing key-command pair of this container. - + @param aKey describe the key. - + @param sCommand describe the command. */ @@ -163,7 +163,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b //--------------------------------------- /** @short returns the list of keys, which are registered for this command. - + @param sCommand describe the command. @@ -171,11 +171,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b the list of registered keys. Can be empty! */ virtual TKeyList getKeysByCommand(const ::rtl::OUString& sCommand) const; - + //--------------------------------------- /** TODO */ virtual ::rtl::OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; - + //--------------------------------------- /** TODO */ virtual void removeKey(const css::awt::KeyEvent& aKey); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 8fa0902b2d06..36eed6a6d534 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,18 +75,18 @@ namespace framework //----------------------------------------------- // Accelerators.xcu -static const ::rtl::OUString CFG_ENTRY_PRIMARY = ::rtl::OUString::createFromAscii("PrimaryKeys"); -static const ::rtl::OUString CFG_ENTRY_SECONDARY = ::rtl::OUString::createFromAscii("SecondaryKeys"); +static const ::rtl::OUString CFG_ENTRY_PRIMARY = ::rtl::OUString::createFromAscii("PrimaryKeys"); +static const ::rtl::OUString CFG_ENTRY_SECONDARY = ::rtl::OUString::createFromAscii("SecondaryKeys"); -static const ::rtl::OUString CFG_ENTRY_GLOBAL = ::rtl::OUString::createFromAscii("Global"); +static const ::rtl::OUString CFG_ENTRY_GLOBAL = ::rtl::OUString::createFromAscii("Global"); static const ::rtl::OUString CFG_ENTRY_MODULES = ::rtl::OUString::createFromAscii("Modules"); static const ::rtl::OUString CFG_PROP_COMMAND = ::rtl::OUString::createFromAscii("Command"); /** "global" type to make accelerator presets unique, so they can be used in combination with the salhelper::SingletonRef mechanism! */ -typedef PresetHandler AcceleratorPresets; - +typedef PresetHandler AcceleratorPresets; + //__________________________________________ /** implements a read/write access to the accelerator configuration. @@ -207,7 +207,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) throw(css::uno::RuntimeException); - // XReset + // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() throw(css::uno::RuntimeException); @@ -233,7 +233,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase for changes on the configuration layer ... @return ::comphelper::Locale - The current office locale. + The current office locale. */ ::comphelper::Locale impl_ts_getLocale() const; @@ -271,7 +271,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase used to locate the sub storage. @param sSubStorage - relativ path of the sub storage. + relativ path of the sub storage. @param bOutStream force open of the sub storage in @@ -280,7 +280,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase @return [XInterface] will be a css::io::XInpoutStream or a css::io::XOutputStream. - Depends from the parameter bWriteable! + Depends from the parameter bWriteable! */ css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage, const ::rtl::OUString& sSubStorage , @@ -300,10 +300,10 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase @param bWriteAccessRequested if the outside code whish to change the container it must call this method with "TRUE". So the internal - cache can be prepared for that (means copy-on-write ...). + cache can be prepared for that (means copy-on-write ...). @return [AcceleratorCache] - c++ reference(!) to one of our internal caches. + c++ reference(!) to one of our internal caches. */ AcceleratorCache& impl_getCFG(sal_Bool bWriteAccessRequested = sal_False); @@ -312,9 +312,9 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... , public ::cppu::OWeakObject , public css::lang::XTypeProvider - , public css::util::XChangesListener + , public css::util::XChangesListener , public css::form::XReset // TODO use XPresetHandler instead if available - , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence + , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence // css::ui::XUIConfigurationStorage // css::ui::XUIConfiguration { @@ -420,7 +420,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) throw(css::uno::RuntimeException); - // XReset + // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() throw(css::uno::RuntimeException); @@ -451,7 +451,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase for changes on the configuration layer ... @return ::comphelper::Locale - The current office locale. + The current office locale. */ ::comphelper::Locale impl_ts_getLocale() const; diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx index 3fe80221546c..43714abeee60 100644 --- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,29 +65,29 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration { //______________________________________ // member - + 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; - + css::uno::Reference< css::embed::XStorage > m_xDocumentRoot; + //______________________________________ // interface public: - + //---------------------------------- /** initialize this instance and fill the internal cache. - + @param xSMGR reference to an uno service manager, which is used internaly. */ DocumentAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR); virtual ~DocumentAcceleratorConfiguration(); - - // XInterface, XTypeProvider, XServiceInfo + + // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -97,22 +97,22 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration throw(css::uno::Exception , css::uno::RuntimeException); - // XUIConfigurationStorage + // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasStorage() throw(css::uno::RuntimeException); - + //______________________________________ // helper - + private: - + //---------------------------------- /** read all data into the cache. */ void impl_ts_fillCache(); - + //---------------------------------- /** forget all currently cached data AND(!) forget all currently used storages. */ diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index 05515770ae61..f2b0b1d6afb6 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,20 +69,20 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration // interface public: - + //---------------------------------- /** initialize this instance and fill the internal cache. - + @param xSMGR reference to an uno service manager, which is used internaly. */ GlobalAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR); - + //---------------------------------- /** TODO */ virtual ~GlobalAcceleratorConfiguration(); - - // XInterface, XTypeProvider, XServiceInfo + + // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -94,11 +94,11 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration //______________________________________ // helper - + private: ::rtl::OUString m_sLocale; - + //---------------------------------- /** read all data into the cache. */ void impl_ts_fillCache(); diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index c11076efcddd..44f0cc3cd5c5 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace framework class IStorageListener { public: - + //-------------------------------------- /** @short TODO */ virtual void changesOccured(const ::rtl::OUString& sPath) = 0; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 2a58e7fa6137..e254378867b6 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,25 +73,25 @@ class KeyMapping //--------------------------------------- /** @short hash structure to map identifier to key codes. */ typedef BaseHash< sal_Int16 > Identifier2CodeHash; - + //--------------------------------------- /** @short hash structure to map key codes to identifier. */ typedef ::std::hash_map< sal_Int16 , ::rtl::OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; - + //______________________________________ // member private: - + static KeyIdentifierInfo KeyIdentifierMap[]; - + //--------------------------------------- /** @short hash to map identifier to key codes. */ Identifier2CodeHash m_lIdentifierHash; - + //--------------------------------------- /** @short hash to map key codes to identifier. */ Code2IdentifierHash m_lCodeHash; @@ -107,51 +107,51 @@ class KeyMapping //---------------------------------- /** @short return a suitable key code for the specified key identifier. - + @param sIdentifier string value, which describe the key. @return [css::awt::KeyEvent] the corresponding key code as short value. - + @throw [css::lang::IllegalArgumentException] if the given identifier does not describe - a well known key code. - */ + a well known key code. + */ virtual sal_uInt16 mapIdentifierToCode(const ::rtl::OUString& sIdentifier) throw(css::lang::IllegalArgumentException); - + //---------------------------------- /** @short return a suitable key identifier for the specified key code. - + @param nCode short value, which describe the key. @return The corresponding string identifier. - */ + */ virtual ::rtl::OUString mapCodeToIdentifier(sal_uInt16 nCode); - + //______________________________________ // helper private: - + //---------------------------------- /** @short check if the given string describe a numeric value ... and convert it. @param sIdentifier the string value, which should be converted. - - + + @param rCode contains the converted code, but is defined only if this method returns TRUE! @return [boolean] - TRUE if convertion was successfully. + TRUE if convertion was successfully. */ sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, sal_uInt16& rCode ); diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index de1a652c6940..8d83dcd459b3 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,33 +64,33 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration { //______________________________________ // member - + private: //---------------------------------- /** identify the application module, where this accelerator configuration cache should work on. */ - ::rtl::OUString m_sModule; + ::rtl::OUString m_sModule; ::rtl::OUString m_sLocale; - + //______________________________________ // interface public: - + //---------------------------------- /** initialize this instance and fill the internal cache. - + @param xSMGR reference to an uno service manager, which is used internaly. */ ModuleAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR); - + //---------------------------------- /** TODO */ virtual ~ModuleAcceleratorConfiguration(); - - // XInterface, XTypeProvider, XServiceInfo + + // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -99,12 +99,12 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - + //______________________________________ // helper - + private: - + //---------------------------------- /** read all data into the cache. */ void impl_ts_fillCache(); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 7131011827e8..2d8f3ea57920 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ //__________________________________________ // own includes -#include <accelerators/storageholder.hxx> +#include <accelerators/storageholder.hxx> #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> @@ -62,62 +62,62 @@ namespace framework //__________________________________________ /** TODO document me - + <layer>/global/<resourcetype>/<preset>.xml <layer>/modules/<moduleid>/<resourcetype>/<preset>.xml - + RESOURCETYPE PRESET TARGET (share) (user) "accelerator" "default" "current" "word" "excel" - - "menubar" "default" "menubar" - + + "menubar" "default" "menubar" + */ class PresetHandler : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... { //------------------------------------------- // const - + public: static ::rtl::OUString PRESET_DEFAULT(); static ::rtl::OUString TARGET_CURRENT(); - + static ::rtl::OUString RESOURCETYPE_MENUBAR(); static ::rtl::OUString RESOURCETYPE_TOOLBAR(); static ::rtl::OUString RESOURCETYPE_ACCELERATOR(); static ::rtl::OUString RESOURCETYPE_STATUSBAR(); - + //------------------------------------------- // types - + public: - + //--------------------------------------- /** @short this handler can provide different types of configuration. - + @descr Means: a global or a module dependend or ... configuration. - */ + */ enum EConfigType { E_GLOBAL, E_MODULES, E_DOCUMENT }; - + private: //--------------------------------------- /** @short because a concurrent access to the same storage from different implementations isnt supported, we have to share it with others. - + @descr This struct makes it possible to use any shared storage in combination with a SingletonRef<> template ... - + Attention: Because these struct is shared it must be used within a synchronized section. Thats why this struct uses a base class ThreadHelpBase and can be locked @@ -126,74 +126,74 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas struct TSharedStorages : public ThreadHelpBase { public: - + StorageHolder m_lStoragesShare; StorageHolder m_lStoragesUser; - + TSharedStorages() : m_lStoragesShare(::comphelper::getProcessServiceFactory()) , m_lStoragesUser (::comphelper::getProcessServiceFactory()) {}; - + virtual ~TSharedStorages() {}; }; - + //------------------------------------------- // member - + private: - + //--------------------------------------- /** @short can be used to create on needed uno resources. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + //--------------------------------------- /** @short knows the type of provided configuration. - + @descr e.g. global, modules, ... */ EConfigType m_eConfigType; - + //--------------------------------------- /** @short specify the type of resource, which configuration sets must be provided here. - - @descr e.g. menubars, toolbars, accelerators + + @descr e.g. menubars, toolbars, accelerators */ ::rtl::OUString m_sResourceType; - + //--------------------------------------- /** @short specify the application module for a module dependend configuration. - + @descr Will be used only, if m_sResourceType is set to "module". Further it must be a valid module identifier then ... */ ::rtl::OUString m_sModule; - + //--------------------------------------- /** @short provides access to the: a) shared root storages b) shared "inbetween" storages of the share and user layer. */ ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; - + //--------------------------------------- /** @short if we run in document mode, we cant use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; - + //--------------------------------------- /** @short holds the folder storage of the share layer alive, where the current configuration set exists. - + @descr Note: If this preset handler works in document mode this member is meaned relative to the document root ... not to the share layer root! - + Further is defined, that m_xWorkingStorageUser - is equals to m_xWorkingStorageShare then! + is equals to m_xWorkingStorageShare then! */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare; @@ -201,108 +201,108 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas /** @short global language-independent storage */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang; - + //--------------------------------------- /** @short holds the folder storage of the user layer alive, where the current configuration set exists. - + @descr Note: If this preset handler works in document mode this member is meaned relative to the document root ... not to the user layer root! - + Further is defined, that m_xWorkingStorageUser - is equals to m_xWorkingStorageShare then! + is equals to m_xWorkingStorageShare then! */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser; - + //--------------------------------------- /** @short knows the names of all presets inside the current working storage of the share layer. */ OUStringList m_lPresets; - + //--------------------------------------- /** @short knows the names of all targets inside the current working storage of the user layer. */ OUStringList m_lTargets; - + //--------------------------------------- /** @short its the current office locale and will be used to handle localized presets. - + @descr Default is "x-notranslate" which disable any - localized handling inside this class! */ + localized handling inside this class! */ ::comphelper::Locale m_aLocale; - + //--------------------------------------- /** @short knows the relative path from the root. */ ::rtl::OUString m_sRelPathShare; ::rtl::OUString m_sRelPathNoLang; ::rtl::OUString m_sRelPathUser; - + //------------------------------------------- // native interface - + public: - + //--------------------------------------- /** @short does nothing real. - + @descr Because this class should be useable in combination with ::salhelper::SingletonRef template this ctor cant have any special parameters! - + @param xSMGR points to an uno service manager, which is used internaly - to create own needed uno resources. + to create own needed uno resources. */ - PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + //--------------------------------------- /** @short copy ctor */ PresetHandler(const PresetHandler& rCopy); - + //--------------------------------------- /** @short closes all open storages ... if user forgot that .-) */ virtual ~PresetHandler(); - + //--------------------------------------- /** @short free all currently cache(!) storages. */ void forgetCachedStorages(); - + //--------------------------------------- /** @short return access to the internaly used and cached root storage. - + @descr These root storages are the base of all further opened presets and targets. They are provided here only, to support older implementations, which base on them ... - + getOrCreate...() - What does it mean? Such root storage will be created one times only and cached then internaly till the last instance of such PresetHandler dies. - + @return com::sun::star::embed::XStorage - which represent a root storage. + which represent a root storage. */ css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare(); css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageUser(); - + //--------------------------------------- /** @short provides access to the current working storages. - + @descr Working storages are the "lowest" storages, where the preset and target files exists. - + @return com::sun::star::embed::XStorage which the current working storage. */ css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); css::uno::Reference< css::embed::XStorage > getWorkingStorageUser(); - + //--------------------------------------- /** @short check if there is a parent storage well known for the specified child storage and return it. - + @param xChild the child storage where a paranet storage should be searched for. @@ -311,76 +311,76 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild); css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild); - + //--------------------------------------- /** @short free all internal structures and let this handler work on a new type of configuration sets. @param eConfigType differ between global or module dependend configuration. - + @param sResourceType differ between menubar/toolbar/accelerator/... configuration. @param sModule if sResourceType is set to a module dependend configuration, it address the current application module. - + @param xDocumentRoot if sResourceType is set to E_DOCUMENT, this value points to the root storage inside the document, where we can save our configuration files. Note: Thats not the real root of the document ... - its only a sub storage. But we interpret it as our root storage. + its only a sub storage. But we interpret it as our root storage. @param aLocale in case this configuration supports localized entries, the current locale must be set. - + Localzation will be represented as directory structure of provided presets. Means: you call us with a preset name "default"; and we use e.g. "/en-US/default.xml" internaly. - + If no localization exists for this preset set, this class will work in default mode - means "no locale" - automaticly. e.g. "/default.xml" - + @throw com::sun::star::uno::RuntimeException(!) - if the specified resource couldn't be located. + if the specified resource couldn't be located. */ void connectToResource( EConfigType eConfigType , const ::rtl::OUString& sResourceType , const ::rtl::OUString& sModule , const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , - const ::comphelper::Locale& aLocale = ::comphelper::Locale(::comphelper::Locale::X_NOTRANSLATE())); + const ::comphelper::Locale& aLocale = ::comphelper::Locale(::comphelper::Locale::X_NOTRANSLATE())); //--------------------------------------- /** @short try to copy the specified preset from the share layer to the user layer and establish it as the specified target. - + @descr Means: copy share/.../<preset>.xml user/.../<target>.xml Note: The target will be overwritten completly or created as new by this operation! @param sPreset the ALIAS name of an existing preset. - + @param sTarget - the ALIAS name of the target. - + the ALIAS name of the target. + @throw com::sun::star::container::NoSuchElementException if the specified preset does not exists. - + @throw com::sun::star::io::IOException if copying failed. */ void copyPresetToTarget(const ::rtl::OUString& sPreset, const ::rtl::OUString& sTarget); - + //--------------------------------------- /** @short open the specified preset as stream object and return it. - + @descr Note: Because presets resist inside the share layer, they will be opened readonly everytimes. @@ -389,16 +389,16 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @param bNoLangGlobal access the global language-independent storage instead of the preset storage - - @return The opened preset stream ... or NULL if the preset does not exists. + + @return The opened preset stream ... or NULL if the preset does not exists. */ css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset, sal_Bool bUseNoLangGlobal = sal_False); - + //--------------------------------------- /** @short open the specified target as stream object and return it. - + @descr Note: Targets resist inside the user layer. Normaly they are opened in read/write mode. But it will be opened readonly automaticly if that isnt possible @@ -406,124 +406,124 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @param sTarget the ALIAS name of the target. - + @param bCreateIfMissing create target file, if it does not still exists. Note: That does not means reseting of an existing file! - + @return The opened target stream ... or NULL if the target does not exists or couldnt be created as new one. */ css::uno::Reference< css::io::XStream > openTarget(const ::rtl::OUString& sTarget , sal_Bool bCreateIfMissing); - + //--------------------------------------- /** @short do anything which is neccessary to flush all changes back to disk. - + @descr We have to call commit on all cached sub storages on the path from the root storage upside down to the working storage (which are not realy used, but required to be holded alive!). */ void commitUserChanges(); - + //--------------------------------------- /** TODO */ void addStorageListener(IStorageListener* pListener); void removeStorageListener(IStorageListener* pListener); - + //------------------------------------------- // helper - + private: - + //--------------------------------------- /** @short open a config path ignoring errors (catching exceptions). - + @descr We catch only normal exceptions here - no runtime exceptions. - + @param sPath the configuration path, which should be opened. - + @param eMode the open mode (READ/READWRITE) - + @param bShare force using of the share layer instead of the user layer. - - @return An opened storage in case method was successfully - null otherwise. + + @return An opened storage in case method was successfully - null otherwise. */ css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const ::rtl::OUString& sPath , sal_Int32 eMode , sal_Bool bShare); - + //--------------------------------------- /** @short try to find the specified locale inside list of possible ones. - + @descr The lits of possible locale values was e.g. retrieved from the system (configuration, directory listing etcpp). The locale normaly represent the current office locale. This method search for a suitable item by using different algorithm. a) exact search b) search with using fallbacks - + @param lLocalizedValues list of ISO locale codes - + @param aLocale [IN ] the current office locale, which should be searched inside lLocalizedValues. - [OUT] in case fallbacks was allowed, it contains afterwards the fallback locale. - + [OUT] in case fallbacks was allowed, it contains afterwards the fallback locale. + @param bAllowFallbacks enable/disable using of fallbacks - + @return An iterator, which points directly into lLocalizedValue list. As a negative result the special iterator lLocalizedValues.end() will be returned. */ ::std::vector< ::rtl::OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< ::rtl::OUString >& lLocalizedValues, ::comphelper::Locale& aLocale , sal_Bool bAllowFallbacks ); - + //--------------------------------------- /** @short open a config path ignoring errors (catching exceptions). - + @descr We catch only normal exceptions here - no runtime exceptions. Further the path itself is tries in different versions (using locale specific attributes). e.g. "path/e-US" => "path/en" => "path/de" - + @param sPath the configuration path, which should be opened. Its further used as out parameter too, so we can return the localized path to the calli! - + @param eMode the open mode (READ/READWRITE) - + @param bShare force using of the share layer instead of the user layer. - + @param aLocale [IN ] contains the start locale for searching localized sub dirs. [OUT] contains the locale of a found localized sub dir - + @param bAllowFallback enable/disable fallback handling for locales - - @return An opened storage in case method was successfully - null otherwise. + + @return An opened storage in case method was successfully - null otherwise. */ css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(::rtl::OUString& sPath , sal_Int32 eMode , sal_Bool bShare , ::comphelper::Locale& aLocale , sal_Bool bAllowFallback); - + //--------------------------------------- /** @short returns the names of all sub storages of specified storage. - + @param xFolder the base storage for this operation. - + @return [vector< string >] a list of folder names. */ diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index b604d880d628..291fc29675eb 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ namespace framework #error "Who defines css? I will use it as namespace alias inside header." #else #define css ::com::sun::star -#endif - +#endif + //=============================================== // definitions @@ -78,21 +78,21 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ typedef ::std::vector< css::uno::Reference< css::embed::XStorage > > TStorageList; - + typedef ::std::vector< IStorageListener* > TStorageListenerList; - + struct TStorageInfo { public: css::uno::Reference< css::embed::XStorage > Storage; sal_Int32 UseCount; TStorageListenerList Listener; - + TStorageInfo() : UseCount(0) - {} + {} }; - + /** @short TODO */ typedef ::std::hash_map< ::rtl::OUString , TStorageInfo , @@ -105,64 +105,64 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /** @short TODO */ css::uno::Reference< css::embed::XStorage > m_xRoot; - + /** @short TODO */ TPath2StorageInfo m_lStorages; - + //------------------------------------------- // interface public: - + //--------------------------------------- /** @short TODO */ StorageHolder(); - + //--------------------------------------- /** @short TODO */ StorageHolder(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + //--------------------------------------- /** @short TODO */ virtual ~StorageHolder(); - + //--------------------------------------- /** @short TODO */ virtual void forgetCachedStorages(); - + //--------------------------------------- /** @short TODO */ virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); - + //--------------------------------------- /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const; - + //--------------------------------------- /** @short TODO open or get! */ virtual css::uno::Reference< css::embed::XStorage > openPath(const ::rtl::OUString& sPath , sal_Int32 nOpenMode); - + //--------------------------------------- /** @short TODO */ virtual StorageHolder::TStorageList getAllPathStorages(const ::rtl::OUString& sPath); - + //--------------------------------------- /** @short TODO */ virtual void commitPath(const ::rtl::OUString& sPath); - + //--------------------------------------- /** @short TODO */ @@ -172,19 +172,19 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ virtual void notifyPath(const ::rtl::OUString& sPath); - + //--------------------------------------- /** @short TODO */ virtual void addStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ); - + //--------------------------------------- /** @short TODO */ virtual void removeStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ); - + //--------------------------------------- /** @short TODO */ @@ -194,7 +194,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); - + //--------------------------------------- /** @short TODO */ @@ -204,30 +204,30 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ virtual void operator=(const StorageHolder& rCopy); - + //--------------------------------------- /** @short opens a sub element of the specified base storage. - + @descr First this method try to open the requested sub element using the given open mode. If it failed there is second step, which tries to do the same again ... but removing a might existing WRITE flag from the open mode. The user can supress this fallback handling by setting the parameter bAllowFallback to FALSE. - + @param xBaseStorage the storage, where the sub element should be searched. - + @param sSubElement the full name of the sub element. e.g. "default.xml" - + @param eOpenMode a flag field, which set the open mode for this operation. - + @param bAllowFallback if eOpenMode contains an ELEMENT_WRITE flag this parameter allow to remove it and try it with the rest of eOpenMode flags - again. + again. */ static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const ::rtl::OUString& sSubStorage , @@ -238,7 +238,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas const ::rtl::OUString& sSubStream , sal_Int32 eOpenMode , sal_Bool bAllowFallback); - + //--------------------------------------- // helper private: @@ -247,11 +247,11 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ static ::rtl::OUString impl_st_normPath(const ::rtl::OUString& sPath); - + //----------------------------------- /** @short TODO */ - static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath); + static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath); }; #undef css // dont let it out! diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx index c2307d5877bd..4d51b2586efe 100644 --- a/framework/source/inc/constant/containerquery.hxx +++ b/framework/source/inc/constant/containerquery.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx index ed6c92854c75..db10575ce8e7 100644 --- a/framework/source/inc/constant/contenthandler.hxx +++ b/framework/source/inc/constant/contenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx index 85beec93e30f..58e03638d3b2 100644 --- a/framework/source/inc/constant/frameloader.hxx +++ b/framework/source/inc/constant/frameloader.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index b0619fb11492..63ec4c4f28f0 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx index 18ddb050ecf8..f2f0f6c95025 100644 --- a/framework/source/inc/dispatch/uieventloghelper.hxx +++ b/framework/source/inc/dispatch/uieventloghelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ namespace framework { try { - static ::rtl::OUString our_aModuleManagerName = SERVICENAME_MODULEMANAGER; + static ::rtl::OUString our_aModuleManagerName = SERVICENAME_MODULEMANAGER; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager( rServiceManager->createInstance(our_aModuleManagerName) , ::com::sun::star::uno::UNO_QUERY_THROW); @@ -79,4 +79,4 @@ namespace framework }; } -#endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ +#endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 2479e4f19ab1..0844dd74bf02 100755 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,10 +78,10 @@ class WindowCommandDispatch : private ThreadHelpBase // const private: - + /// dispatch URL to trigger our "Tools->Options" dialog static const ::rtl::OUString COMMAND_PREFERENCES; - + /// dispatch URL to trigger our About box static const ::rtl::OUString COMMAND_ABOUTBOX; @@ -95,17 +95,17 @@ class WindowCommandDispatch : private ThreadHelpBase /// knows the frame, where we dispatch our commands as weak reference css::uno::WeakReference< css::frame::XFrame > m_xFrame; - + /// knows the VCL window (where the hard coded commands occured) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; - + //___________________________________________ // native interface public: //_______________________________________ - + /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such MACDispatch can be used for the specified context only. @@ -135,33 +135,33 @@ class WindowCommandDispatch : private ThreadHelpBase // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) throw (css::uno::RuntimeException); - + //___________________________________________ // implementation private: - + //_______________________________________ - + /** @short establish all listener connections we need. - + @descr Those listener connections will be created one times only (see ctor). Afterwards we listen for incoming events till our referred frame/window pair will be closed. All objects die by refcount automatically. Because we hold it weak ... */ void impl_startListening(); - + //_______________________________________ - + /** @short callback from VCL to notify new commands */ DECL_LINK( impl_notifyCommand, void* ); - + //_______________________________________ - + /** @short dispatch right command URLs into our frame context. - + @param sCommand the command for dispatch */ diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index ff41f0f58467..5e1eaf64036d 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 60c3c317e07d..982f390f8469 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ class LoadEnv : private ThreadHelpBase /** TODO document me ... */ void* m_pCheck; - QuietInteraction* m_pQuietInteraction; + QuietInteraction* m_pQuietInteraction; //___________________________________________ // native interface diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index 8af58d4c898d..bb26e98f4695 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 7fb01a7fd037..179ec117ab19 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index b2de45fef2d5..7cb9280ef0e2 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,40 +69,40 @@ class ConfigurationHelper //------------------------------------------- // const public: - + //--------------------------------------- /** @short allow opening of a configuration access in different working modes. - + @descr All enum values must be useable as flags mapped into a int32 value! */ enum EOpenMode { - /// open it readonly (default=readwrite!) + /// open it readonly (default=readwrite!) E_READONLY = 1, /// disable fallback handling for localized cfg nodes E_ALL_LOCALES = 2 }; - + //------------------------------------------- // interface public: - + //--------------------------------------- /** @short opens a configuration access. - + @descr TODO - + @param xSMGR this method need an uno service manager for internal work. - + @param sPackage name the configuration file. e.g. "/.org.openoffice.Setup" Note: It must start with "/" but end without(!) "/"! - + @param sRelPath describe the relativ path of the requested key inside the specified package. @@ -110,7 +110,7 @@ class ConfigurationHelper Note: Its not allowed to start or end with a "/"! Further you must use encoded path elements if e.g. set nodes are involved. - + @param nOpenFlags force opening of the configuration access in special mode. see enum EOpenMode for further informations. @@ -121,50 +121,50 @@ class ConfigurationHelper sal_Int32 nOpenFlags) { static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/"); - + css::uno::Reference< css::uno::XInterface > xCFG; - + try { css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider( xSMGR->createInstance(SERVICENAME_CFGPROVIDER), css::uno::UNO_QUERY_THROW); - + ::rtl::OUStringBuffer sPath(1024); sPath.append(sPackage ); sPath.append(PATH_SEPERATOR); sPath.append(sRelPath ); - sal_Bool bReadOnly = ((nOpenFlags & ConfigurationHelper::E_READONLY ) == ConfigurationHelper::E_READONLY ); - sal_Bool bAllLocales = ((nOpenFlags & ConfigurationHelper::E_ALL_LOCALES) == ConfigurationHelper::E_ALL_LOCALES); - + sal_Bool bReadOnly = ((nOpenFlags & ConfigurationHelper::E_READONLY ) == ConfigurationHelper::E_READONLY ); + sal_Bool bAllLocales = ((nOpenFlags & ConfigurationHelper::E_ALL_LOCALES) == ConfigurationHelper::E_ALL_LOCALES); + sal_Int32 c = 1; if (bAllLocales) c = 2; - + css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - + aParam.Name = ::rtl::OUString::createFromAscii("nodepath"); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; - + if (bAllLocales) { aParam.Name = ::rtl::OUString::createFromAscii("*"); aParam.Value <<= sal_True; lParams[1] <<= aParam; } - + if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS, lParams); - else + else xCFG = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGUPDATEACCESS, lParams); } catch(const css::uno::RuntimeException& exRun) { throw exRun; } catch(const css::uno::Exception&) { xCFG.clear(); } - + return xCFG; } }; diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 1cced6e7b496..3ffbfaeaebdc 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un xController = xFrame->getController(); if (xController.is()) xModel = xController->getModel(); - return xModel; + return xModel; } //----------------------------------------------- @@ -80,26 +80,26 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un needed interface isnt available) dispose() is tried instead. Al possible exception are handled inside. So the user of this method has to look for the return value only. - + @attention The given resource will not be cleared. But later using of it can produce an exception! - + @param xResource the object, which should be closed here. - + @param bDelegateOwnerShip used at the XCloseable->close() method to define the right owner in case closing failed. - + @return [bool] - TRUE if closing failed. + TRUE if closing failed. */ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource , sal_Bool bDelegateOwnerShip) { css::uno::Reference< css::util::XCloseable > xClose (xResource, css::uno::UNO_QUERY); css::uno::Reference< css::lang::XComponent > xDispose(xResource, css::uno::UNO_QUERY); - + try { if (xClose.is()) @@ -122,7 +122,7 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso return sal_True; } - + } // namespace frame } // namespace pattern } // namespace framework diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx index d654bb3572d9..a785e307995d 100644 --- a/framework/source/inc/pattern/storages.hxx +++ b/framework/source/inc/pattern/storages.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,15 +69,15 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const // error during opening the temp file isnt realy a runtime error -> handle it gracefully css::uno::Reference< css::io::XOutputStream > xTempFile(xSMGR->createInstance(SERVICENAME_TEMPFILE), css::uno::UNO_QUERY); if (!xTempFile.is()) - return css::uno::Reference< css::embed::XStorage >(); + return css::uno::Reference< css::embed::XStorage >(); - // creation of needed resources is mandatory -> error = runtime error + // creation of needed resources is mandatory -> error = runtime error css::uno::Reference< css::embed::XPackageStructureCreator > xPackageCreator(xSMGR->createInstance(SERVICENAME_PACKAGESTRUCTURECREATOR), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_STORAGEFACTORY) , css::uno::UNO_QUERY_THROW); // create zip package xPackageCreator->convertToPackage(sFolder, xTempFile); - + // seek it back - so it can be used in a defined way. css::uno::Reference< css::io::XSeekable > xSeekable(xTempFile, css::uno::UNO_QUERY_THROW); xSeekable->seek(0); @@ -86,15 +86,15 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const sal_Int32 nOpenMode = css::embed::ElementModes::ELEMENT_READWRITE; if (bReadOnly) nOpenMode = css::embed::ElementModes::ELEMENT_READ; - + css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= xTempFile; lArgs[1] <<= nOpenMode; - + css::uno::Reference< css::embed::XStorage > xStorage(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); return xStorage; } - + } // namespace storages } // namespace pattern } // namespace framework diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 49d6ddbb5ef5..619ce140d491 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#include <rtl/ustring.hxx> +#include <rtl/ustring.hxx> //_______________________________________________ // namespaces @@ -64,7 +64,7 @@ namespace framework{ // definitions class WindowHelper -{ +{ public: //----------------------------------------------- @@ -75,7 +75,7 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + ByteString sWindowState; Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! @@ -104,7 +104,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if ( @@ -116,10 +116,10 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind (!((WorkWindow*)pWindow)->IsMinimized() ) ) ) - { + { ((SystemWindow*)pWindow)->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8)); } - + aSolarGuard.clear(); // <- SOLAR SAFE ---------------------------- } @@ -139,7 +139,7 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( - (pWindow ) && + (pWindow ) && (pWindow->IsSystemWindow()) ) return sal_True; diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx index d032aa1f24a6..6d0185a48080 100644 --- a/framework/source/interaction/preventduplicateinteraction.cxx +++ b/framework/source/interaction/preventduplicateinteraction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,21 +31,21 @@ #include "interaction/preventduplicateinteraction.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -53,13 +53,13 @@ namespace framework{ namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler") //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 14357a8d13bc..d5d11ebc2097 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "interaction/quietinteraction.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> @@ -54,7 +54,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -63,17 +63,17 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ DEFINE_XINTERFACE_2( QuietInteraction , diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/jobs/configaccess.cxx index 39ee0f9b66e5..95226268ce2b 100644 --- a/framework/source/jobs/configaccess.cxx +++ b/framework/source/jobs/configaccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/configaccess.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -38,7 +38,7 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -46,23 +46,23 @@ #include <com/sun/star/util/XChangesBatch.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations //________________________________ /** diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index af4675ed354a..93ea64e94cb4 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,18 +98,18 @@ DEFINE_INIT_SERVICE(HelpOnStartup, m_xModuleManager = css::uno::Reference< css::frame::XModuleManager >( m_xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + m_xDesktop = css::uno::Reference< css::frame::XFrame >( m_xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); - + m_xConfig = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_PACKAGE_MODULES, ::comphelper::ConfigurationHelper::E_READONLY), css::uno::UNO_QUERY_THROW); - + // ask for office locale ::comphelper::ConfigurationHelper::readDirectKey( m_xSMGR, @@ -117,7 +117,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup, CFG_PATH_L10N, CFG_KEY_LOCALE, ::comphelper::ConfigurationHelper::E_READONLY) >>= m_sLocale; - + // detect system ::comphelper::ConfigurationHelper::readDirectKey( m_xSMGR, @@ -125,7 +125,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup, CFG_PATH_HELP, CFG_KEY_HELPSYSTEM, ::comphelper::ConfigurationHelper::E_READONLY) >>= m_sSystem; - + // Start listening for disposing events of these services, // so we can react e.g. for an office shutdown css::uno::Reference< css::lang::XComponent > xComponent; @@ -140,7 +140,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup, xComponent->addEventListener(static_cast< css::lang::XEventListener* >(this)); } ) - + //----------------------------------------------- HelpOnStartup::HelpOnStartup(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase( ) @@ -172,7 +172,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea // check current state of the help module // a) help isnt open => show default page for the detected module // b) help shows any other default page(!) => show default page for the detected module - // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) + // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) ::rtl::OUString sCurrentHelpURL = its_getCurrentHelpURL(); sal_Bool bCurrentHelpURLIsAnyDefaultURL = its_isHelpUrlADefaultOne(sCurrentHelpURL); sal_Bool bShowIt = sal_False; diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index e8961b0f9703..7ae2452874be 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/job.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -37,7 +37,7 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XAsyncJob.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> @@ -45,23 +45,23 @@ #include <com/sun/star/lang/DisposedException.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations DEFINE_XINTERFACE_4( Job , OWeakObject , diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx index 4b895c60ca77..b71a68342a69 100644 --- a/framework/source/jobs/jobconst.cxx +++ b/framework/source/jobs/jobconst.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,29 +29,29 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobconst.hxx> //________________________________ -// interface includes +// interface includes //________________________________ -// includes of other projects +// includes of other projects //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB() { diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 6d48c3c2ac3f..4acbce44f831 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobdata.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -38,21 +38,21 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <tools/wldcrd.hxx> #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //________________________________ -// namespace +// namespace namespace framework{ @@ -81,10 +81,10 @@ const sal_Char* JobData::PROP_MODEL = "Model" const sal_Char* JobData::PROP_SERVICE = "Service" ; //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations //________________________________ /** diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index b9e7f6ee1da0..b2c5399d0216 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobdispatch.hxx> #include <jobs/joburl.hxx> #include <jobs/job.hxx> @@ -41,28 +41,28 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations DEFINE_XINTERFACE_6( JobDispatch , OWeakObject , diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 5bb7acc7c9f2..e3a6122d4938 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobexecutor.hxx> #include <jobs/job.hxx> #include <jobs/joburl.hxx> @@ -44,13 +44,13 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XContainer.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> @@ -58,18 +58,18 @@ #include <rtl/logfile.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations DEFINE_XINTERFACE_6( JobExecutor , OWeakObject , @@ -270,7 +270,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent aReadLock.lock(); const JobData::TJob2DocEventBinding& rBinding = *pIt; - + JobData aCfg(m_xSMGR); aCfg.setEvent(rBinding.m_sDocEvent, rBinding.m_sJobName); aCfg.setEnvironment(JobData::E_DOCUMENTEVENT); diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 98b657794f03..375a3e5fc4d6 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobresult.hxx> #include <jobs/jobconst.hxx> @@ -39,28 +39,28 @@ #include <services.h> //________________________________ -// interface includes +// interface includes //________________________________ -// includes of other projects +// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequenceashashmap.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations //________________________________ /** @@ -139,7 +139,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) return; ::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.end(); - + pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB()); if (pIt != aProtocol.end()) { @@ -147,7 +147,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) if (m_bDeactivate) m_eParts |= E_DEACTIVATE; } - + pIt = aProtocol.find(JobConst::ANSWER_SAVE_ARGUMENTS()); if (pIt != aProtocol.end()) { diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 085fc7d46674..59e6384a0e93 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index e6905f77ed31..b7b6d370bb40 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ DEFINE_INIT_SERVICE(ShellJob, */ } ) - + //----------------------------------------------- ShellJob::ShellJob(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase( ) @@ -120,7 +120,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N // replace all might existing place holder. ::rtl::OUString sRealCommand = impl_substituteCommandVariables(sCommand); - + // Command is required as minimum. // If it does not exists ... we cant do our job. // Deactivate such miss configured job silently .-) @@ -131,12 +131,12 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N ::sal_Bool bDone = impl_execute(sRealCommand, lCommandArguments, bCheckExitCode); if (! bDone) return css::uno::Any(); - + // Job was done ... user configured deactivation of this job // in such case. if (bDeactivateJobIfDone) return ShellJob::impl_generateAnswer4Deactivation(); - + // There was no decision about deactivation of this job. // So we have to return nothing here ! return css::uno::Any(); @@ -164,9 +164,9 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() try { css::uno::Reference< css::util::XStringSubstitution > xSubst ( xSMGR->createInstance(SERVICENAME_SUBSTITUTEPATHVARIABLES), css::uno::UNO_QUERY_THROW); - const ::sal_Bool bSubstRequired = sal_True; - const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); - + const ::sal_Bool bSubstRequired = sal_True; + const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); + return sCompleteCommand; } catch(const css::uno::Exception&) @@ -187,7 +187,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() if (nArgs > 0) pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< ::rtl::OUString* >(lArguments.getConstArray())); - + oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs, nOptions, NULL, NULL, NULL, 0, &hProcess); // executable not found or couldnt be started diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 1b0cd5717ad9..f72759891acb 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ // #include <math.h> @@ -54,7 +54,7 @@ #include <uiconfiguration/globalsettings.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -82,7 +82,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <tools/diagnose_ex.h> @@ -103,7 +103,7 @@ #include <algorithm> #include <boost/bind.hpp> // ______________________________________________ -// using namespace +// using namespace using namespace ::com::sun::star; using namespace com::sun::star::uno; @@ -130,7 +130,7 @@ bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rect bool bRet = xUIElement.is(); if ( bRet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); _xWindow.set( xUIElement->getRealInterface(), UNO_QUERY ); _rPosSize = _xWindow->getPosSize(); @@ -159,7 +159,7 @@ static WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ) } //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -346,14 +346,14 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** IMPLEMENT_FORWARD_XTYPEPROVIDER2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) IMPLEMENT_FORWARD_XINTERFACE2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) -DEFINE_XSERVICEINFO_MULTISERVICE ( LayoutManager , +DEFINE_XSERVICEINFO_MULTISERVICE ( LayoutManager , ::cppu::OWeakObject , - SERVICENAME_LAYOUTMANAGER , + SERVICENAME_LAYOUTMANAGER , IMPLEMENTATIONNAME_LAYOUTMANAGER ) @@ -455,7 +455,7 @@ void LayoutManager::impl_clearUpMenuBar() // Clear up VCL menu bar to prepare shutdown if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -828,7 +828,7 @@ void LayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbxResName Reference< XUIElement > xUIElement = getElement( aTbxResName ); if ( xUIElement.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -1011,7 +1011,7 @@ void LayoutManager::implts_createAddonsToolBars() if ( xWindow.is() ) { // Set generic title for add-on toolbar - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow->GetText().Len() == 0 ) pWindow->SetText( aGenericAddonTitle ); @@ -1126,7 +1126,7 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive if ( xDockWindow.is() && xWindow.is() ) { sal_Bool bVisible( sal_True ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) bVisible = pWindow->IsVisible(); @@ -1613,7 +1613,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( xDockWindow.is() && xWindow.is() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -1640,7 +1640,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< { if ( pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); String aText = pWindow->GetText(); if ( aText.Len() == 0 ) pWindow->SetText( rElement.m_aUIName ); @@ -1689,7 +1689,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< implts_writeWindowStateData( rElement.m_aName, rElement ); if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } @@ -1702,7 +1702,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( pToolBox ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); pToolBox->SetLineCount( 1 ); if ( rElement.m_aDockedData.m_bLocked ) @@ -1730,7 +1730,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow->Show( sal_True ); } } @@ -1757,7 +1757,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< Window* pContainerWindow( 0 ); if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos ); @@ -1781,7 +1781,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY ); if ( xDockWindow.is() && xDockWindow->isFloating() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -1816,7 +1816,7 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const :: { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pDockingWindow = VCLUnoHelper::GetWindow( xDockingWindow ); if ( pDockingWindow ) aDockingWinSize = pDockingWindow->GetOutputSizePixel(); @@ -1961,7 +1961,7 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const :: aReadLock.unlock(); // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) return pContainerWindow->GetOutputSizePixel(); @@ -2207,7 +2207,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY ); if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating ) @@ -2383,7 +2383,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea aReadLock.unlock(); // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); // Retrieve output size from container Window Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow )); @@ -2518,7 +2518,7 @@ LayoutManager::implts_determineDockingOperation( Window* pDockingAreaWindow( 0 ); Window* pContainerWindow( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); nDockPosY = pDockingAreaWindow->ScreenToOutputPixel( @@ -2560,7 +2560,7 @@ void LayoutManager::implts_calcDockingPosSize( { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aContainerWinSize = pContainerWindow->GetOutputSizePixel(); } @@ -2594,7 +2594,7 @@ void LayoutManager::implts_calcDockingPosSize( aReadLock.unlock(); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pDockWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX ) @@ -2646,7 +2646,7 @@ void LayoutManager::implts_calcDockingPosSize( { // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() ))); } @@ -2745,7 +2745,7 @@ void LayoutManager::implts_calcDockingPosSize( // Set virtual position sal_Int32 nPosY( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y(); } @@ -2871,7 +2871,7 @@ void LayoutManager::implts_calcDockingPosSize( rTrackingRect.setWidth( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); nPosX = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X(); } @@ -2919,7 +2919,7 @@ void LayoutManager::implts_calcDockingPosSize( rTrackingRect.setHeight( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y(); } @@ -3143,7 +3143,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); const sal_uInt32 nCount = aWinVector.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -3166,12 +3166,12 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) Reference< XUIElement > xMenuBar( m_xMenuBar, UNO_QUERY ); Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow ); Reference< XComponent > xInplaceMenuBar( m_xInplaceMenuBar ); - MenuBarManager* pInplaceMenuBar( m_pInplaceMenuBar ); + MenuBarManager* pInplaceMenuBar( m_pInplaceMenuBar ); aReadLock.unlock(); if (( xMenuBar.is() || xInplaceMenuBar.is() ) && xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); MenuBar* pMenuBar( 0 ); if ( xInplaceMenuBar.is() ) @@ -3349,7 +3349,7 @@ void LayoutManager::implts_createProgressBar() { Reference< css::awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow ); if ( !pStatusBarWnd ) { @@ -3439,7 +3439,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pParentWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pParentWindow && ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )) @@ -3480,7 +3480,7 @@ sal_Bool LayoutManager::implts_showProgressBar() } aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -3522,7 +3522,7 @@ sal_Bool LayoutManager::implts_hideProgressBar() bHideStatusBar = !m_aStatusBarElement.m_bVisible; aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() && ( bHideStatusBar || bInternalStatusBar )) @@ -3549,7 +3549,7 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState ) { Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && !pWindow->IsVisible() ) { @@ -3575,7 +3575,7 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState ) { Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -3595,7 +3595,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( !m_bInplaceMenuSet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); // Reset old inplace menubar! m_pInplaceMenuBar = 0; @@ -3645,7 +3645,7 @@ throw (::com::sun::star::uno::RuntimeException) // if ( m_xMenuBar.is() && if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -3832,7 +3832,7 @@ throw ( RuntimeException ) if ( xDockingAreaAcceptor.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); ::DockingAreaWindow* pWindow; pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP ); @@ -3927,7 +3927,7 @@ void LayoutManager::implts_reparentChildWindows() } } - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pTopDockWindow = VCLUnoHelper::GetWindow( xTopDockWindow ); Window* pBottomDockWindow = VCLUnoHelper::GetWindow( xBottomDockWindow ); @@ -4182,7 +4182,7 @@ throw (RuntimeException) { if ( aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ) && !bInPlaceMenu ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); // PB 2004-12-15 #i38743# don't create a menubar if frame isn't top if ( !m_xMenuBar.is() && implts_isFrameOrWindowTop(xFrame) ) m_xMenuBar = implts_createElement( aName ); @@ -4437,7 +4437,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( xUIElement.is() ) { // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -4491,7 +4491,7 @@ throw (::com::sun::star::uno::RuntimeException) aWriteLock.unlock(); // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow && !pWindow->IsReallyVisible() ) { @@ -4680,7 +4680,7 @@ throw (RuntimeException) if ( xDockWindow.is() && bShowElement ) { // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) { @@ -4749,7 +4749,7 @@ throw (RuntimeException) if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -4864,7 +4864,7 @@ throw (RuntimeException) ToolBox* pToolBox( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -4883,7 +4883,7 @@ throw (RuntimeException) // we have to find a good place for it. ::Size aSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); { if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) ); @@ -5224,7 +5224,7 @@ throw (RuntimeException) { aReadLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -5781,7 +5781,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin css::awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i]; ::Size aMinSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); { Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -5850,7 +5850,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin else if ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ) nStartOffset = pDockAreaWindow->GetSizePixel().Height() - rRowColumnWindowData.nStaticSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); for ( sal_uInt32 i = 0; i < nCount; i++ ) { Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; @@ -5957,7 +5957,7 @@ css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes() Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY ); if ( xWindow.is() && xDockWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() && !xDockWindow->isFloating() ) @@ -6116,7 +6116,7 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const css::awt::Rectangle& } //--------------------------------------------------------------------------------------------------------- -// XMenuCloser +// XMenuCloser //--------------------------------------------------------------------------------------------------------- void LayoutManager::implts_updateMenuBarClose() { @@ -6128,7 +6128,7 @@ void LayoutManager::implts_updateMenuBarClose() if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -6175,7 +6175,7 @@ sal_Bool LayoutManager::implts_resetMenuBar() aWriteLock.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -6293,7 +6293,7 @@ IMPL_LINK( LayoutManager, SettingsChanged, void*, EMPTYARG ) } //--------------------------------------------------------------------------------------------------------- -// XDockableWindowListener +// XDockableWindowListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException) { @@ -6309,7 +6309,7 @@ void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingE Window* pWindow( 0 ); ::Point aMousePos; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )); } @@ -6328,7 +6328,7 @@ void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingE aUIElement.m_aFloatingData.m_aPos = ::Point( aPos.X, aPos.Y ); aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -6401,7 +6401,7 @@ throw (::com::sun::star::uno::RuntimeException) { try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); sal_Int16 eDockingArea( -1 ); // none sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK ); @@ -6612,7 +6612,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( bDockingInProgress ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( Reference< css::awt::XWindow >( e.Source, UNO_QUERY )); ToolBox* pToolBox = 0; if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) @@ -6677,7 +6677,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( xDockWindow->isFloating() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -6722,7 +6722,7 @@ throw (::com::sun::star::uno::RuntimeException) Reference< css::awt::XWindow2 > xWindow; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); xWindow = Reference< css::awt::XWindow2 >( e.Source, UNO_QUERY ); pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -6744,7 +6744,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( aUIDockingElement.m_bFloating ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) { pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines ); @@ -6787,7 +6787,7 @@ throw (::com::sun::star::uno::RuntimeException) ::Size aSize; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) ); else @@ -6801,7 +6801,7 @@ throw (::com::sun::star::uno::RuntimeException) aUIDockingElement.m_aDockedData.m_aPos = aDockPos; } - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) { pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) ); @@ -6827,7 +6827,7 @@ throw (::com::sun::star::uno::RuntimeException) } else { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) { if ( aUIDockingElement.m_bFloating ) @@ -6928,7 +6928,7 @@ void LayoutManager::implts_notifyListeners( short nEvent, ::com::sun::star::uno: } //--------------------------------------------------------------------------------------------------------- -// XWindowListener +// XWindowListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL LayoutManager::windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ) @@ -7121,7 +7121,7 @@ void LayoutManager::implts_checkElementContainer() #endif //--------------------------------------------------------------------------------------------------------- -// XFrameActionListener +// XFrameActionListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) @@ -7341,7 +7341,7 @@ void SAL_CALL LayoutManager::elementInserted( const ::com::sun::star::ui::Config } { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -7466,7 +7466,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ::com::sun::star::ui::Config } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper +// OPropertySetHelper //--------------------------------------------------------------------------------------------------------- // XPropertySet helper sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any& aConvertedValue , diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 68683df34cfd..75bcc4c4587f 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1777,7 +1777,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X else pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 ); } - + /* #i19976# We tried to prevent a toFront() call in case the user putted the loading document into the background .. diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 271532f7b08c..6abd17aa0efa 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 11b153298167..7716fb45e791 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index beaaa2eb4bd1..5632e950262a 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,11 +97,11 @@ DEFINE_INIT_SERVICE( it's not neccessary to do anything here. */ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // init baseclasses first! - // Attention: Don't change order of initialization! + // init baseclasses first! + // Attention: Don't change order of initialization! : ThreadHelpBase ( &Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) - // init member + // init member , m_xDispatchRecorder( NULL ) , m_xFactory ( xFactory ) { @@ -218,4 +218,4 @@ void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL& } } -} // namespace framework +} // namespace framework diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index e9c63ac04ede..0d93c775ff7e 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -47,11 +47,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -63,14 +63,14 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::HelpOnStartup ) - COMPONENTINFO( ::framework::TabWinFactory ) - COMPONENTINFO( ::framework::SystemExec ) - COMPONENTINFO( ::framework::ShellJob ) +COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::HelpOnStartup ) + COMPONENTINFO( ::framework::TabWinFactory ) + COMPONENTINFO( ::framework::SystemExec ) + COMPONENTINFO( ::framework::ShellJob ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else - IFFACTORY( ::framework::TabWinFactory ) else - IFFACTORY( ::framework::SystemExec ) else - IFFACTORY( ::framework::ShellJob ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else + IFFACTORY( ::framework::TabWinFactory ) else + IFFACTORY( ::framework::SystemExec ) else + IFFACTORY( ::framework::ShellJob ) ) diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 166f489b94c0..55e13252570f 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -48,11 +48,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -64,8 +64,8 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::LoginDialog ) +COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::LoginDialog ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 297431d80f1d..6e3fa878bbb1 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -47,11 +47,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -118,7 +118,7 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) - COMPONENTINFO( ::framework::Desktop ) + COMPONENTINFO( ::framework::Desktop ) COMPONENTINFO( ::framework::Frame ) //COMPONENTINFO( ::framework::Oxt_Handler ) COMPONENTINFO( ::framework::JobExecutor ) @@ -173,12 +173,12 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer //COMPONENTINFO( ::framework::LanguageSelectionMenuController ) //COMPONENTINFO( ::framework::TabWindowService ) COMPONENTINFO( ::framework::WindowContentFactoryManager ) - COMPONENTINFO( ::framework::SubstitutePathVariables ) - COMPONENTINFO( ::framework::PathSettings ) + COMPONENTINFO( ::framework::SubstitutePathVariables ) + COMPONENTINFO( ::framework::PathSettings ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else - IFFACTORY( ::framework::Desktop ) else +COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else + IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else //IFFACTORY( ::framework::Oxt_Handler ) else IFFACTORY( ::framework::JobExecutor ) else @@ -187,7 +187,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else //IFFACTORY( ::framework::MailToDispatcher ) else //IFFACTORY( ::framework::ServiceHandler ) else IFFACTORY( ::framework::JobDispatch ) else - IFFACTORY( ::framework::BackingComp ) else + IFFACTORY( ::framework::BackingComp ) else //IFFACTORY( ::framework::DispatchHelper ) else IFFACTORY( ::framework::LayoutManager ) else //IFFACTORY( ::framework::License ) else @@ -213,18 +213,18 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::AddonsToolBoxFactory ) else IFFACTORY( ::framework::WindowStateConfiguration ) else IFFACTORY( ::framework::ToolbarControllerFactory ) else - //IFFACTORY( ::framework::ToolbarsMenuController ) else + //IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::AutoRecovery ) else - IFFACTORY( ::framework::StatusIndicatorFactory ) else + IFFACTORY( ::framework::StatusIndicatorFactory ) else IFFACTORY( ::framework::RecentFilesMenuController ) else IFFACTORY( ::framework::StatusBarFactory ) else - IFFACTORY( ::framework::UICategoryDescription ) else - IFFACTORY( ::framework::SessionListener ) else + IFFACTORY( ::framework::UICategoryDescription ) else + IFFACTORY( ::framework::SessionListener ) else IFFACTORY( ::framework::StatusbarControllerFactory ) else IFFACTORY( ::framework::SessionListener ) else //IFFACTORY( ::framework::LogoImageStatusbarController ) else - //IFFACTORY( ::framework::LogoTextStatusbarController ) else - IFFACTORY( ::framework::TaskCreatorService ) else + //IFFACTORY( ::framework::LogoTextStatusbarController ) else + IFFACTORY( ::framework::TaskCreatorService ) else //IFFACTORY( ::framework::NewMenuController ) else //IFFACTORY( ::framework::SimpleTextStatusbarController ) else //IFFACTORY( ::framework::UriAbbreviation ) else @@ -234,7 +234,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else //IFFACTORY( ::framework::LanguageSelectionMenuController ) else IFFACTORY( ::framework::WindowContentFactoryManager ) else //IFFACTORY( ::framework::TabWindowService ) else - IFFACTORY( ::framework::SubstitutePathVariables ) else - IFFACTORY( ::framework::PathSettings ) + IFFACTORY( ::framework::SubstitutePathVariables ) else + IFFACTORY( ::framework::PathSettings ) ) diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index b4a1252ffa70..7382380ef525 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -47,11 +47,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -82,7 +82,7 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) +COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) COMPONENTINFO( ::framework::MailToDispatcher ) COMPONENTINFO( ::framework::NewMenuController ) COMPONENTINFO( ::framework::ToolbarsMenuController ) @@ -104,13 +104,13 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) COMPONENTINFO( ::framework::DispatchRecorderSupplier ) COMPONENTINFO( ::framework::Oxt_Handler ) COMPONENTINFO( ::framework::License ) - COMPONENTINFO( ::framework::PopupMenuController ) + COMPONENTINFO( ::framework::PopupMenuController ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else - IFFACTORY( ::framework::LogoTextStatusbarController ) else + IFFACTORY( ::framework::LogoTextStatusbarController ) else IFFACTORY( ::framework::LogoImageStatusbarController ) else IFFACTORY( ::framework::License ) else IFFACTORY( ::framework::PopupMenuDispatcher ) else @@ -119,7 +119,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::DispatchRecorder ) else IFFACTORY( ::framework::DispatchRecorderSupplier ) else IFFACTORY( ::framework::SimpleTextStatusbarController ) else - IFFACTORY( ::framework::ToolbarsMenuController ) else + IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::FontMenuController ) else IFFACTORY( ::framework::MacrosMenuController ) else IFFACTORY( ::framework::NewMenuController ) else @@ -128,6 +128,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::FooterMenuController ) else IFFACTORY( ::framework::HeaderMenuController ) else IFFACTORY( ::framework::LanguageSelectionMenuController ) else - IFFACTORY( ::framework::Oxt_Handler ) else - IFFACTORY( ::framework::PopupMenuController ) + IFFACTORY( ::framework::Oxt_Handler ) else + IFFACTORY( ::framework::PopupMenuController ) ) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 41dbe9b6030b..c4cc7149ab6d 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -516,8 +516,8 @@ DEFINE_XINTERFACE_10(AutoRecovery DIRECT_INTERFACE (css::lang::XServiceInfo ), DIRECT_INTERFACE (css::frame::XDispatch ), DIRECT_INTERFACE (css::beans::XMultiPropertySet ), - DIRECT_INTERFACE (css::beans::XFastPropertySet ), - DIRECT_INTERFACE (css::beans::XPropertySet ), + DIRECT_INTERFACE (css::beans::XFastPropertySet ), + DIRECT_INTERFACE (css::beans::XPropertySet ), DIRECT_INTERFACE (css::document::XEventListener ), DIRECT_INTERFACE (css::util::XChangesListener ), DIRECT_INTERFACE (css::util::XModifyListener ), @@ -3343,7 +3343,7 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUSt //----------------------------------------------- sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*aConvertedValue*/, css::uno::Any& /*aOldValue*/ , - sal_Int32 /*nHandle*/ , + sal_Int32 /*nHandle*/ , const css::uno::Any& /*aValue*/ ) throw(css::lang::IllegalArgumentException) { diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index f59ea721ecf2..13c5647341e6 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -513,7 +513,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // create the menu bar for the backing component css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; + xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; if (xLayoutManager.is()) { xLayoutManager->lock(); @@ -525,11 +525,11 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f xLayoutManager->showElement ( DECLARE_ASCII( "private:resource/statusbar/statusbar" )); */ xLayoutManager->unlock(); - } + } // set help ID for our canvas pWindow->SetHelpId(HID_BACKINGWINDOW); - + // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); if( pBack ) @@ -660,7 +660,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven { // Attention: dont free m_pAccExec here! see comments inside dtor and // keyPressed() for further details. - + /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -839,7 +839,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno xBroadcaster->addEventListener(static_cast< css::lang::XEventListener* >(this)); m_xWindow->setVisible(sal_True); - + aWriteLock.unlock(); /* } SAFE */ } diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 8817e60e9273..8bb5ca5cbeaf 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) : } String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) ); - String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) ); String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) ); String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) ); @@ -214,12 +213,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) : maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) ); maToolbox.ShowItem( nItemId_Extensions ); - maToolbox.InsertItem( nItemId_Reg, Image() ); - maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText ); - maToolbox.SetItemText( nItemId_Reg, aRegHelpText ); - maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) ); - maToolbox.ShowItem( nItemId_Reg ); - maToolbox.InsertItem( nItemId_Info, Image() ); maToolbox.SetItemText( nItemId_Info, aInfoHelpText ); maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText ); @@ -247,7 +240,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : // add some breathing space for the images maButtonImageSize.Width() += 12; maButtonImageSize.Height() += 12; - + } @@ -288,12 +281,12 @@ void BackingWindow::prepareRecentFileMenu() mpRecentMenu = new PopupMenu(); mpRecentMenu->Clear(); maRecentFiles.clear(); - + // get recent file list and dispatch arguments Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) ); sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); - + if( ( nPickListMenuItems > 0 ) ) { maRecentFiles.reserve( nPickListMenuItems ); @@ -301,11 +294,11 @@ void BackingWindow::prepareRecentFileMenu() { Sequence< PropertyValue >& rPickListEntry = aHistoryList[i]; rtl::OUString aURL, aFilter, aFilterOpt, aTitle; - + for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ ) { const Any& a = rPickListEntry[j].Value; - + if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL ) a >>= aURL; else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER ) @@ -332,7 +325,7 @@ void BackingWindow::prepareRecentFileMenu() nArgs--; rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); rArgsList[nArgs].Value = makeAny( aFilter ); - + if( aFilterOpt.getLength() ) { nArgs--; @@ -348,20 +341,20 @@ void BackingWindow::prepareRecentFileMenu() nArgs--; rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) ); - + // and finally create an entry in the popupmenu - rtl::OUString aMenuTitle; - INetURLObject aURLObj( aURL ); - + rtl::OUString aMenuTitle; + INetURLObject aURLObj( aURL ); + if ( aURLObj.GetProtocol() == INET_PROT_FILE ) { // Do handle file URL differently => convert it to a system // path and abbreviate it with a special function: String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); - - rtl::OUString aSystemPath( aFileSystemPath ); - rtl::OUString aCompactedSystemPath; - + + rtl::OUString aSystemPath( aFileSystemPath ); + rtl::OUString aCompactedSystemPath; + oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); if ( !nError ) aMenuTitle = String( aCompactedSystemPath ); @@ -401,9 +394,9 @@ void BackingWindow::initBackground() maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE ); else if( mnLayoutStyle == 1 ) maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK ); - else + else maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 ); - + Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE ); // select image set @@ -431,7 +424,6 @@ void BackingWindow::initBackground() maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) ); } maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) ); - maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) ); maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) ); maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) ); @@ -457,7 +449,7 @@ void BackingWindow::initBackground() loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton ); loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton ); loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton ); - + maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED ); maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) ); maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) ); @@ -520,7 +512,7 @@ void BackingWindow::initControls() if( mnLayoutStyle == 1 ) { - maWelcome.Show(); + maWelcome.Show(); maProduct.Show(); } @@ -531,7 +523,7 @@ void BackingWindow::initControls() maTextFont.SetWeight( WEIGHT_NORMAL ); // collect the URLs of the entries in the File/New menu - SvtModuleOptions aModuleOptions; + SvtModuleOptions aModuleOptions; std::set< rtl::OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); @@ -591,19 +583,19 @@ void BackingWindow::initControls() maMathButton, aMnemns ); nYPos += 3*maButtonImageSize.Height() / 2; - + layoutButton( NULL, 0, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, maOpenButton, aMnemns, maOpenString ); layoutButton( NULL, 1, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, - maTemplateButton, aMnemns, maTemplateString ); + maTemplateButton, aMnemns, maTemplateString ); nYPos += 10; DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" ); if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 > maControlRect.GetWidth() ) maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20; - + mnTextColumnWidth[0] = mnColumnWidth[0]; mnTextColumnWidth[1] = mnColumnWidth[1]; @@ -645,7 +637,7 @@ void BackingWindow::initControls() maBackgroundMiddle = BitmapEx(); Resize(); - + maWriterButton.GrabFocus(); } @@ -684,7 +676,7 @@ void BackingWindow::layoutButton( String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) ); i_rMnemns.CreateMnemonic( aText ); i_rBtn.SetText( aText ); - + long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() ); nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side @@ -807,7 +799,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt ) else if( maDBButton.HasFocus() ) maMathButton.GrabFocus(); else if( maMathButton.HasFocus() ) - maTemplateButton.GrabFocus(); + maTemplateButton.GrabFocus(); return 1; } } @@ -869,7 +861,7 @@ void BackingWindow::Resize() nYPos += nPDelta - nDiff; nYPos += nWDelta/2 - nDiff; - + if( mnLayoutStyle != 1 ) nYPos = maControlRect.Top() + mnBtnTop; @@ -949,7 +941,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) //throws css::container::NoSuchElementException, css::lang::WrappedTargetException Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) ); sURL = value.get<rtl::OUString> (); - + // extend the URLs with Office locale argument INetURLObject aURLObj( sURL ); @@ -964,7 +956,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup"); ::rtl::OUString sRelPath = ::rtl::OUString::createFromAscii("L10N"); ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooLocale"); - + try { ::comphelper::ConfigurationHelper::readDirectKey(comphelper::getProcessServiceFactory(), @@ -981,7 +973,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) aURLBuf.append(sLocale); sParam = aURLBuf.makeStringAndClear(); - + aURLObj.SetParam( sParam ); sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index c81c975a3305..958ebfbb243e 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ namespace framework rtl::OUString aTargetURL; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aArgSeq; }; - + com::sun::star::uno::Reference<com::sun::star::frame::XDesktop> mxDesktop; com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider > mxDesktopDispatchProvider; com::sun::star::uno::Reference<com::sun::star::frame::XFrame> mxFrame; @@ -129,7 +129,7 @@ namespace framework svt::AcceleratorExecute* mpAccExec; long mnBtnPos; long mnBtnTop; - + PopupMenu* mpRecentMenu; std::vector< LoadRecentFile > maRecentFiles; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 6a07b7fda063..293e03ee655b 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <loadenv/loadenv.hxx> @@ -58,7 +58,7 @@ #include <classes/fwkresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -86,7 +86,7 @@ #include <com/sun/star/frame/XTerminateListener2.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> @@ -102,25 +102,25 @@ #include <comphelper/extract.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_15 ( Desktop , OWeakObject , @@ -137,7 +137,7 @@ DEFINE_XINTERFACE_15 ( Desktop DIRECT_INTERFACE( css::frame::XDispatchResultListener ), DIRECT_INTERFACE( css::lang::XEventListener ), DIRECT_INTERFACE( css::task::XInteractionHandler ), - DIRECT_INTERFACE( css::beans::XPropertySet ), + DIRECT_INTERFACE( css::beans::XPropertySet ), DIRECT_INTERFACE( css::frame::XUntitledNumbers ) ) @@ -238,7 +238,7 @@ DEFINE_INIT_SERVICE ( Desktop, @onerror We throw an ASSERT in debug version or do nothing in relaese version. *//*-*************************************************************************************************************/ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first // Attention: Don't change order of initialization! // ThreadHelpBase is a struct with a lock as member. We can't use a lock as direct member! // We must garant right initialization and a valid value of this to initialize other baseclasses! @@ -259,7 +259,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& , m_eLoadState ( E_NOTSET ) , m_xLastFrame ( ) , m_aInteractionRequest ( ) - , m_bSuspendQuickstartVeto( sal_False ) + , m_bSuspendQuickstartVeto( sal_False ) , m_aCommandOptions ( ) , m_sName ( ) , m_sTitle ( ) @@ -276,15 +276,15 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& } /*-************************************************************************************************************//** - @short standard destructor - @descr This one do NOTHING! Use dispose() instaed of this. + @short standard destructor + @descr This one do NOTHING! Use dispose() instaed of this. - @seealso method dispose() + @seealso method dispose() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*************************************************************************************************************/ Desktop::~Desktop() { @@ -300,15 +300,15 @@ sal_Bool SAL_CALL Desktop::terminate() SYNCHRONIZED_START ReadGuard aReadLock( m_aLock ); - + css::uno::Reference< css::frame::XTerminateListener > xPipeTerminator = m_xPipeTerminator; css::uno::Reference< css::frame::XTerminateListener > xQuickLauncher = m_xQuickLauncher; css::uno::Reference< css::frame::XTerminateListener > xSWThreadManager = m_xSWThreadManager; css::uno::Reference< css::frame::XTerminateListener > xSfxTerminator = m_xSfxTerminator; - + css::lang::EventObject aEvent ( static_cast< ::cppu::OWeakObject* >(this) ); - ::sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto ; - + ::sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto ; + aReadLock.unlock(); SYNCHRONIZED_END @@ -362,25 +362,25 @@ sal_Bool SAL_CALL Desktop::terminate() xQuickLauncher->queryTermination( aEvent ); lCalledTerminationListener.push_back( xQuickLauncher ); } - + if ( xSWThreadManager.is() ) { xSWThreadManager->queryTermination( aEvent ); lCalledTerminationListener.push_back( xSWThreadManager ); } - + if ( xPipeTerminator.is() ) { xPipeTerminator->queryTermination( aEvent ); lCalledTerminationListener.push_back( xPipeTerminator ); } - + if ( xSfxTerminator.is() ) { xSfxTerminator->queryTermination( aEvent ); lCalledTerminationListener.push_back( xSfxTerminator ); } - + bTerminate = sal_True; } catch(const css::frame::TerminationVetoException&) @@ -401,9 +401,9 @@ sal_Bool SAL_CALL Desktop::terminate() aWriteLock.unlock(); /* UNSAFE AREA ------------------------------------------------------------------------------------- */ #endif - + impl_sendNotifyTerminationEvent(); - + if( ( bAskQuickStart ) && ( xQuickLauncher.is() ) @@ -411,19 +411,19 @@ sal_Bool SAL_CALL Desktop::terminate() { xQuickLauncher->notifyTermination( aEvent ); } - + if ( xSWThreadManager.is() ) xSWThreadManager->notifyTermination( aEvent ); - + if ( xPipeTerminator.is() ) xPipeTerminator->notifyTermination( aEvent ); - + // Must be realy the last listener to be called. // Because it shutdown the whole process asynchronous ! if ( xSfxTerminator.is() ) xSfxTerminator->notifyTermination( aEvent ); } - + return bTerminate; } @@ -438,10 +438,10 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra if ( xInfo.is() ) { ::rtl::OUString sImplementationName = xInfo->getImplementationName(); - + // SYCNHRONIZED -> WriteGuard aWriteLock( m_aLock ); - + if( sImplementationName.equals(IMPLEMENTATIONNAME_SFXTERMINATOR) ) { m_xSfxTerminator = xListener; @@ -462,7 +462,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra m_xSWThreadManager = xListener; return; } - + aWriteLock.unlock(); // <- SYCNHRONIZED } @@ -481,34 +481,34 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css:: if ( xInfo.is() ) { ::rtl::OUString sImplementationName = xInfo->getImplementationName(); - + // SYCNHRONIZED -> WriteGuard aWriteLock( m_aLock ); - + if( sImplementationName.equals(IMPLEMENTATIONNAME_SFXTERMINATOR) ) { m_xSfxTerminator.clear(); return; } - + if( sImplementationName.equals(IMPLEMENTATIONNAME_PIPETERMINATOR) ) { m_xPipeTerminator.clear(); return; } - + if( sImplementationName.equals(IMPLEMENTATIONNAME_QUICKLAUNCHER) ) { m_xQuickLauncher.clear(); return; } - + if( sImplementationName.equals(IMPLEMENTATIONNAME_SWTHREADMANAGER) ) { m_xSWThreadManager.clear(); return; } - + aWriteLock.unlock(); // <- SYCNHRONIZED } @@ -1187,11 +1187,11 @@ void SAL_CALL Desktop::dispose() SYNCHRONIZED_START WriteGuard aWriteLock( m_aLock ); - + // Look for multiple calls of this method! // If somewhere call dispose() twice - he will be stopped here realy!!! TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - + // Now - we are alone and its the first call of this method ... // otherwise call before had thrown a DisposedException / hopefully .-) // But we dont use the transaction object created before ... we reset it immediatly ... @@ -1201,12 +1201,12 @@ void SAL_CALL Desktop::dispose() // are running within the same thread!) So we would block ourself there if aTransaction // will stay registered .-) aTransaction.stop(); - + // Disable this instance for further work. // This will wait for all current running transactions ... // and reject all new incoming requests! m_aTransactionManager.setWorkingMode( E_BEFORECLOSE ); - + aWriteLock.unlock(); SYNCHRONIZED_END @@ -1459,7 +1459,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); return m_xTitleNumberGenerator->leaseNumber (xComponent); } - + //----------------------------------------------------------------------------- void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, @@ -1519,8 +1519,8 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -1817,9 +1817,9 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ) ); if ( ! pContainer ) return; - + css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) ); - + ::cppu::OInterfaceIteratorHelper aIterator( *pContainer ); while ( aIterator.hasMoreElements() ) { @@ -1880,9 +1880,9 @@ void Desktop::impl_sendNotifyTerminationEvent() ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ) ); if ( ! pContainer ) return; - + css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) ); - + ::cppu::OInterfaceIteratorHelper aIterator( *pContainer ); while ( aIterator.hasMoreElements() ) { @@ -1954,7 +1954,7 @@ void Desktop::impl_sendNotifyTerminationEvent() // Any internal process of this frame disagree with our request. // Safe this state but dont break these loop. Other frames has to be closed! ++nNonClosedFrames; - + // Reactivate controller. // It can happen that XController.suspend() returned true ... but a registered close listener // throwed these veto exception. Then the controller has to be reactivated. Otherwise @@ -1965,18 +1965,18 @@ void Desktop::impl_sendNotifyTerminationEvent() ) xController->suspend(sal_False); } - + // If interface XClosable interface exists and was used ... // it's not allowed to use XComponent->dispose() also ! continue; } - + // XClosable not supported ? // Then we have to dispose these frame hardly. css::uno::Reference< css::lang::XComponent > xDispose( xFrame, css::uno::UNO_QUERY ); if ( xDispose.is() ) xDispose->dispose(); - + // Don't remove these frame from our child container! // A frame do it by itself inside close()/dispose() method. } @@ -1991,7 +1991,7 @@ void Desktop::impl_sendNotifyTerminationEvent() } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -2002,35 +2002,35 @@ void Desktop::impl_sendNotifyTerminationEvent() #ifdef ENABLE_ASSERTIONS //***************************************************************************************************************** -// We work with valid servicemanager only. +// We work with valid servicemanager only. sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) { return( - ( &xFactory == NULL ) || - ( xFactory.is() == sal_False ) + ( &xFactory == NULL ) || + ( xFactory.is() == sal_False ) ); } //***************************************************************************************************************** -// We work with valid listener only. +// We work with valid listener only. sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** -// We work with valid listener only. +// We work with valid listener only. sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index d6c7fe628888..be8e666ee9db 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index b2bd8494170c..08a7c522831b 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> #include <dispatch/dispatchprovider.hxx> @@ -55,7 +55,7 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -85,7 +85,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/queryinterface.hxx> @@ -113,45 +113,45 @@ #include <vcl/menu.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ css::uno::WeakReference< css::frame::XFrame > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame >(); //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_21 ( Frame , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::lang::XServiceInfo ), - DIRECT_INTERFACE(css::frame::XFramesSupplier ), - DIRECT_INTERFACE(css::frame::XFrame ), - DIRECT_INTERFACE(css::lang::XComponent ), - DIRECT_INTERFACE(css::task::XStatusIndicatorFactory ), - DIRECT_INTERFACE(css::frame::XDispatchProvider ), - DIRECT_INTERFACE(css::frame::XDispatchInformationProvider ), - DIRECT_INTERFACE(css::frame::XDispatchProviderInterception ), - DIRECT_INTERFACE(css::beans::XPropertySet ), - DIRECT_INTERFACE(css::beans::XPropertySetInfo ), - DIRECT_INTERFACE(css::awt::XWindowListener ), - DIRECT_INTERFACE(css::awt::XTopWindowListener ), - DIRECT_INTERFACE(css::awt::XFocusListener ), - DERIVED_INTERFACE(css::lang::XEventListener, css::awt::XWindowListener ), + OWeakObject , + DIRECT_INTERFACE(css::lang::XTypeProvider ), + DIRECT_INTERFACE(css::lang::XServiceInfo ), + DIRECT_INTERFACE(css::frame::XFramesSupplier ), + DIRECT_INTERFACE(css::frame::XFrame ), + DIRECT_INTERFACE(css::lang::XComponent ), + DIRECT_INTERFACE(css::task::XStatusIndicatorFactory ), + DIRECT_INTERFACE(css::frame::XDispatchProvider ), + DIRECT_INTERFACE(css::frame::XDispatchInformationProvider ), + DIRECT_INTERFACE(css::frame::XDispatchProviderInterception ), + DIRECT_INTERFACE(css::beans::XPropertySet ), + DIRECT_INTERFACE(css::beans::XPropertySetInfo ), + DIRECT_INTERFACE(css::awt::XWindowListener ), + DIRECT_INTERFACE(css::awt::XTopWindowListener ), + DIRECT_INTERFACE(css::awt::XFocusListener ), + DERIVED_INTERFACE(css::lang::XEventListener, css::awt::XWindowListener ), DIRECT_INTERFACE(css::document::XActionLockable ), DIRECT_INTERFACE(css::util::XCloseable ), DIRECT_INTERFACE(css::util::XCloseBroadcaster ), @@ -161,20 +161,20 @@ DEFINE_XINTERFACE_21 ( Frame ) DEFINE_XTYPEPROVIDER_20 ( Frame , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::frame::XFramesSupplier , - css::frame::XFrame , - css::lang::XComponent , - css::task::XStatusIndicatorFactory , - css::beans::XPropertySet , - css::beans::XPropertySetInfo , - css::frame::XDispatchProvider , - css::frame::XDispatchInformationProvider , - css::frame::XDispatchProviderInterception , - css::awt::XWindowListener , - css::awt::XTopWindowListener , - css::awt::XFocusListener , + css::lang::XTypeProvider , + css::lang::XServiceInfo , + css::frame::XFramesSupplier , + css::frame::XFrame , + css::lang::XComponent , + css::task::XStatusIndicatorFactory , + css::beans::XPropertySet , + css::beans::XPropertySetInfo , + css::frame::XDispatchProvider , + css::frame::XDispatchInformationProvider , + css::frame::XDispatchProviderInterception , + css::awt::XWindowListener , + css::awt::XTopWindowListener , + css::awt::XFocusListener , css::lang::XEventListener , css::util::XCloseable , css::util::XCloseBroadcaster , @@ -183,9 +183,9 @@ DEFINE_XTYPEPROVIDER_20 ( Frame css::frame::XTitleChangeBroadcaster ) -DEFINE_XSERVICEINFO_MULTISERVICE ( Frame , +DEFINE_XSERVICEINFO_MULTISERVICE ( Frame , ::cppu::OWeakObject , - SERVICENAME_FRAME , + SERVICENAME_FRAME , IMPLEMENTATIONNAME_FRAME ) @@ -254,8 +254,8 @@ DEFINE_INIT_SERVICE ( Frame, ) /*-****************************************************************************************************//** - @short standard constructor to create instance by factory - @descr This constructor initialize a new instance of this class by valid factory, + @short standard constructor to create instance by factory + @descr This constructor initialize a new instance of this class by valid factory, and will be set valid values on his member and baseclasses. @attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you @@ -268,11 +268,11 @@ DEFINE_INIT_SERVICE ( Frame, @seealso method DEFINE_INIT_SERVICE() - @param "xFactory" is the multi service manager, which create this instance. + @param "xFactory" is the multi service manager, which create this instance. The value must be different from NULL! - @return - + @return - - @onerror ASSERT in debug version or nothing in relaese version. + @onerror ASSERT in debug version or nothing in relaese version. *//*-*****************************************************************************************************/ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) : ThreadHelpBase ( &Application::GetSolarMutex() ) @@ -282,7 +282,7 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac &m_aTransactionManager, sal_False) // FALSE => dont release shared mutex on calling us! , ::cppu::OWeakObject ( ) - // init member + // init member , m_xFactory ( xFactory ) , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) , m_xParent ( ) @@ -306,15 +306,15 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac } /*-****************************************************************************************************//** - @short standard destructor - @descr This one do NOTHING! Use dispose() instaed of this. + @short standard destructor + @descr This one do NOTHING! Use dispose() instaed of this. - @seealso method dispose() + @seealso method dispose() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ Frame::~Frame() { @@ -365,17 +365,17 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR } /*-****************************************************************************************************//** - @short return access to append or remove childs on desktop - @descr We don't implement these interface directly. We use a helper class to do this. + @short return access to append or remove childs on desktop + @descr We don't implement these interface directly. We use a helper class to do this. If you wish to add or delete childs to/from the container, call these method to get a reference to the helper. - @seealso class OFrames + @seealso class OFrames - @param - - @return A reference to the helper which answer your queries. + @param - + @return A reference to the helper which answer your queries. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( css::uno::RuntimeException ) { @@ -400,19 +400,19 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs } /*-****************************************************************************************************//** - @short get the current active child frame - @descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop is accepted. + @short get the current active child frame + @descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop is accepted. We don't save this information directly in this class. We use ouer container-helper to do that. - @seealso class OFrameContainer - @seealso method setActiveFrame() + @seealso class OFrameContainer + @seealso method setActiveFrame() - @param - - @return A reference to ouer current active childframe, if anyone exist. - @return A null reference, if nobody is active. + @param - + @return A reference to ouer current active childframe, if anyone exist. + @return A null reference, if nobody is active. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw( css::uno::RuntimeException ) { @@ -429,16 +429,16 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw } /*-****************************************************************************************************//** - @short set the new active direct child frame - @descr It must be a frame to. Direct childs of frame are frames only! No task or desktop is accepted. + @short set the new active direct child frame + @descr It must be a frame to. Direct childs of frame are frames only! No task or desktop is accepted. We don't save this information directly in this class. We use ouer container-helper to do that. - @seealso class OFrameContainer - @seealso method getActiveFrame() + @seealso class OFrameContainer + @seealso method getActiveFrame() - @param "xFrame", reference to new active child. It must be an already existing child! - @return - + @param "xFrame", reference to new active child. It must be an already existing child! + @return - @onerror An assertion is thrown and element is ignored, if given frame is'nt already a child of us. *//*-*****************************************************************************************************/ @@ -543,19 +543,19 @@ void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutMana } /*-****************************************************************************************************//** - @short initialize frame instance - @descr A frame needs a window. This method set a new one ... but should called one times only! + @short initialize frame instance + @descr A frame needs a window. This method set a new one ... but should called one times only! We use this window to listen for window events and forward it to our set component. Its used as parent of component window too. - @seealso method getContainerWindow() - @seealso method setComponent() - @seealso member m_xContainerWindow + @seealso method getContainerWindow() + @seealso method setComponent() + @seealso member m_xContainerWindow - @param "xWindow", reference to new container window - must be valid! - @return - + @param "xWindow", reference to new container window - must be valid! + @return - - @onerror We do nothing. + @onerror We do nothing. *//*-*****************************************************************************************************/ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ) { @@ -637,18 +637,18 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& } /*-****************************************************************************************************//** - @short returns current set container window - @descr The ContainerWindow property is used as a container for the component + @short returns current set container window + @descr The ContainerWindow property is used as a container for the component in this frame. So this object implements a container interface too. The instantiation of the container window is done by the user of this class. The frame is the owner of its container window. - @seealso method initialize() + @seealso method initialize() - @param - - @return A reference to current set containerwindow. + @param - + @return A reference to current set containerwindow. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() throw( css::uno::RuntimeException ) { @@ -663,8 +663,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() th } /*-****************************************************************************************************//** - @short set parent frame - @descr We need a parent to support some functionality! e.g. findFrame() + @short set parent frame + @descr We need a parent to support some functionality! e.g. findFrame() By the way we use the chance to set an internal information about our top state. So we must not check this information during every isTop() call. We are top, if our parent is the desktop instance or we havent any parent. @@ -695,15 +695,15 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS } /*-****************************************************************************************************//** - @short returns current parent frame - @descr The Creator is the parent frame container. If it is NULL, the frame is the uppermost one. + @short returns current parent frame + @descr The Creator is the parent frame container. If it is NULL, the frame is the uppermost one. - @seealso method setCreator() + @seealso method setCreator() - @param - - @return A reference to current set parent frame container. + @param - + @return A reference to current set parent frame container. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() throw( css::uno::RuntimeException ) { @@ -718,15 +718,15 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() } /*-****************************************************************************************************//** - @short returns current set name of frame - @descr This name is used to find target of findFrame() or queryDispatch() calls. + @short returns current set name of frame + @descr This name is used to find target of findFrame() or queryDispatch() calls. - @seealso method setName() + @seealso method setName() - @param - - @return Current set name of frame. + @param - + @return Current set name of frame. - @onerror An empty string is returned. + @onerror An empty string is returned. *//*-*****************************************************************************************************/ ::rtl::OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException ) { @@ -737,18 +737,18 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() } /*-****************************************************************************************************//** - @short set new name for frame - @descr This name is used to find target of findFrame() or queryDispatch() calls. + @short set new name for frame + @descr This name is used to find target of findFrame() or queryDispatch() calls. - @attention Special names like "_blank", "_self" aren't allowed ... + @attention Special names like "_blank", "_self" aren't allowed ... "_beamer" or "_menubar" excepts this rule! - @seealso method getName() + @seealso method getName() - @param "sName", new frame name. - @return - + @param "sName", new frame name. + @return - - @onerror We do nothing. + @onerror We do nothing. *//*-*****************************************************************************************************/ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ) { @@ -763,8 +763,8 @@ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::Ru } /*-****************************************************************************************************//** - @short search for frames - @descr This method searches for a frame with the specified name. + @short search for frames + @descr This method searches for a frame with the specified name. Frames may contain other frames (e.g. a frameset) and may be contained in other frames. This hierarchie ist searched by this method. @@ -1054,21 +1054,21 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl } /*-****************************************************************************************************//** - @short - - @descr Returns sal_True, if this frame is a "top frame", otherwise sal_False. + @short - + @descr Returns sal_True, if this frame is a "top frame", otherwise sal_False. The "m_bIsFrameTop" member must be set in the ctor or setCreator() method. A top frame is a member of the top frame container or a member of the task frame container. Both containers can create new frames if the findFrame() method of their css::frame::XFrame interface is called with a frame name not yet known. - @seealso ctor - @seealso method setCreator() - @seealso method findFrame() + @seealso ctor + @seealso method setCreator() + @seealso method findFrame() - @param - - @return true, if is it a top frame ... false otherwise. + @param - + @return true, if is it a top frame ... false otherwise. - @onerror No error should occure! + @onerror No error should occure! *//*-*****************************************************************************************************/ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) { @@ -1085,19 +1085,19 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short activate frame in hierarchy - @descr This feature is used to mark active pathes in our frame hierarchy. + @short activate frame in hierarchy + @descr This feature is used to mark active pathes in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. - @seealso method deactivate() - @seealso method isActivate() - @seealso enum EActiveState - @seealso listener mechanism + @seealso method deactivate() + @seealso method isActivate() + @seealso enum EActiveState + @seealso listener mechanism - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) { @@ -1185,19 +1185,19 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short deactivate frame in hierarchy - @descr This feature is used to deactive pathes in our frame hierarchy. + @short deactivate frame in hierarchy + @descr This feature is used to deactive pathes in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. - @seealso method activate() - @seealso method isActivate() - @seealso enum EActiveState - @seealso listener mechanism + @seealso method activate() + @seealso method isActivate() + @seealso enum EActiveState + @seealso listener mechanism - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) { @@ -1274,17 +1274,17 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short returns active state - @descr Call it to get informations about current active state of this frame. + @short returns active state + @descr Call it to get informations about current active state of this frame. - @seealso method activate() - @seealso method deactivate() - @seealso enum EActiveState + @seealso method activate() + @seealso method deactivate() + @seealso enum EActiveState - @param - - @return true if active, false otherwise. + @param - + @return true if active, false otherwise. - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) { @@ -1302,15 +1302,15 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short ??? - @descr - + @short ??? + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) { @@ -1323,8 +1323,8 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short set new component inside the frame - @descr A frame is a container for a component. Use this method to set, change or realease it! + @short set new component inside the frame + @descr A frame is a container for a component. Use this method to set, change or realease it! We accept null references! The xComponentWindow will be a child of our container window and get all window events from us. @@ -1335,8 +1335,8 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) (b2) a full featured component which supports window and controller; (b3) or both to NULL if outside code which to forget this component. - @seealso method getComponentWindow() - @seealso method getController() + @seealso method getComponentWindow() + @seealso method getController() @param xComponentWindow valid reference to new component window which will be a child of internal container window @@ -1501,8 +1501,8 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X } /*-****************************************************************************************************//** - @short returns current set component window - @descr Frames are used to display components. The actual displayed component is + @short returns current set component window + @descr Frames are used to display components. The actual displayed component is held by the m_xComponentWindow property. If the component implements only a XComponent interface, the communication between the frame and the component is very restricted. Better integration is achievable through a @@ -1511,12 +1511,12 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X ResourceDescriptor it has to implement a XModel interface. This frame is the owner of the component window. - @seealso method setComponent() + @seealso method setComponent() - @param - + @param - @return css::uno::Reference to current set component window. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() throw( css::uno::RuntimeException ) { @@ -1531,8 +1531,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th } /*-****************************************************************************************************//** - @short returns current set controller - @descr Frames are used to display components. The actual displayed component is + @short returns current set controller + @descr Frames are used to display components. The actual displayed component is held by the m_xComponentWindow property. If the component implements only a XComponent interface, the communication between the frame and the component is very restricted. Better integration is achievable through a @@ -1541,12 +1541,12 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th ResourceDescriptor it has to implement a XModel interface. This frame is the owner of the component window. - @seealso method setComponent() + @seealso method setComponent() - @param - + @param - @return css::uno::Reference to current set controller. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException ) { @@ -1562,17 +1562,17 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() t } /*-****************************************************************************************************//** - @short add/remove listener for activate/deactivate/contextChanged events - @descr - + @short add/remove listener for activate/deactivate/contextChanged events + @descr - - @seealso method activate() - @seealso method deactivate() - @seealso method contextChanged() + @seealso method activate() + @seealso method deactivate() + @seealso method contextChanged() - @param "xListener" reference to your listener object - @return - + @param "xListener" reference to your listener object + @return - - @onerror Listener is ignored. + @onerror Listener is ignored. *//*-*****************************************************************************************************/ void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ) { @@ -1716,7 +1716,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close @param xListener reference to your listener object - @onerror Listener is ignored. + @onerror Listener is ignored. @threadsafe yes @modified 06.05.2002 10:03, as96863 @@ -1836,23 +1836,23 @@ void Frame::implts_forgetSubFrames() } /*-****************************************************************************************************//** - @short destroy instance - @descr The owner of this object calles the dispose method if the object + @short destroy instance + @descr The owner of this object calles the dispose method if the object should be destroyed. All other objects and components, that are registered as an EventListener are forced to release their references to this object. Furthermore this frame is removed from its parent frame container to release this reference. The reference attributes are disposed and released also. - @attention Look for globale description at beginning of file too! + @attention Look for globale description at beginning of file too! (DisposedException, FairRWLock ..., initialize, dispose) - @seealso method initialize() - @seealso baseclass FairRWLockBase! + @seealso method initialize() + @seealso baseclass FairRWLockBase! - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) { @@ -1979,16 +1979,16 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short Be a listener for dispose events! - @descr Adds/remove an EventListener to this object. If the dispose method is called on + @short Be a listener for dispose events! + @descr Adds/remove an EventListener to this object. If the dispose method is called on this object, the disposing method of the listener is called. - @seealso - + @seealso - - @param "xListener" reference to your listener object. - @return - + @param "xListener" reference to your listener object. + @return - - @onerror Listener is ignored. + @onerror Listener is ignored. *//*-*****************************************************************************************************/ void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ) { @@ -2019,17 +2019,17 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang:: } /*-****************************************************************************************************//** - @short create new status indicator - @descr Use returned status indicator to show progresses and some text informations. + @short create new status indicator + @descr Use returned status indicator to show progresses and some text informations. All created objects share the same dialog! Only the last one can show his information. @seealso class StatusIndicatorFactory @seealso class StatusIndicator - @param - - @return A reference to created object. + @param - + @return A reference to created object. - @onerror We return a null reference. + @onerror We return a null reference. *//*-*****************************************************************************************************/ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator() throw( css::uno::RuntimeException ) { @@ -2059,22 +2059,22 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI } /*-****************************************************************************************************//** - @short search for target to load URL - @descr This method searches for a dispatch for the specified DispatchDescriptor. + @short search for target to load URL + @descr This method searches for a dispatch for the specified DispatchDescriptor. The FrameSearchFlags and the FrameName of the DispatchDescriptor are treated as described for findFrame. - @seealso method findFrame() - @seealso method queryDispatches() - @seealso method set/getName() - @seealso class TargetFinder + @seealso method findFrame() + @seealso method queryDispatches() + @seealso method set/getName() + @seealso class TargetFinder - @param "aURL" , URL for loading - @param "sTargetFrameName" , name of target frame - @param "nSearchFlags" , additional flags to regulate search if sTargetFrameName isn't clear + @param "aURL" , URL for loading + @param "sTargetFrameName" , name of target frame + @param "nSearchFlags" , additional flags to regulate search if sTargetFrameName isn't clear @return css::uno::Reference to dispatch handler. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL , const ::rtl::OUString& sTargetFrameName, @@ -2104,16 +2104,16 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons } /*-****************************************************************************************************//** - @short handle more then ones dispatches at same call + @short handle more then ones dispatches at same call @descr Returns a sequence of dispatches. For details see the queryDispatch method. For failed dispatches we return empty items in list! - @seealso method queryDispatch() + @seealso method queryDispatch() - @param "lDescriptor" list of dispatch arguments for queryDispatch()! - @return List of dispatch references. Some elements can be NULL! + @param "lDescriptor" list of dispatch arguments for queryDispatch()! + @return List of dispatch references. Some elements can be NULL! - @onerror An empty list is returned. + @onerror An empty list is returned. *//*-*****************************************************************************************************/ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Frame::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) { @@ -2127,16 +2127,16 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram } /*-****************************************************************************************************//** - @short register/unregister interceptor for dispatch calls - @descr If you whish to handle some dispatches by himself ... you should be + @short register/unregister interceptor for dispatch calls + @descr If you whish to handle some dispatches by himself ... you should be an interceptor for it. Please see class OInterceptionHelper for further informations. - @seealso class OInterceptionHelper + @seealso class OInterceptionHelper - @param "xInterceptor", reference to your interceptor implementation. - @return - + @param "xInterceptor", reference to your interceptor implementation. + @return - - @onerror Interceptor is ignored. + @onerror Interceptor is ignored. *//*-*****************************************************************************************************/ void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ) { @@ -2165,7 +2165,7 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Referen } /*-****************************************************************************************************//** - @short provides information about all possible dispatch functions + @short provides information about all possible dispatch functions inside the currnt frame environment *//*-*****************************************************************************************************/ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups() @@ -2182,17 +2182,17 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu } /*-****************************************************************************************************//** - @short notifications for window events - @descr We are a listener on our container window to forward it to our component window. + @short notifications for window events + @descr We are a listener on our container window to forward it to our component window. - @seealso method setComponent() - @seealso member m_xContainerWindow - @seealso member m_xComponentWindow + @seealso method setComponent() + @seealso member m_xContainerWindow + @seealso member m_xComponentWindow - @param "aEvent" describe source of detected event - @return - + @param "aEvent" describe source of detected event + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& #if OSL_DEBUG_LEVEL > 0 @@ -2241,18 +2241,18 @@ aEvent } /*-****************************************************************************************************//** - @short notifications for window events - @descr We are a listener on our container window to forward it to our component window ... + @short notifications for window events + @descr We are a listener on our container window to forward it to our component window ... but a XTopWindowListener we are only if we are a top frame! - @seealso method setComponent() - @seealso member m_xContainerWindow - @seealso member m_xComponentWindow + @seealso method setComponent() + @seealso member m_xContainerWindow + @seealso member m_xComponentWindow - @param "aEvent" describe source of detected event - @return - + @param "aEvent" describe source of detected event + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& #if OSL_DEBUG_LEVEL > 0 @@ -2453,19 +2453,19 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un } /*-****************************************************************************************************//** - @short called by dispose of our windows! - @descr This object is forced to release all references to the interfaces given + @short called by dispose of our windows! + @descr This object is forced to release all references to the interfaces given by the parameter source. We are a listener at our container window and should listen for his diposing. - @seealso XWindowListener - @seealso XTopWindowListener - @seealso XFocusListener + @seealso XWindowListener + @seealso XTopWindowListener + @seealso XFocusListener - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ) { @@ -2730,7 +2730,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sPr @short dispose old container window and forget his reference @descr Sometimes we must repair our "modal dialog parent mechanism" too! - @seealso - + @seealso - @param "xWindow", reference to old container window to dispose it @return An empty reference. @@ -2751,15 +2751,15 @@ void Frame::impl_disposeContainerWindow( css::uno::Reference< css::awt::XWindow } /*-****************************************************************************************************//** - @short send frame action event to our listener - @descr This method is threadsafe AND can be called by our dispose method too! + @short send frame action event to our listener + @descr This method is threadsafe AND can be called by our dispose method too! - @seealso - + @seealso - - @param "aAction", describe the event for sending - @return - + @param "aAction", describe the event for sending + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction ) { @@ -2801,17 +2801,17 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction } /*-****************************************************************************************************//** - @short helper to resize our component window - @descr A frame contains 2 windows - a container ~ and a component window. + @short helper to resize our component window + @descr A frame contains 2 windows - a container ~ and a component window. This method resize inner component window to full size of outer container window. This method is threadsafe AND can be called by our dispose method too! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Frame::implts_resizeComponentWindow() { @@ -3194,7 +3194,7 @@ void Frame::impl_checkMenuCloser() } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -3208,9 +3208,9 @@ void Frame::impl_checkMenuCloser() // We don't accept null pointer or references! sal_Bool Frame::implcp_ctor( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) { - return ( - ( &xFactory == NULL ) || - ( xFactory.is() == sal_False ) + return ( + ( &xFactory == NULL ) || + ( xFactory.is() == sal_False ) ); } @@ -3219,7 +3219,7 @@ sal_Bool Frame::implcp_ctor( const css::uno::Reference< css::lang::XMultiService // And we accept frames only! No tasks and desktops! sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) { - return ( + return ( ( &xFrame == NULL ) || ( css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is() == sal_True ) ); @@ -3228,84 +3228,84 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF //***************************************************************************************************************** sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index ea22db175e4c..ef037c75778a 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 064c3b0ac8fb..18f3e21bf67d 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/license.hxx> #include <threadhelp/resetableguard.hxx> @@ -41,7 +41,7 @@ #include "classes/resource.hrc" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> @@ -54,7 +54,7 @@ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> @@ -73,21 +73,21 @@ #include <osl/time.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ using namespace utl; -using namespace ::osl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::util ; -using namespace ::com::sun::star::frame ; +using namespace ::osl ; +using namespace ::cppu ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::util ; +using namespace ::com::sun::star::frame ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ // license file name @@ -101,23 +101,23 @@ static const char *szWNTLicenseExt = ".txt"; #endif //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** License::License( const Reference< XMultiServiceFactory >& xFactory ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! + // Init baseclasses first + // Attention: + // Don't change order of initialization! // ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! + // we must garant right initialization and a valid value of this! First initialize + // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -127,34 +127,34 @@ License::License( const Reference< XMultiServiceFactory >& xFactory ) } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** License::~License() { } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_4 ( License , - OWeakObject , +DEFINE_XINTERFACE_4 ( License , + OWeakObject , DIRECT_INTERFACE(XTypeProvider ), DIRECT_INTERFACE(XServiceInfo ), - DIRECT_INTERFACE(XJob ), + DIRECT_INTERFACE(XJob ), DIRECT_INTERFACE(XCloseable ) ) -DEFINE_XTYPEPROVIDER_4 ( License , - XTypeProvider , - XServiceInfo , +DEFINE_XTYPEPROVIDER_4 ( License , + XTypeProvider , + XServiceInfo , XJob , XCloseable ) -DEFINE_XSERVICEINFO_MULTISERVICE ( License, +DEFINE_XSERVICEINFO_MULTISERVICE ( License, OWeakObject , - SERVICENAME_LICENSE , + SERVICENAME_LICENSE , IMPLEMENTATIONNAME_LICENSE ) @@ -627,5 +627,5 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -} // namespace framework +} // namespace framework diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index f1934193c489..1033cbda7913 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/mediatypedetectionhelper.hxx> #include <services.h> @@ -38,25 +38,25 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework { -using namespace ::com::sun::star ; -using namespace ::rtl ; +using namespace ::com::sun::star ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) : m_xFactory( xFactory ) @@ -64,13 +64,13 @@ MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang:: } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** MediaTypeDetectionHelper::~MediaTypeDetectionHelper() { } -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MediaTypeDetectionHelper +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MediaTypeDetectionHelper , ::cppu::OWeakObject , SERVICENAME_MEDIATYPEDETECTIONHELPER , IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER @@ -82,7 +82,7 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper, ) //***************************************************************************************************************** -// XStringMapping +// XStringMapping //***************************************************************************************************************** //virtual @@ -107,5 +107,5 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings( return bModified; } -} // namespace framework +} // namespace framework diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx index 0fb110c3a34e..8741fff39320 100644 --- a/framework/source/services/menudocumenthandler.cxx +++ b/framework/source/services/menudocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif +#endif using namespace ::rtl; @@ -48,43 +48,43 @@ using namespace ::com::sun::star::xml::sax; const int ITEMID_START_VALUE = 1000; -#define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" +#define XMLNS_MENU "http://openoffice.org/2001/menu" +#define XMLNS_PREFIX "menu:" -#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" -#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" -#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" -#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" -#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" +#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" +#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" +#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" +#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" +#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" -#define ELEMENT_NS_MENUBAR "menu:menubar" -#define ELEMENT_NS_MENU "menu:menu" -#define ELEMENT_NS_MENUPOPUP "menu:menupopup" -#define ELEMENT_NS_MENUITEM "menu:menuitem" -#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" +#define ELEMENT_NS_MENUBAR "menu:menubar" +#define ELEMENT_NS_MENU "menu:menu" +#define ELEMENT_NS_MENUPOPUP "menu:menupopup" +#define ELEMENT_NS_MENUITEM "menu:menuitem" +#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" -#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" -#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" -#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" +#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" +#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" +#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" +#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" -#define ATTRIBUTE_NS_ID "menu:id" -#define ATTRIBUTE_NS_LABEL "menu:label" -#define ATTRIBUTE_NS_HELPID "menu:helpid" -#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" +#define ATTRIBUTE_NS_ID "menu:id" +#define ATTRIBUTE_NS_LABEL "menu:label" +#define ATTRIBUTE_NS_HELPID "menu:helpid" +#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" -#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" +#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" +#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" // special popup menus (filled during runtime) must be saved as a menuitem!!! // same as in menumanager.cxx - you have to change both files!!! -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) +#define SID_SFX_START 5000 +#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) #define SID_FORMATMENU (SID_SFX_START + 780) const ::rtl::OUString aSlotProtocol( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); @@ -94,7 +94,7 @@ const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ) const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); -const ULONG MENU_SAVE_LABEL = 0x00000001; +const ULONG MENU_SAVE_LABEL = 0x00000001; namespace framework { @@ -139,7 +139,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { m_xLocator = xLocator; } @@ -160,10 +160,10 @@ throw( SAXException, RuntimeException ) // ----------------------------------------------------------------------------- // #110897# -OReadMenuDocumentHandler::OReadMenuDocumentHandler( +OReadMenuDocumentHandler::OReadMenuDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, MenuBar* pMenuBar ) -: // #110897# +: // #110897# mxServiceFactory(xServiceFactory), m_pMenuBar( pMenuBar ), m_nElementDepth( 0 ), @@ -215,17 +215,17 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; m_bMenuBarMode = sal_True; - + // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_pMenuBar, &m_nItemId )); m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_pMenuBar, &m_nItemId )); - + m_xReader->startDocument(); } } void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -257,10 +257,10 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) // #110897# -OReadMenuBarHandler::OReadMenuBarHandler( +OReadMenuBarHandler::OReadMenuBarHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar, USHORT* pItemId ) -: // #110897# + MenuBar* pMenuBar, USHORT* pItemId ) +: // #110897# mxServiceFactory( xServiceFactory ), m_pMenuBar( pMenuBar ), m_nElementDepth( 0 ), @@ -306,7 +306,7 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; - ULONG nHelpId = 0; + ULONG nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -370,7 +370,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -454,7 +454,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -523,7 +523,7 @@ throw( SAXException, RuntimeException ) m_xReader->startElement( aName, xAttrList ); else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) { - ULONG nHelpId = 0; + ULONG nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -579,7 +579,7 @@ throw( SAXException, RuntimeException ) } else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) { - ULONG nHelpId = 0; + ULONG nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -636,7 +636,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -696,7 +696,7 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( MenuBar* pMenu, Reference< m_xWriteDocumentHandler( rxWriteDocumentHandler ) { m_xEmptyList = Reference< XAttributeList >( (XAttributeList *)new AttributeListImpl, UNO_QUERY ); - m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); } diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index c6320a91c8d3..396a9650e3f7 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,7 +162,7 @@ ModuleManager::~ModuleManager() // Means: model -> controller -> window // No fallbacks to higher components are allowed ! // Note : A frame provides access to module components only ... but it's not a module by himself. - + ::rtl::OUString sModule; if (xModel.is()) sModule = implts_identify(xModel); @@ -172,12 +172,12 @@ ModuleManager::~ModuleManager() else if (xWindow.is()) sModule = implts_identify(xWindow); - + if (sModule.getLength() < 1) throw css::frame::UnknownModuleException( ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."), static_cast< ::cppu::OWeakObject* >(this)); - + return sModule; } @@ -233,7 +233,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , { const ::rtl::OUString& sPropName = pProp->first; const css::uno::Any& aPropValue = pProp->second; - + // let "NoSuchElementException" out ! We support the same API ... // and without a flush() at the end all changed data before will be ignored ! xModule->replaceByName(sPropName, aPropValue); @@ -343,14 +343,14 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea { const ::rtl::OUString& sModule = lModules[i]; ::comphelper::SequenceAsHashMap lModuleProps = getByName(sModule); - + if (lModuleProps.match(lSearchProps)) lResult.push_back(css::uno::makeAny(lModuleProps.getAsConstPropertyValueList())); } catch(const css::uno::Exception&) {} } - + ::comphelper::OAnyEnumeration* pEnum = new ::comphelper::OAnyEnumeration(lResult.getAsConstList()); css::uno::Reference< css::container::XEnumeration > xEnum(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY_THROW); return xEnum; @@ -402,7 +402,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf if (xModule.is()) return xModule->getIdentifier(); - // detect modules in a generic way ... + // detect modules in a generic way ... // comparing service names with configured entries ... css::uno::Reference< css::lang::XServiceInfo > xInfo(xComponent, css::uno::UNO_QUERY); if (!xInfo.is()) @@ -412,7 +412,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf const ::rtl::OUString* pKnownModules = lKnownModules.getConstArray(); sal_Int32 c = lKnownModules.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { if (xInfo->supportsService(pKnownModules[i])) diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index cbdf12fe1643..5227cb9f302c 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include <unotools/configpathes.hxx> // ______________________________________________ -// non exported const +// non exported const #define CFG_READONLY_DEFAULT sal_False @@ -91,7 +91,7 @@ sal_Int32 impl_getPropGroup(sal_Int32 nID) } // ______________________________________________ -// namespace +// namespace namespace framework { @@ -99,24 +99,24 @@ namespace framework //----------------------------------------------------------------------------- // XInterface, XTypeProvider, XServiceInfo -DEFINE_XINTERFACE_7 ( PathSettings , +DEFINE_XINTERFACE_7 ( PathSettings , OWeakObject , DIRECT_INTERFACE ( css::lang::XTypeProvider ), DIRECT_INTERFACE ( css::lang::XServiceInfo ), DERIVED_INTERFACE( css::lang::XEventListener, css::util::XChangesListener), DIRECT_INTERFACE ( css::util::XChangesListener ), - DIRECT_INTERFACE ( css::beans::XPropertySet ), - DIRECT_INTERFACE ( css::beans::XFastPropertySet ), - DIRECT_INTERFACE ( css::beans::XMultiPropertySet ) + DIRECT_INTERFACE ( css::beans::XPropertySet ), + DIRECT_INTERFACE ( css::beans::XFastPropertySet ), + DIRECT_INTERFACE ( css::beans::XMultiPropertySet ) ) -DEFINE_XTYPEPROVIDER_7 ( PathSettings , +DEFINE_XTYPEPROVIDER_7 ( PathSettings , css::lang::XTypeProvider , css::lang::XServiceInfo , css::lang::XEventListener , css::util::XChangesListener , - css::beans::XPropertySet , - css::beans::XFastPropertySet , + css::beans::XPropertySet , + css::beans::XFastPropertySet , css::beans::XMultiPropertySet ) @@ -141,7 +141,7 @@ DEFINE_INIT_SERVICE ( PathSettings, //----------------------------------------------------------------------------- PathSettings::PathSettings( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ) - // Init baseclasses first + // Init baseclasses first // Attention: Don't change order of initialization! // ThreadHelpBase is a struct with a lock as member. We can't use a lock as direct member! // We must garant right initialization and a valid value of this to initialize other baseclasses! @@ -288,7 +288,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s // read state props xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath; - + // analyze finalized/mandatory states aPathVal.bIsReadonly = sal_False; css::uno::Reference< css::beans::XProperty > xInfo(xPath, css::uno::UNO_QUERY); @@ -297,7 +297,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s css::beans::Property aInfo = xInfo->getAsProperty(); sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); //sal_Bool bMandatory = ((aInfo.Attributes & css::beans::PropertyAttribute::REMOVEABLE) != css::beans::PropertyAttribute::REMOVEABLE); - + // Note: Till we support finalized / mandatory on our API more in detail we handle // all states simple as READONLY ! But because all realy needed pathes are "mandatory" by default // we have to handle "finalized" as the real "readonly" indicator . @@ -657,7 +657,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , ::rtl::OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; - OUStringList lTemp; + OUStringList lTemp; lTemp.reserve(rPath.lInternalPaths.size() + rPath.lUserPaths.size() + 1); for ( pIt = rPath.lInternalPaths.begin(); diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 82e89010f6cb..42a2637f823e 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ SessionListener::SessionListener(const css::uno::Reference< css::lang::XMultiSer , m_bSessionStoreRequested( sal_False ) , m_bAllowUserInteractionOnQuit( sal_False ) , m_bTerminated( sal_False ) -{ +{ } SessionListener::~SessionListener() @@ -154,8 +154,8 @@ SessionListener::~SessionListener() void SessionListener::StoreSession( sal_Bool bAsync ) { - ResetableGuard aGuard(m_aLock); - try + ResetableGuard aGuard(m_aLock); + try { // xd create SERVICENAME_AUTORECOVERY -> XDispatch // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=bAsync @@ -187,8 +187,8 @@ void SessionListener::StoreSession( sal_Bool bAsync ) void SessionListener::QuitSessionQuietly() { - ResetableGuard aGuard(m_aLock); - try + ResetableGuard aGuard(m_aLock); + try { // xd create SERVICENAME_AUTORECOVERY -> XDispatch // xd->dispatch("vnd.sun.star.autorecovery:/doSessionQuietQuit, async=false @@ -311,7 +311,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted throw (RuntimeException) { // do AutoSave as the first step - ResetableGuard aGuard(m_aLock); + ResetableGuard aGuard(m_aLock); if ( bInteractionGranted ) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4e38983ba79b..90c460b74298 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "services/substitutepathvars.hxx" #include <threadhelp/resetableguard.hxx> @@ -37,12 +37,12 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <unotools/configitem.hxx> #include <unotools/localfilehelper.hxx> @@ -69,62 +69,62 @@ #include <string.h> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // -#define STRPOS_NOTFOUND (sal_Int32)-1 +#define STRPOS_NOTFOUND (sal_Int32)-1 -#define ASCII_STR( val ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( val )) +#define ASCII_STR( val ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( val )) -#define SEARCHPATH_DELIMITER ';' +#define SEARCHPATH_DELIMITER ';' // Variable start/end characters -#define SIGN_STARTVARIABLE ASCII_STR("$(") -#define SIGN_ENDVARIABLE ASCII_STR(")") +#define SIGN_STARTVARIABLE ASCII_STR("$(") +#define SIGN_ENDVARIABLE ASCII_STR(")") // Length of SUBSTITUTE_... to replace it with real values. -#define REPLACELENGTH_INST 7 -#define REPLACELENGTH_PROG 7 -#define REPLACELENGTH_USER 7 -#define REPLACELENGTH_WORK 7 -#define REPLACELENGTH_HOME 7 -#define REPLACELENGTH_TEMP 7 +#define REPLACELENGTH_INST 7 +#define REPLACELENGTH_PROG 7 +#define REPLACELENGTH_USER 7 +#define REPLACELENGTH_WORK 7 +#define REPLACELENGTH_HOME 7 +#define REPLACELENGTH_TEMP 7 +#define REPLACELENGTH_PATH 7 +#define REPLACELENGTH_INSTPATH 11 +#define REPLACELENGTH_PROGPATH 11 +#define REPLACELENGTH_USERPATH 11 +#define REPLACELENGTH_INSTURL 10 +#define REPLACELENGTH_PROGURL 10 +#define REPLACELENGTH_USERURL 10 #define REPLACELENGTH_PATH 7 -#define REPLACELENGTH_INSTPATH 11 -#define REPLACELENGTH_PROGPATH 11 -#define REPLACELENGTH_USERPATH 11 -#define REPLACELENGTH_INSTURL 10 -#define REPLACELENGTH_PROGURL 10 -#define REPLACELENGTH_USERURL 10 -#define REPLACELENGTH_PATH 7 -#define REPLACELENGTH_LANG 7 -#define REPLACELENGTH_LANGID 9 -#define REPLACELENGTH_VLANG 8 -#define REPLACELENGTH_WORKDIRURL 13 +#define REPLACELENGTH_LANG 7 +#define REPLACELENGTH_LANGID 9 +#define REPLACELENGTH_VLANG 8 +#define REPLACELENGTH_WORKDIRURL 13 // --> PB 2004-10-27 #i32656# - new variable of hierachy service #define REPLACELENGTH_BASEINSTURL 14 #define REPLACELENGTH_USERDATAURL 14 // <-- // Name of the pre defined path variables -#define VARIABLE_INST "$(inst)" -#define VARIABLE_PROG "$(prog)" -#define VARIABLE_USER "$(user)" -#define VARIABLE_WORK "$(work)" -#define VARIABLE_HOME "$(home)" -#define VARIABLE_TEMP "$(temp)" -#define VARIABLE_PATH "$(path)" -#define VARIABLE_LANG "$(lang)" -#define VARIABLE_LANGID "$(langid)" -#define VARIABLE_VLANG "$(vlang)" -#define VARIABLE_INSTPATH "$(instpath)" -#define VARIABLE_PROGPATH "$(progpath)" -#define VARIABLE_USERPATH "$(userpath)" -#define VARIABLE_INSTURL "$(insturl)" -#define VARIABLE_PROGURL "$(progurl)" -#define VARIABLE_USERURL "$(userurl)" -#define VARIABLE_WORKDIRURL "$(workdirurl)" +#define VARIABLE_INST "$(inst)" +#define VARIABLE_PROG "$(prog)" +#define VARIABLE_USER "$(user)" +#define VARIABLE_WORK "$(work)" +#define VARIABLE_HOME "$(home)" +#define VARIABLE_TEMP "$(temp)" +#define VARIABLE_PATH "$(path)" +#define VARIABLE_LANG "$(lang)" +#define VARIABLE_LANGID "$(langid)" +#define VARIABLE_VLANG "$(vlang)" +#define VARIABLE_INSTPATH "$(instpath)" +#define VARIABLE_PROGPATH "$(progpath)" +#define VARIABLE_USERPATH "$(userpath)" +#define VARIABLE_INSTURL "$(insturl)" +#define VARIABLE_PROGURL "$(progurl)" +#define VARIABLE_USERURL "$(userurl)" +#define VARIABLE_WORKDIRURL "$(workdirurl)" // --> PB 2004-10-27 #i32656# - new variable of hierachy service #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" @@ -137,7 +137,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -146,15 +146,15 @@ namespace framework struct FixedVariable { - const char* pVarName; - PreDefVariable nEnumValue; - int nStrLen; + const char* pVarName; + PreDefVariable nEnumValue; + int nStrLen; }; struct TableEntry { const char* pOSString; - int nStrLen; + int nStrLen; }; // Table with valid operating system strings @@ -162,11 +162,11 @@ struct TableEntry // of the string static TableEntry aOSTable[OS_COUNT] = { - { "WINDOWS" , 7 }, - { "UNIX" , 4 }, - { "SOLARIS" , 7 }, - { "LINUX" , 5 }, - { "" , 0 } // unknown + { "WINDOWS" , 7 }, + { "UNIX" , 4 }, + { "SOLARIS" , 7 }, + { "LINUX" , 5 }, + { "" , 0 } // unknown }; // Table with valid environment variables @@ -174,12 +174,12 @@ static TableEntry aOSTable[OS_COUNT] = // the length of the string. static TableEntry aEnvTable[ET_COUNT] = { - { "HOST" , 4 }, - { "YPDOMAIN" , 8 }, - { "DNSDOMAIN" , 9 }, - { "NTDOMAIN" , 8 }, - { "OS" , 2 }, - { "" , 0 } // unknown + { "HOST" , 4 }, + { "YPDOMAIN" , 8 }, + { "DNSDOMAIN" , 9 }, + { "NTDOMAIN" , 8 }, + { "OS" , 2 }, + { "" , 0 } // unknown }; // Priority table for the environment types. Lower numbers define @@ -187,33 +187,33 @@ static TableEntry aEnvTable[ET_COUNT] = // that the first match wins!! static sal_Int16 aEnvPrioTable[ET_COUNT] = { - 1, // ET_HOST - 2, // ET_IPDOMAIN - 2, // ET_DNSDOMAIN - 2, // ET_NTDOMAIN - 3, // ET_OS - 99, // ET_UNKNOWN + 1, // ET_HOST + 2, // ET_IPDOMAIN + 2, // ET_DNSDOMAIN + 2, // ET_NTDOMAIN + 3, // ET_OS + 99, // ET_UNKNOWN }; // Table with all fixed/predefined variables supported. static FixedVariable aFixedVarTable[] = { - { VARIABLE_INST, PREDEFVAR_INST, REPLACELENGTH_INST }, - { VARIABLE_PROG, PREDEFVAR_PROG, REPLACELENGTH_PROG }, - { VARIABLE_USER, PREDEFVAR_USER, REPLACELENGTH_USER }, - { VARIABLE_WORK, PREDEFVAR_WORK, REPLACELENGTH_WORK }, // Special variable (transient)! - { VARIABLE_HOME, PREDEFVAR_HOME, REPLACELENGTH_HOME }, - { VARIABLE_TEMP, PREDEFVAR_TEMP, REPLACELENGTH_TEMP }, + { VARIABLE_INST, PREDEFVAR_INST, REPLACELENGTH_INST }, + { VARIABLE_PROG, PREDEFVAR_PROG, REPLACELENGTH_PROG }, + { VARIABLE_USER, PREDEFVAR_USER, REPLACELENGTH_USER }, + { VARIABLE_WORK, PREDEFVAR_WORK, REPLACELENGTH_WORK }, // Special variable (transient)! + { VARIABLE_HOME, PREDEFVAR_HOME, REPLACELENGTH_HOME }, + { VARIABLE_TEMP, PREDEFVAR_TEMP, REPLACELENGTH_TEMP }, { VARIABLE_PATH, PREDEFVAR_PATH, REPLACELENGTH_PATH }, - { VARIABLE_LANG, PREDEFVAR_LANG, REPLACELENGTH_LANG }, - { VARIABLE_LANGID, PREDEFVAR_LANGID, REPLACELENGTH_LANGID }, - { VARIABLE_VLANG, PREDEFVAR_VLANG, REPLACELENGTH_VLANG }, - { VARIABLE_INSTPATH, PREDEFVAR_INSTPATH, REPLACELENGTH_INSTPATH }, - { VARIABLE_PROGPATH, PREDEFVAR_PROGPATH, REPLACELENGTH_PROGPATH }, - { VARIABLE_USERPATH, PREDEFVAR_USERPATH, REPLACELENGTH_USERPATH }, - { VARIABLE_INSTURL, PREDEFVAR_INSTURL, REPLACELENGTH_INSTURL }, - { VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL }, - { VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL }, + { VARIABLE_LANG, PREDEFVAR_LANG, REPLACELENGTH_LANG }, + { VARIABLE_LANGID, PREDEFVAR_LANGID, REPLACELENGTH_LANGID }, + { VARIABLE_VLANG, PREDEFVAR_VLANG, REPLACELENGTH_VLANG }, + { VARIABLE_INSTPATH, PREDEFVAR_INSTPATH, REPLACELENGTH_INSTPATH }, + { VARIABLE_PROGPATH, PREDEFVAR_PROGPATH, REPLACELENGTH_PROGPATH }, + { VARIABLE_USERPATH, PREDEFVAR_USERPATH, REPLACELENGTH_USERPATH }, + { VARIABLE_INSTURL, PREDEFVAR_INSTURL, REPLACELENGTH_INSTURL }, + { VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL }, + { VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL }, { VARIABLE_WORKDIRURL, PREDEFVAR_WORKDIRURL, REPLACELENGTH_WORKDIRURL }, // Special variable (transient) and don't use for resubstitution! // --> PB 2004-10-27 #i32656# - new variable of hierachy service { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL }, @@ -224,7 +224,7 @@ static FixedVariable aFixedVarTable[] = }; //_________________________________________________________________________________________________________________ -// Implementation helper classes +// Implementation helper classes //_________________________________________________________________________________________________________________ // @@ -322,7 +322,7 @@ void SubstitutePathVariables_Impl::Commit() //_________________________________________________________________________________________________________________ -// private methods +// private methods //_________________________________________________________________________________________________________________ // @@ -362,8 +362,8 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() { if ( !m_bDNSDomainRetrieved ) { - rtl::OUString aTemp; - osl::SocketAddr aSockAddr; + rtl::OUString aTemp; + osl::SocketAddr aSockAddr; oslSocketResult aResult; rtl::OUString aHostName = GetHostName(); @@ -398,7 +398,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetHostName() { if ( !m_bHostRetrieved ) { - rtl::OUString aHostName; + rtl::OUString aHostName; oslSocketResult aSocketResult; m_aHost = osl::SocketAddr::getLocalHostname( &aSocketResult ).toAsciiLowerCase(); @@ -413,12 +413,12 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector if ( !aRuleSet.empty() ) { - sal_Int16 nPrioCurrentRule = aEnvPrioTable[ ET_UNKNOWN ]; + sal_Int16 nPrioCurrentRule = aEnvPrioTable[ ET_UNKNOWN ]; const sal_uInt32 nCount = aRuleSet.size(); for ( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ ) { const SubstituteRule& aRule = aRuleSet[nIndex]; - EnvironmentType eEnvType = aRule.aEnvType; + EnvironmentType eEnvType = aRule.aEnvType; // Check if environment type has a higher priority than current one! if ( nPrioCurrentRule > aEnvPrioTable[eEnvType] ) @@ -437,9 +437,9 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector sal_Bool bMatch = aPattern.Matches(aHost); if ( bMatch ) { - aActiveRule = aRule; - bResult = sal_True; - nPrioCurrentRule = aEnvPrioTable[eEnvType]; + aActiveRule = aRule; + bResult = sal_True; + nPrioCurrentRule = aEnvPrioTable[eEnvType]; } } break; @@ -448,8 +448,8 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector case ET_DNSDOMAIN: case ET_NTDOMAIN: { - rtl::OUString aDomain; - rtl::OUString aDomainStr; + rtl::OUString aDomain; + rtl::OUString aDomainStr; aRule.aEnvValue >>= aDomainStr; aDomainStr = aDomainStr.toAsciiLowerCase(); @@ -466,9 +466,9 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector sal_Bool bMatch = aPattern.Matches(aDomain); if ( bMatch ) { - aActiveRule = aRule; - bResult = sal_True; - nPrioCurrentRule = aEnvPrioTable[eEnvType]; + aActiveRule = aRule; + bResult = sal_True; + nPrioCurrentRule = aEnvPrioTable[eEnvType]; } } break; @@ -476,20 +476,20 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector case ET_OS: { // No pattern matching for OS type - OperatingSystem eOSType = GetOperatingSystem(); + OperatingSystem eOSType = GetOperatingSystem(); sal_Int16 nValue = 0; aRule.aEnvValue >>= nValue; - sal_Bool bUnix = ( eOSType == OS_LINUX ) || ( eOSType == OS_SOLARIS ); - OperatingSystem eRuleOSType = (OperatingSystem)nValue; + sal_Bool bUnix = ( eOSType == OS_LINUX ) || ( eOSType == OS_SOLARIS ); + OperatingSystem eRuleOSType = (OperatingSystem)nValue; // Match if OS identical or rule is set to UNIX and OS is LINUX/SOLARIS! if (( eRuleOSType == eOSType ) || ( eRuleOSType == OS_UNIX && bUnix )) { - aActiveRule = aRule; - bResult = sal_True; - nPrioCurrentRule = aEnvPrioTable[eEnvType]; + aActiveRule = aRule; + bResult = sal_True; + nPrioCurrentRule = aEnvPrioTable[eEnvType]; } } break; @@ -569,7 +569,7 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( } // Decode the environment and optional the operatng system settings - Any aEnvValue; + Any aEnvValue; EnvironmentType eEnvType = GetEnvTypeFromString( aEnvUsed ); if ( eEnvType == ET_OS ) { @@ -588,11 +588,11 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( SubstitutePathVariables , - ::cppu::OWeakObject , - SERVICENAME_SUBSTITUTEPATHVARIABLES , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( SubstitutePathVariables , + ::cppu::OWeakObject , + SERVICENAME_SUBSTITUTEPATHVARIABLES , IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES ) @@ -634,8 +634,8 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService // and it could be possible that it will be resubstituted by itself!! // Example: WORK_PATH=c:\test, $(workdirurl)=WORK_PATH => WORK_PATH=$(workdirurl) and this cannot be substituted! ReSubstFixedVarOrder aFixedVar; - aFixedVar.eVariable = aFixedVarTable[i].nEnumValue; - aFixedVar.nVarValueLength = m_aPreDefVars.m_FixedVar[(sal_Int32)aFixedVar.eVariable].getLength(); + aFixedVar.eVariable = aFixedVarTable[i].nEnumValue; + aFixedVar.nVarValueLength = m_aPreDefVars.m_FixedVar[(sal_Int32)aFixedVar.eVariable].getLength(); m_aReSubstFixedVarOrder.push_back( aFixedVar ); } } @@ -650,8 +650,8 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService aStrBuffer.append( m_aVarStart ); aStrBuffer.append( pIter->second.aSubstVariable ); aStrBuffer.append( m_aVarEnd ); - aUserOrderVar.aVarName = aStrBuffer.makeStringAndClear(); - aUserOrderVar.nVarValueLength = pIter->second.aSubstVariable.getLength(); + aUserOrderVar.aVarName = aStrBuffer.makeStringAndClear(); + aUserOrderVar.nVarValueLength = pIter->second.aSubstVariable.getLength(); m_aReSubstUserVarOrder.push_back( aUserOrderVar ); } m_aReSubstUserVarOrder.sort(); @@ -687,7 +687,7 @@ throw ( NoSuchElementException, RuntimeException ) } //_________________________________________________________________________________________________________________ -// protected methods +// protected methods //_________________________________________________________________________________________________________________ // @@ -702,8 +702,8 @@ IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNo rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" ); - String aResult; - rtl::OUString aTemp; + String aResult; + rtl::OUString aTemp; osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp ); utl::LocalFileHelper::ConvertPhysicalNameToURL( aTemp, aResult ); @@ -738,7 +738,7 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const ::rtl::OUString::createFromAscii("Variables"), ::rtl::OUString::createFromAscii("Work"), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; - + // fallback to $HOME in case platform dependend config layer does not return // an usuable work dir value. if (aWorkPath.getLength() < 1) @@ -752,8 +752,8 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const rtl::OUString SubstitutePathVariables::GetHomeVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetHomeVariableValue" ); - osl::Security aSecurity; - rtl::OUString aHomePath; + osl::Security aSecurity; + rtl::OUString aHomePath; aSecurity.getHomeDir( aHomePath ); return ConvertOSLtoUCBURL( aHomePath ); @@ -802,18 +802,18 @@ throw ( NoSuchElementException, RuntimeException ) // This is maximal recursive depth supported! const sal_Int32 nMaxRecursiveDepth = 8; - rtl::OUString aWorkText = rText; - rtl::OUString aResult; + rtl::OUString aWorkText = rText; + rtl::OUString aResult; // Use vector with strings to detect endless recursions! std::vector< rtl::OUString > aEndlessRecursiveDetector; // Search for first occure of "$(...". - sal_Int32 nDepth = 0; - sal_Int32 bSubstitutionCompleted = sal_False; - sal_Int32 nPosition = aWorkText.indexOf( m_aVarStart ); // = first position of "$(" in string - sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string - sal_Bool bVarNotSubstituted = sal_False; + sal_Int32 nDepth = 0; + sal_Int32 bSubstitutionCompleted = sal_False; + sal_Int32 nPosition = aWorkText.indexOf( m_aVarStart ); // = first position of "$(" in string + sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string + sal_Bool bVarNotSubstituted = sal_False; // Have we found any variable like "$(...)"? if ( nPosition != STRPOS_NOTFOUND ) @@ -826,17 +826,17 @@ throw ( NoSuchElementException, RuntimeException ) } // Is there something to replace ? - sal_Bool bWorkRetrieved = sal_False; - sal_Bool bWorkDirURLRetrieved = sal_False; + sal_Bool bWorkRetrieved = sal_False; + sal_Bool bWorkDirURLRetrieved = sal_False; while ( !bSubstitutionCompleted && nDepth < nMaxRecursiveDepth ) { while ( ( nPosition != STRPOS_NOTFOUND ) && ( nLength > 3 ) ) // "$(" ")" { // YES; Get the next variable for replace. - sal_Int32 nReplaceLength = 0; - rtl::OUString aReplacement; - rtl::OUString aSubString = aWorkText.copy( nPosition, nLength ); - rtl::OUString aSubVarString; + sal_Int32 nReplaceLength = 0; + rtl::OUString aReplacement; + rtl::OUString aSubString = aWorkText.copy( nPosition, nLength ); + rtl::OUString aSubVarString; // Path variables are not case sensitive! aSubVarString = aSubString.toAsciiLowerCase(); @@ -909,7 +909,7 @@ throw ( NoSuchElementException, RuntimeException ) if ( nPosition != STRPOS_NOTFOUND ) { // Yes; Get length of found variable. If no ")" was found - nLength must set to 0! - nLength = 0; + nLength = 0; sal_Int32 nEndPosition = aWorkText.indexOf( m_aVarEnd, nPosition ); if ( nEndPosition != STRPOS_NOTFOUND ) nLength = nEndPosition - nPosition + 1; @@ -1017,8 +1017,8 @@ throw ( RuntimeException ) } // Due to a recursive definition this code must exchange variables with variables! - sal_Bool bResubstitutionCompleted = sal_False; - sal_Bool bVariableFound = sal_False; + sal_Bool bResubstitutionCompleted = sal_False; + sal_Bool bVariableFound = sal_False; // Get transient predefined path variable $(work) value before starting resubstitution m_aPreDefVars.m_FixedVar[ PREDEFVAR_WORK ] = GetWorkVariableValue(); @@ -1178,15 +1178,15 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable } // Set $(inst), $(instpath), $(insturl) - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; // --> PB 2004-10-27 #i32656# - new variable of hierachy service aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; // <-- // Set $(user), $(userpath), $(userurl) - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; // --> PB 2004-11-11 #i32656# - new variable of hierachy service aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; // <-- @@ -1199,9 +1199,9 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) { - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROG ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROG ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; } // Detect the language type of the current office diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6775e6d478a3..9af8581652d3 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/tabwindowservice.hxx> @@ -39,14 +39,14 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <toolkit/helper/vclunohelper.hxx> @@ -55,21 +55,21 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// css::uno::XInterface, XTypeProvider, XServiceInfo +// css::uno::XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_6 ( TabWindowService , @@ -103,17 +103,17 @@ DEFINE_INIT_SERVICE ( TabWindowService, m_aTransactionManager.setWorkingMode( E_WORK ); } ) - + //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! + // Init baseclasses first + // Attention: + // Don't change order of initialization! // ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! + // we must garant right initialization and a valid value of this! First initialize + // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) , TransactionBase ( ) , PropertySetHelper ( xFactory , @@ -137,7 +137,7 @@ TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMulti } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** TabWindowService::~TabWindowService() { @@ -292,7 +292,7 @@ void SAL_CALL TabWindowService::dispose() if (m_pTabWin) m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) ); - + m_pTabWin = NULL; m_xTabWin.clear(); } @@ -367,13 +367,13 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) if ( !pEvent && !pEvent->ISA(VclWindowEvent)) return 0; - + ULONG nEventId = pEvent->GetId(); VclWindowEvent* pWinEvt = static_cast< VclWindowEvent* >(pEvent); css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ); css::lang::EventObject aEvent( xThis ); - + if (nEventId == VCLEVENT_OBJECT_DYING) { m_lListener.disposeAndClear (aEvent); @@ -388,14 +388,14 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*) NULL)); if ( ! pContainer) return 0; - + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) { try { css::awt::XTabListener* pListener = (css::awt::XTabListener*)pIterator.next(); - + switch (nEventId) { case VCLEVENT_TABPAGE_ACTIVATE : @@ -469,17 +469,17 @@ FwkTabWindow* TabWindowService::mem_TabWin () if ( ! m_xTabWin.is ()) { Window* pFakeParent = dynamic_cast< Window* >(Application::GetDefaultDevice ()); - + m_pTabWin = new FwkTabWindow (pFakeParent); m_xTabWin = VCLUnoHelper::GetInterface (m_pTabWin); - + m_pTabWin->AddEventListener( LINK( this, TabWindowService, EventListener ) ); } if (m_xTabWin.is ()) pWin = m_pTabWin; - + return pWin; } -} // namespace framework +} // namespace framework diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 869a65dc429d..90bcdb93efbf 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ const ::rtl::OUString TaskCreatorService::ARGUMENT_POSSIZE const ::rtl::OUString TaskCreatorService::ARGUMENT_CONTAINERWINDOW = ::rtl::OUString::createFromAscii("ContainerWindow" ); // XWindow const ::rtl::OUString TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE = ::rtl::OUString::createFromAscii("SupportPersistentWindowState" ); // sal_Bool const ::rtl::OUString TaskCreatorService::ARGUMENT_ENABLE_TITLEBARUPDATE = ::rtl::OUString::createFromAscii("EnableTitleBarUpdate" ); // sal_Bool - + //----------------------------------------------- DEFINE_XINTERFACE_3(TaskCreatorService , OWeakObject , @@ -175,7 +175,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI xContainerWindow = implts_createContainerWindow(xParentWindow, aPosSize, bCreateTopWindow); } - + //-------------------> // HACK #125187# + #i53630# // Mark all document windows as "special ones", so VCL can bind @@ -196,27 +196,27 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // create the new frame css::uno::Reference< css::frame::XFrame > xFrame = implts_createFrame(xParentFrame, xContainerWindow, sRightName); - + // special freature: // A special listener will restore pos/size states in case // a component was loaded into the frame first time. if (bSupportPersistentWindowState) implts_establishWindowStateListener(xFrame); - + // special feature: On Mac we need tagging the window in case // the underlying model was modified. // VCL will ignore our calls in case different platform then Mac // is used ... if (bTopLevelDocumentWindow) implts_establishDocModifyListener (xFrame); - + // special freature: // A special listener will update title bar (text and icon) // if component of frame will be changed. if (bEnableTitleBarUpdate) implts_establishTitleBarUpdate(xFrame); - - // Make it visible directly here ... + + // Make it visible directly here ... // if its required from outside. if (bVisible) xContainerWindow->setVisible(bVisible); @@ -246,7 +246,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE - + // get toolkit to create task container window css::uno::Reference< css::awt::XToolkit > xToolkit( xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), css::uno::UNO_QUERY_THROW); @@ -259,7 +259,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai else xParentWindowPeer = css::uno::Reference< css::awt::XWindowPeer >(xParentWindow, css::uno::UNO_QUERY_THROW); } - + // describe window properties. css::awt::WindowDescriptor aDescriptor; if (bTopWindow) @@ -284,7 +284,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai aDescriptor.Bounds = aPosSize ; aDescriptor.WindowAttributes = css::awt::VclWindowPeerAttribute::CLIPCHILDREN ; } - + // create a new blank container window and get access to parent container to append new created task. css::uno::Reference< css::awt::XWindowPeer > xPeer = xToolkit->createWindow( aDescriptor ); css::uno::Reference< css::awt::XWindow > xWindow ( xPeer, css::uno::UNO_QUERY ); @@ -295,7 +295,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); else xPeer->setBackground(0xffffffff); - + return xWindow; } @@ -309,7 +309,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreatorService::implts_createFrame css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE - + // create new frame. css::uno::Reference< css::frame::XFrame > xNewFrame( xSMGR->createInstance( SERVICENAME_FRAME ), css::uno::UNO_QUERY_THROW ); diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index c88cdf9e2136..1c89870c429d 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,15 +46,15 @@ namespace framework namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , +DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , ::cppu::OWeakObject , - SERVICENAME_STRINGABBREVIATION , + SERVICENAME_STRINGABBREVIATION , IMPLEMENTATIONNAME_URIABBREVIATION ) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 8ee168bda752..cac8e7e359ca 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/urltransformer.hxx> #include <threadhelp/resetableguard.hxx> @@ -37,42 +37,42 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::osl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::util ; +using namespace ::osl ; +using namespace ::cppu ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::util ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** URLTransformer::URLTransformer( const Reference< XMultiServiceFactory >& /*xFactory*/ ) { @@ -82,19 +82,19 @@ URLTransformer::URLTransformer( const Reference< XMultiServiceFactory >& /*xFact } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** URLTransformer::~URLTransformer() { } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE ( URLTransformer , +DEFINE_XSERVICEINFO_MULTISERVICE ( URLTransformer , OWeakObject , - SERVICENAME_URLTRANSFORMER , + SERVICENAME_URLTRANSFORMER , IMPLEMENTATIONNAME_URLTRANSFORMER ) @@ -108,11 +108,11 @@ namespace void lcl_ParserHelper(INetURLObject& _rParser,URL& _rURL,bool _bUseIntern) { // Get all information about this URL. - _rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() ); - _rURL.User = _rParser.GetUser ( INetURLObject::DECODE_WITH_CHARSET ); - _rURL.Password = _rParser.GetPass ( INetURLObject::DECODE_WITH_CHARSET ); - _rURL.Server = _rParser.GetHost ( INetURLObject::DECODE_WITH_CHARSET ); - _rURL.Port = (sal_Int16)_rParser.GetPort(); + _rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() ); + _rURL.User = _rParser.GetUser ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Password = _rParser.GetPass ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Server = _rParser.GetHost ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Port = (sal_Int16)_rParser.GetPort(); sal_Int32 nCount = _rParser.getSegmentCount( false ); if ( nCount > 0 ) @@ -136,32 +136,32 @@ namespace else { _rURL.Path = _rParser.GetURLPath( INetURLObject::NO_DECODE ); - _rURL.Name = _rParser.GetName ( ); + _rURL.Name = _rParser.GetName ( ); } _rURL.Arguments = _rParser.GetParam ( INetURLObject::NO_DECODE ); - _rURL.Mark = _rParser.GetMark ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Mark = _rParser.GetMark ( INetURLObject::DECODE_WITH_CHARSET ); // INetURLObject supports only an intelligent method of parsing URL's. So write // back Complete to have a valid encoded URL in all cases! - _rURL.Complete = _rParser.GetMainURL( INetURLObject::NO_DECODE ); + _rURL.Complete = _rParser.GetMainURL( INetURLObject::NO_DECODE ); if ( _bUseIntern ) _rURL.Complete = _rURL.Complete.intern(); - _rParser.SetMark ( ::rtl::OUString() ); + _rParser.SetMark ( ::rtl::OUString() ); _rParser.SetParam( ::rtl::OUString() ); _rURL.Main = _rParser.GetMainURL( INetURLObject::NO_DECODE ); } } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeException ) { // Safe impossible cases. - if (( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) ) + if (( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { return sal_False; } @@ -195,9 +195,9 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti { // Minmal support for unknown protocols. This is mandatory to support the "Protocol Handlers" implemented // in framework! - aURL.Protocol = aProtocol; - aURL.Main = aURL.Complete; - aURL.Path = aURL.Complete.copy( nURLIndex+1 );; + aURL.Protocol = aProtocol; + aURL.Main = aURL.Complete; + aURL.Path = aURL.Complete.copy( nURLIndex+1 );; // Return "URL is parsed". return sal_True; @@ -208,14 +208,14 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** -sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , - const ::rtl::OUString& sSmartProtocol ) throw( RuntimeException ) +sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , + const ::rtl::OUString& sSmartProtocol ) throw( RuntimeException ) { // Safe impossible cases. - if (( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) ) + if (( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { return sal_False; } @@ -264,12 +264,12 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException ) { // Safe impossible cases. - if ( &aURL == NULL ) + if ( &aURL == NULL ) return sal_False ; // Initialize parser. @@ -293,12 +293,12 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } bool bResult = aParser.ConcatData( - INetURLObject::CompareProtocolScheme( aURL.Protocol ) , - aURL.User , - aURL.Password , - aURL.Server , - aURL.Port , - aCompletePath.makeStringAndClear() ); + INetURLObject::CompareProtocolScheme( aURL.Protocol ) , + aURL.User , + aURL.Password , + aURL.Server , + aURL.Port , + aCompletePath.makeStringAndClear() ); if ( !bResult ) return sal_False; @@ -318,8 +318,8 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException // Minimal support for unknown protocols ::rtl::OUStringBuffer aBuffer( aURL.Protocol ); aBuffer.append( aURL.Path ); - aURL.Complete = aBuffer.makeStringAndClear(); - aURL.Main = aURL.Complete; + aURL.Complete = aBuffer.makeStringAndClear(); + aURL.Main = aURL.Complete; return sal_True; } @@ -327,16 +327,16 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** -::rtl::OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , - sal_Bool bWithPassword ) throw( RuntimeException ) +::rtl::OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , + sal_Bool bWithPassword ) throw( RuntimeException ) { // Safe impossible cases. - if (( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) || - (( bWithPassword != sal_True ) && - ( bWithPassword != sal_False ) ) ) + if (( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) || + (( bWithPassword != sal_True ) && + ( bWithPassword != sal_False ) ) ) { return ::rtl::OUString(); } @@ -364,9 +364,9 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ -} // namespace framework +} // namespace framework diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index a9fdf6f8defa..107dccc80dc7 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,12 +31,12 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/PosSize.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <tools/urlobj.hxx> @@ -57,7 +57,7 @@ #include <comphelper/sequenceashashmap.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -68,40 +68,40 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_11 ( TabWindow , +DEFINE_XINTERFACE_11 ( TabWindow , ::cppu::OWeakObject , - DIRECT_INTERFACE( css::lang::XTypeProvider ), - DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::lang::XInitialization ), + DIRECT_INTERFACE( css::lang::XTypeProvider ), + DIRECT_INTERFACE( css::lang::XServiceInfo ), + DIRECT_INTERFACE( css::lang::XInitialization ), DIRECT_INTERFACE( css::lang::XComponent ), - DIRECT_INTERFACE( css::awt::XWindowListener ), + DIRECT_INTERFACE( css::awt::XWindowListener ), DIRECT_INTERFACE( css::awt::XTopWindowListener ), DIRECT_INTERFACE( css::awt::XSimpleTabController ), DERIVED_INTERFACE( css::lang::XEventListener, css::awt::XWindowListener ), - DIRECT_INTERFACE( css::beans::XMultiPropertySet ), - DIRECT_INTERFACE( css::beans::XFastPropertySet ), - DIRECT_INTERFACE( css::beans::XPropertySet ) + DIRECT_INTERFACE( css::beans::XMultiPropertySet ), + DIRECT_INTERFACE( css::beans::XFastPropertySet ), + DIRECT_INTERFACE( css::beans::XPropertySet ) ) -DEFINE_XTYPEPROVIDER_11 ( TabWindow , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XInitialization , +DEFINE_XTYPEPROVIDER_11 ( TabWindow , + css::lang::XTypeProvider , + css::lang::XServiceInfo , + css::lang::XInitialization , css::lang::XComponent , - css::awt::XWindowListener , + css::awt::XWindowListener , css::awt::XTopWindowListener , css::awt::XSimpleTabController , - css::lang::XEventListener , + css::lang::XEventListener , css::beans::XMultiPropertySet , css::beans::XFastPropertySet , css::beans::XPropertySet ) -DEFINE_XSERVICEINFO_MULTISERVICE ( TabWindow , +DEFINE_XSERVICEINFO_MULTISERVICE ( TabWindow , ::cppu::OWeakObject , - SERVICENAME_TABWINDOW , + SERVICENAME_TABWINDOW , IMPLEMENTATIONNAME_TABWINDOW ) @@ -310,7 +310,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) if ( !bInitalized ) { - css::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; css::uno::Reference< css::awt::XTopWindow > xTopWindow; css::uno::Reference< css::awt::XToolkit > xToolkit; css::awt::WindowDescriptor aDescriptor; @@ -400,12 +400,12 @@ throw (css::uno::Exception, css::uno::RuntimeException) xContainerWindow = css::uno::Reference< css::awt::XWindow >( xToolkit->createWindow( aDescriptor ), css::uno::UNO_QUERY ); // create a tab control window properties - aDescriptor.Type = css::awt::WindowClass_SIMPLE; + aDescriptor.Type = css::awt::WindowClass_SIMPLE; aDescriptor.WindowServiceName = DECLARE_ASCII("tabcontrol"); - aDescriptor.ParentIndex = -1; - aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >( xTopWindow, css::uno::UNO_QUERY ); - aDescriptor.Bounds = css::awt::Rectangle( 0,0,0,0 ); - aDescriptor.WindowAttributes = 0; + aDescriptor.ParentIndex = -1; + aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >( xTopWindow, css::uno::UNO_QUERY ); + aDescriptor.Bounds = css::awt::Rectangle( 0,0,0,0 ); + aDescriptor.WindowAttributes = 0; xTabControl = css::uno::Reference< css::awt::XWindow >( xToolkit->createWindow( aDescriptor ), css::uno::UNO_QUERY ); @@ -421,7 +421,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) xWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, css::awt::PosSize::POSSIZE ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) pWindow->Show( TRUE ); @@ -447,7 +447,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) } //--------------------------------------------------------------------------------------------------------- -// XComponent +// XComponent //--------------------------------------------------------------------------------------------------------- void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) { @@ -613,7 +613,7 @@ throw (css::uno::RuntimeException) } //--------------------------------------------------------------------------------------------------------- -// XSimpleTabController +// XSimpleTabController //--------------------------------------------------------------------------------------------------------- ::sal_Int32 SAL_CALL TabWindow::insertTab() @@ -839,18 +839,18 @@ throw (css::uno::RuntimeException) } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper +// OPropertySetHelper //--------------------------------------------------------------------------------------------------------- // XPropertySet helper sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , - sal_Int32 nHandle , + sal_Int32 nHandle , const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -966,7 +966,7 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper TABWINDOW_PROPHANDLE_TOPWINDOW, ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), com::sun::star::beans::PropertyAttribute::READONLY ) - }; // Use it to initialize sequence! + }; // Use it to initialize sequence! static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT ); // Return static "PropertyDescriptor" diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index e9a7e65cb552..87d48ddac7aa 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,12 +31,12 @@ #include <tabwin/tabwindow.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -44,14 +44,14 @@ #include <com/sun/star/awt/WindowAttribute.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -65,11 +65,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( TabWinFactory , - ::cppu::OWeakObject , - SERVICENAME_TABWINFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( TabWinFactory , + ::cppu::OWeakObject , + SERVICENAME_TABWINFACTORY , IMPLEMENTATIONNAME_TABWINFACTORY ) @@ -139,9 +139,9 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) { // describe window properties. css::awt::WindowDescriptor aDescriptor; - aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.ParentIndex = -1 ; - aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; + aDescriptor.Type = css::awt::WindowClass_TOP ; + aDescriptor.ParentIndex = -1 ; + aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; aDescriptor.Bounds = css::awt::Rectangle(0,0,0,0) ; aDescriptor.WindowAttributes = css::awt::WindowAttribute::BORDER| css::awt::WindowAttribute::SIZEABLE| @@ -161,7 +161,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) css::uno::Sequence< css::uno::Any > aArgs( 1 ); - aPropValue.Name = aTopWindowArgName; + aPropValue.Name = aTopWindowArgName; aPropValue.Value = css::uno::makeAny( xTopWindow ); aArgs[0] = css::uno::makeAny( aPropValue ); pTabWindow->initialize( aArgs ); diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx index c69906dacc74..4c5ebb7a5d91 100644 --- a/framework/source/threadhelp/lockhelper.cxx +++ b/framework/source/threadhelp/lockhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/lockhelper.hxx> #include <general.h> @@ -38,26 +38,26 @@ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vos/process.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/threadhelp/transactionmanager.cxx index 0c09f309a629..a42c871c176e 100644 --- a/framework/source/threadhelp/transactionmanager.cxx +++ b/framework/source/threadhelp/transactionmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/transactionmanager.hxx> #include <threadhelp/resetableguard.hxx> @@ -38,33 +38,33 @@ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported declarations +// non exported declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -99,7 +99,7 @@ TransactionManager::TransactionManager() TransactionManager::~TransactionManager() { } - + /*-****************************************************************************************************//** @interface ITransactionManager @short set new working mode @@ -365,9 +365,9 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas LOG_ERROR( "TransactionManager...", "Impossible case E_NOREASON!" ) } break; - default: break; // nothing to do + default: break; // nothing to do } } } -} // namespace framework +} // namespace framework diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 6dcb3604c138..6e3b8d85e662 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uiconfiguration/globalsettings.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/lang/XEventListener.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> @@ -55,17 +55,17 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace rtl; using namespace ::com::sun::star; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// static const char GLOBALSETTINGS_ROOT_ACCESS[] = "/org.openoffice.Office.UI.GlobalSettings/Toolbars"; @@ -78,12 +78,12 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for WindowState supplier implementation +// Configuration access class for WindowState supplier implementation //***************************************************************************************************************** -class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , +class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , public ::com::sun::star::lang::XEventListener , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { public: @@ -104,7 +104,7 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , // settings access sal_Bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); sal_Bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); - + private: sal_Bool impl_initConfigAccess(); @@ -121,7 +121,7 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , //***************************************************************************************************************** -// XInterface +// XInterface //***************************************************************************************************************** DEFINE_XINTERFACE_2 ( GlobalSettings_Access , OWeakObject , @@ -147,28 +147,28 @@ GlobalSettings_Access::~GlobalSettings_Access() } // XComponent -void SAL_CALL GlobalSettings_Access::dispose() +void SAL_CALL GlobalSettings_Access::dispose() throw ( css::uno::RuntimeException ) { // SAFE ResetableGuard aLock( m_aLock ); - + m_xConfigAccess.clear(); m_bDisposed = sal_True; } - -void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) + +void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException) { } -void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) +void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException) { } // XEventListener -void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) +void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException) { // SAFE @@ -189,7 +189,7 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl return sal_False; if ( !m_bConfigRead ) - { + { m_bConfigRead = sal_True; impl_initConfigAccess(); } @@ -225,9 +225,9 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle if ( m_bDisposed ) return sal_False; - + if ( !m_bConfigRead ) - { + { m_bConfigRead = sal_True; impl_initConfigAccess(); } @@ -245,7 +245,7 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle a = xNameAccess->getByName( m_aPropLocked ); else if ( eStateInfo == GlobalSettings::STATEINFO_DOCKED ) a = xNameAccess->getByName( m_aPropDocked ); - + aValue = a; return sal_True; } @@ -265,15 +265,15 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() { css::uno::Sequence< css::uno::Any > aArgs( 2 ); css::beans::PropertyValue aPropValue; - + try { css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider; if ( m_xServiceManager.is() ) - xConfigProvider = css::uno::Reference< css::lang::XMultiServiceFactory >( - m_xServiceManager->createInstance( SERVICENAME_CFGPROVIDER ), + xConfigProvider = css::uno::Reference< css::lang::XMultiServiceFactory >( + m_xServiceManager->createInstance( SERVICENAME_CFGPROVIDER ), css::uno::UNO_QUERY ); - + if ( xConfigProvider.is() ) { aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); @@ -282,16 +282,16 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" )); aPropValue.Value = css::uno::makeAny( sal_True ); aArgs[1] = css::uno::makeAny( aPropValue ); - - m_xConfigAccess = css::uno::Reference< css::container::XNameAccess >( - xConfigProvider->createInstanceWithArguments( - SERVICENAME_CFGREADACCESS, aArgs ), + + m_xConfigAccess = css::uno::Reference< css::container::XNameAccess >( + xConfigProvider->createInstanceWithArguments( + SERVICENAME_CFGREADACCESS, aArgs ), css::uno::UNO_QUERY ); css::uno::Reference< css::lang::XComponent > xComponent( xConfigProvider, css::uno::UNO_QUERY ); if ( xComponent.is() ) - xComponent->addEventListener( - css::uno::Reference< css::lang::XEventListener >( + xComponent->addEventListener( + css::uno::Reference< css::lang::XEventListener >( static_cast< cppu::OWeakObject* >( this ), css::uno::UNO_QUERY )); } @@ -309,7 +309,7 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() } //***************************************************************************************************************** -// global class +// global class //***************************************************************************************************************** struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {}; @@ -318,7 +318,7 @@ static GlobalSettings_Access* pStaticSettings = 0; static GlobalSettings_Access* GetGlobalSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSrvMgr ) { osl::MutexGuard aGuard(mutexGlobalSettings::get()); - if ( !pStaticSettings ) + if ( !pStaticSettings ) pStaticSettings = new GlobalSettings_Access( rSrvMgr ); return pStaticSettings; } @@ -336,7 +336,7 @@ GlobalSettings::~GlobalSettings() sal_Bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xSrvMgr )); - + if ( pSettings ) return pSettings->HasStatesInfo( eElementType ); else @@ -346,7 +346,7 @@ sal_Bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) sal_Bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xSrvMgr )); - + if ( pSettings ) return pSettings->GetStateInfo( eElementType, eStateInfo, aValue ); else diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index 7f41169a747f..3ba90227b2f5 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,11 +30,11 @@ #include <uiconfiguration/graphicnameaccess.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/sequence.hxx> @@ -51,7 +51,7 @@ GraphicNameAccess::GraphicNameAccess() GraphicNameAccess::~GraphicNameAccess() { } - + void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Reference< graphic::XGraphic >& rElement ) { m_aNameToElementMap.insert( NameGraphicHashMap::value_type( rName, rElement )); @@ -59,7 +59,7 @@ void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Refer // XNameAccess uno::Any SAL_CALL GraphicNameAccess::getByName( const ::rtl::OUString& aName ) -throw( container::NoSuchElementException, +throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 9e02fb57c334..fc18c2ac95ce 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/ui/ImageType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -63,7 +63,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using ::rtl::OUString; @@ -95,11 +95,11 @@ namespace framework typedef GraphicNameAccess CmdToXGraphicNameAccess; //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE ( ImageManager , +DEFINE_XSERVICEINFO_MULTISERVICE ( ImageManager , ::cppu::OWeakObject , - SERVICENAME_IMAGEMANAGER , + SERVICENAME_IMAGEMANAGER , IMPLEMENTATIONNAME_IMAGEMANAGER ) @@ -167,7 +167,7 @@ throw (::com::sun::star::uno::RuntimeException) ::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - return m_pImpl->hasImage(nImageType,aCommandURL); + return m_pImpl->hasImage(nImageType,aCommandURL); } Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages( @@ -178,42 +178,42 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: return m_pImpl->getImages(nImageType,aCommandURLSequence); } -void SAL_CALL ImageManager::replaceImages( - ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, - const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void SAL_CALL ImageManager::replaceImages( + ::sal_Int16 nImageType, + const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } -void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } -void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +throw ( ::com::sun::star::container::ElementExistException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration -void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_pImpl->addConfigurationListener(xListener); } -void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -221,26 +221,26 @@ throw (::com::sun::star::uno::RuntimeException) } // XUIConfigurationPersistence -void SAL_CALL ImageManager::reload() -throw ( ::com::sun::star::uno::Exception, +void SAL_CALL ImageManager::reload() +throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { m_pImpl->reload(); } -void SAL_CALL ImageManager::store() +void SAL_CALL ImageManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->store(); } -void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) +void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->storeToStorage(Storage); } -sal_Bool SAL_CALL ImageManager::isModified() +sal_Bool SAL_CALL ImageManager::isModified() throw (::com::sun::star::uno::RuntimeException) { return m_pImpl->isModified(); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index ff99b5ae508b..24e19977c680 100755 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/ui/ImageType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -63,7 +63,7 @@ #include "svtools/miscopt.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using ::rtl::OUString; @@ -161,7 +161,7 @@ static rtl::OUString getCanonicalName( const rtl::OUString& rFileName ) { // map forbidden characters to escape case '/' : if ( !bRemoveSlash ) - aBuf.appendAscii( "%2f" ); + aBuf.appendAscii( "%2f" ); break; case '\\': aBuf.appendAscii( "%5c" ); bRemoveSlash = false; break; case ':' : aBuf.appendAscii( "%3a" ); bRemoveSlash = false; break; @@ -170,7 +170,7 @@ static rtl::OUString getCanonicalName( const rtl::OUString& rFileName ) case '<' : aBuf.appendAscii( "%3c" ); bRemoveSlash = false; break; case '>' : aBuf.appendAscii( "%3e" ); bRemoveSlash = false; break; case '|' : aBuf.appendAscii( "%7c" ); bRemoveSlash = false; break; - default: aBuf.append( c ); bRemoveSlash = false; + default: aBuf.append( c ); bRemoveSlash = false; } } return aBuf.makeStringAndClear(); @@ -255,7 +255,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() { OUString aCommandName( m_aImageCommandNameVector[i] ); String aImageName; - + if ( aCommandName.indexOf( aUNOString ) != 0 ) { INetURLObject aUrlObject( aCommandName, INetURLObject::ENCODE_ALL ); @@ -264,13 +264,13 @@ void CmdImageList::impl_fillCommandToImageNameMap() } else { - // just remove the schema + // just remove the schema if ( aCommandName.getLength() > 5 ) aImageName = aCommandName.copy( 5 ); else aImageName = aEmptyString; - - // Search for query part. + + // Search for query part. sal_Int32 nIndex = aImageName.Search( '?' ); if ( nIndex != STRING_NOTFOUND ) aImageName = getCanonicalName( aImageName ); // convert to valid filename @@ -279,7 +279,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() // reflect this. aImageName += aExt; aImageName.ToLowerAscii(); - + m_aImageNameVector[i] = aImageName; m_aCommandToImageNameMap.insert( CommandToImageNameMap::value_type( aCommandName, aImageName )); } @@ -666,7 +666,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( } uno::Reference< XTransactedObject > xTransaction; - + // Commit user image storage xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY ); if ( xTransaction.is() ) @@ -676,7 +676,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY ); if ( xTransaction.is() ) xTransaction->commit(); - + return sal_True; } } @@ -708,7 +708,7 @@ ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory > , m_xOwner(_xOwner) , m_pDefaultImageList( 0 ) , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" )) - , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList )) + , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList )) , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_bUseGlobal(_bUseGlobal) , m_bReadOnly( true ) @@ -742,7 +742,7 @@ void ImageManagerImpl::dispose() m_bConfigRead = false; m_bModified = false; m_bDisposed = true; - + // delete user and default image list on dispose for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) { @@ -752,7 +752,7 @@ void ImageManagerImpl::dispose() delete m_pDefaultImageList; m_pDefaultImageList = 0; } - + } void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { @@ -860,12 +860,12 @@ throw (::com::sun::star::uno::RuntimeException) ImageNameMap aImageCmdNameMap; sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); - + sal_uInt32 i( 0 ); if ( m_bUseGlobal ) { rtl::Reference< GlobalImageList > rGlobalImageList = implts_getGlobalImageList(); - + const std::vector< OUString >& rGlobalImageNameVector = rGlobalImageList->getImageCommandNames(); const sal_uInt32 nGlobalCount = rGlobalImageNameVector.size(); for ( i = 0; i < nGlobalCount; i++ ) @@ -972,20 +972,20 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: return aGraphSeq; } -void ImageManagerImpl::replaceImages( - ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, - const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void ImageManagerImpl::replaceImages( + ::sal_Int16 nImageType, + const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { CmdToXGraphicNameAccess* pInsertedImages( 0 ); CmdToXGraphicNameAccess* pReplacedImages( 0 ); - + { ResetableGuard aLock( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); @@ -999,14 +999,14 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); ImageList* pImageList = implts_getUserImageList( ImageType( nIndex )); - + uno::Reference< XGraphic > xGraphic; for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ ) { // Check size and scale. If we don't have any graphics ignore it if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex )) continue; - + USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] ); if ( nPos == IMAGELIST_IMAGE_NOTFOUND ) { @@ -1039,7 +1039,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, aInsertEvent.Accessor <<= m_xOwner; aInsertEvent.Source = m_xOwner; aInsertEvent.ResourceURL = m_aResourceString; - aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY )); implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert ); } @@ -1051,15 +1051,15 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, aReplaceEvent.Source = m_xOwner; aReplaceEvent.ResourceURL = m_aResourceString; aReplaceEvent.ReplacedElement = Any(); - aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY )); implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace ); } } -void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { CmdToXGraphicNameAccess* pRemovedImages( 0 ); @@ -1160,10 +1160,10 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, } } -void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +throw ( ::com::sun::star::container::ElementExistException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { replaceImages(nImageType,aCommandURLSequence,aGraphicSequence); @@ -1171,8 +1171,8 @@ throw ( ::com::sun::star::container::ElementExistException, // XUIConfigurationPersistence -void ImageManagerImpl::reload() -throw ( ::com::sun::star::uno::Exception, +void ImageManagerImpl::reload() +throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -1180,9 +1180,9 @@ throw ( ::com::sun::star::uno::Exception, if ( m_bDisposed ) throw DisposedException(); - CommandMap aOldUserCmdImageSet; + CommandMap aOldUserCmdImageSet; std::vector< rtl::OUString > aNewUserCmdImageSet; - + if ( m_bModified ) { for ( sal_Int16 i = 0; i < sal_Int16( ImageType_COUNT ); i++ ) @@ -1198,12 +1198,12 @@ throw ( ::com::sun::star::uno::Exception, const sal_uInt32 nOldCount = aOldUserCmdImageVector.size(); for ( j = 0; j < nOldCount; j++ ) aOldUserCmdImageSet.insert( CommandMap::value_type( aOldUserCmdImageVector[j], false )); - + // Attention: This can make the old image list pointer invalid! implts_loadUserImages( (ImageType)i, m_xUserImageStorage, m_xUserBitmapsStorage ); pImageList = implts_getUserImageList( (ImageType)i ); pImageList->GetImageNames( aNewUserCmdImageSet ); - + CmdToXGraphicNameAccess* pInsertedImages( 0 ); CmdToXGraphicNameAccess* pReplacedImages( 0 ); CmdToXGraphicNameAccess* pRemovedImages( 0 ); @@ -1217,20 +1217,20 @@ throw ( ::com::sun::star::uno::Exception, pIter->second = true; // mark entry as replaced if ( !pReplacedImages ) pReplacedImages = new CmdToXGraphicNameAccess(); - pReplacedImages->addElement( aNewUserCmdImageSet[j], + pReplacedImages->addElement( aNewUserCmdImageSet[j], pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() ); } else { if ( !pInsertedImages ) pInsertedImages = new CmdToXGraphicNameAccess(); - pInsertedImages->addElement( aNewUserCmdImageSet[j], + pInsertedImages->addElement( aNewUserCmdImageSet[j], pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() ); } } - // Search map for unmarked entries => they have been removed from the user list - // through this reload operation. + // Search map for unmarked entries => they have been removed from the user list + // through this reload operation. // We have to search the module and global image list! rtl::Reference< GlobalImageList > rGlobalImageList; CmdImageList* pDefaultImageList = NULL; @@ -1276,9 +1276,9 @@ throw ( ::com::sun::star::uno::Exception, } ++pIter; } - + aGuard.unlock(); - + // Now notify our listeners. Unlock mutex to prevent deadlocks if ( pInsertedImages != 0 ) { @@ -1287,7 +1287,7 @@ throw ( ::com::sun::star::uno::Exception, aInsertEvent.Accessor = uno::makeAny( m_xOwner ); aInsertEvent.Source = m_xOwner; aInsertEvent.ResourceURL = m_aResourceString; - aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY )); implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert ); } @@ -1299,7 +1299,7 @@ throw ( ::com::sun::star::uno::Exception, aReplaceEvent.Source = m_xOwner; aReplaceEvent.ResourceURL = m_aResourceString; aReplaceEvent.ReplacedElement = Any(); - aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY )); implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace ); } @@ -1310,7 +1310,7 @@ throw ( ::com::sun::star::uno::Exception, aRemoveEvent.Accessor = uno::makeAny( m_xOwner ); aRemoveEvent.Source = m_xOwner; aRemoveEvent.ResourceURL = m_aResourceString; - aRemoveEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aRemoveEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY )); implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove ); } @@ -1321,7 +1321,7 @@ throw ( ::com::sun::star::uno::Exception, } } -void ImageManagerImpl::store() +void ImageManagerImpl::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); @@ -1340,7 +1340,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException m_bUserImageListModified[i] = false; } - if ( bWritten && + if ( bWritten && m_xUserConfigStorage.is() ) { uno::Reference< XTransactedObject > xUserConfigStorageCommit( m_xUserConfigStorage, UNO_QUERY ); @@ -1354,7 +1354,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } } -void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage ) +void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); @@ -1366,7 +1366,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { long nModes = ElementModes::READWRITE; - uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), + uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), nModes ); if ( xUserImageStorage.is() ) { @@ -1377,7 +1377,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException implts_getUserImageList( (ImageType)i ); implts_storeUserImages( (ImageType)i, xUserImageStorage, xUserBitmapsStorage ); } - + uno::Reference< XTransactedObject > xTransaction( Storage, UNO_QUERY ); if ( xTransaction.is() ) xTransaction->commit(); @@ -1385,7 +1385,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } } -sal_Bool ImageManagerImpl::isModified() +sal_Bool ImageManagerImpl::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); @@ -1398,21 +1398,21 @@ sal_Bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeExc return m_bReadOnly; } // XUIConfiguration -void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { { ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener ); } -void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -1422,7 +1422,7 @@ throw (::com::sun::star::uno::RuntimeException) void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) ); if ( pContainer != NULL ) { diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 5e213f8a598f..2a3a643731ab 100755 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -48,7 +48,7 @@ #include <uiconfiguration/imagetype.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -63,7 +63,7 @@ #include <com/sun/star/ui/XImageManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -83,7 +83,7 @@ namespace framework CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::rtl::OUString& aModuleIdentifier ); virtual ~CmdImageList(); - + virtual Image getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); virtual ::std::vector< rtl::OUString >& getImageNames(); @@ -116,7 +116,7 @@ namespace framework virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); virtual ::std::vector< rtl::OUString >& getImageNames(); virtual ::std::vector< rtl::OUString >& getImageCommandNames(); - + // Reference virtual oslInterlockedCount SAL_CALL acquire(); virtual oslInterlockedCount SAL_CALL release(); @@ -125,7 +125,7 @@ namespace framework oslInterlockedCount m_nRefCount; }; - class ImageManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. + class ImageManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. { public: @@ -161,18 +161,18 @@ namespace framework void clear(); - typedef std::hash_map< rtl::OUString, - sal_Bool, + typedef std::hash_map< rtl::OUString, + sal_Bool, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageNameMap; - + enum Layer { LAYER_DEFAULT, LAYER_USERDEFINED, LAYER_COUNT }; - + enum NotifyOp { NotifyOp_Remove, @@ -187,10 +187,10 @@ namespace framework void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); ImageList* implts_getUserImageList( ImageType nImageType ); sal_Bool implts_loadUserImages( ImageType nImageType, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, + const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); sal_Bool implts_storeUserImages( ImageType nImageType, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, + const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); const rtl::Reference< GlobalImageList >& implts_getGlobalImageList(); CmdImageList* implts_getDefaultImageList(); @@ -206,7 +206,7 @@ namespace framework CmdImageList* m_pDefaultImageList; rtl::OUString m_aXMLPostfix; rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aResourceString; + rtl::OUString m_aResourceString; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ImageList* m_pUserImageList[ImageType_COUNT]; bool m_bUserImageListModified[ImageType_COUNT]; @@ -215,7 +215,7 @@ namespace framework bool m_bInitialized; bool m_bModified; bool m_bConfigRead; - bool m_bDisposed; + bool m_bDisposed; }; } diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index cd400b7e3f43..d76fdcf4c67f 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -68,7 +68,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using ::rtl::OUString; @@ -139,7 +139,7 @@ throw (::com::sun::star::uno::RuntimeException) ::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - return m_pImpl->hasImage(nImageType,aCommandURL); + return m_pImpl->hasImage(nImageType,aCommandURL); } Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( @@ -167,7 +167,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { - m_pImpl->removeImages(nImageType,aCommandURLSequence); + m_pImpl->removeImages(nImageType,aCommandURLSequence); } void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) @@ -180,39 +180,39 @@ throw ( ::com::sun::star::container::ElementExistException, } // XUIConfiguration -void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_pImpl->addConfigurationListener(xListener); } -void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_pImpl->removeConfigurationListener(xListener); } // XUIConfigurationPersistence -void SAL_CALL ModuleImageManager::reload() -throw ( ::com::sun::star::uno::Exception, +void SAL_CALL ModuleImageManager::reload() +throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { m_pImpl->reload(); } -void SAL_CALL ModuleImageManager::store() +void SAL_CALL ModuleImageManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->store(); } -void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) +void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->storeToStorage(Storage); } -sal_Bool SAL_CALL ModuleImageManager::isModified() +sal_Bool SAL_CALL ModuleImageManager::isModified() throw (::com::sun::star::uno::RuntimeException) { return m_pImpl->isModified(); diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 24c0f152e5a3..e4a815faafea 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/embed/XPackageStructureCreator.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/logfile.hxx> #include <cppuhelper/implbase1.hxx> @@ -85,7 +85,7 @@ class RootStorageWrapper : public ::cppu::WeakImplHelper1< com::sun::star::embe }; //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_4 ( ModuleUIConfigurationManagerSupplier , OWeakObject , @@ -96,8 +96,8 @@ DEFINE_XINTERFACE_4 ( ModuleUIConfigurationManagerSupplier ) DEFINE_XTYPEPROVIDER_4 ( ModuleUIConfigurationManagerSupplier , - css::lang::XTypeProvider , - css::lang::XServiceInfo , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::lang::XComponent , ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier ) diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 54f8ecf5064f..607efce4d4d6 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/io/XStream.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -60,7 +60,7 @@ #include <comphelper/sequenceashashmap.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using rtl::OUString; @@ -76,7 +76,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_8 ( ModuleUIConfigurationManager , OWeakObject , @@ -91,19 +91,19 @@ DEFINE_XINTERFACE_8 ( ModuleUIConfigurationManager ) DEFINE_XTYPEPROVIDER_8 ( ModuleUIConfigurationManager , - css::lang::XTypeProvider , - css::lang::XServiceInfo , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::lang::XComponent , css::lang::XInitialization , ::com::sun::star::ui::XUIConfiguration , ::com::sun::star::ui::XUIConfigurationManager , ::com::sun::star::ui::XModuleUIConfigurationManager , - ::com::sun::star::ui::XUIConfigurationPersistence + ::com::sun::star::ui::XUIConfigurationPersistence ) DEFINE_XSERVICEINFO_MULTISERVICE ( ModuleUIConfigurationManager , ::cppu::OWeakObject , - SERVICENAME_MODULEUICONFIGURATIONMANAGER , + SERVICENAME_MODULEUICONFIGURATIONMANAGER , IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER ) @@ -178,7 +178,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType ); if ( pDataSettings ) @@ -191,7 +191,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme Any a = xPropSet->getPropertyValue( m_aPropUIName ); a >>= aUIName; } - + UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo )); } @@ -216,7 +216,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType ); if ( pDataSettings ) @@ -229,7 +229,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme Any a = xPropSet->getPropertyValue( m_aPropUIName ); a >>= aUIName; } - + UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } @@ -241,13 +241,13 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } } - + ++pDefIter; } } void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType ) -{ +{ UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType]; if ( !rElementTypeData.bLoaded ) @@ -267,7 +267,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ ) { UIElementData aUIElementData; - + // Resource name must be without ".xml" sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() )) @@ -275,7 +275,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); - if (( aUIElementName.getLength() > 0 ) && + if (( aUIElementName.getLength() > 0 ) && ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 ))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; @@ -287,7 +287,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, aUIElementData.bDefault = false; aUIElementData.bDefaultNode = false; } - + // Create hash_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); @@ -338,7 +338,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement } } break; - + case ::com::sun::star::ui::UIElementType::POPUPMENU: { break; @@ -357,7 +357,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -374,7 +374,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -388,7 +388,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement catch ( ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( ::com::sun::star::lang::IllegalArgumentException& ) { } catch ( ::com::sun::star::io::IOException& ) @@ -422,7 +422,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl return &(pIter->second); } } - + // Not successfull, we have to look into our default vector/hash_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); @@ -441,7 +441,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { UIElementDataHashMap& rHashMap = rElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -456,7 +456,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY ); Reference< XOutputStream > xOutputStream( xStream->getOutputStream() ); - + if ( xOutputStream.is() ) { switch( rElementType.nElementType ) @@ -497,18 +497,18 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag } } break; - + default: break; } } - + // mark as not modified if we store to our own storage if ( bResetModifyState ) rElement.bModified = sal_False; } } - + ++pIter; } @@ -523,20 +523,20 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag } // This is only allowed to be called on the LAYER_USER_DEFINED! -void ModuleUIConfigurationManager::impl_resetElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void ModuleUIConfigurationManager::impl_resetElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling // our listeners! while ( pIter != rHashMap.end() ) @@ -549,16 +549,16 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData( // Replace settings with data from default layer Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = xIfac; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; - + rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -572,16 +572,16 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData( aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; rElement.bDefault = true; } } - + ++pIter; } @@ -589,10 +589,10 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData( rHashMap.clear(); } -void ModuleUIConfigurationManager::impl_reloadElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void ModuleUIConfigurationManager::impl_reloadElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; @@ -601,11 +601,11 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage ); Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); - + Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -617,16 +617,16 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = xIfac; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + rElement.bModified = false; } else if ( xDefaultNameAccess->hasByName( rElement.aName )) @@ -635,16 +635,16 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = xIfac; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -654,14 +654,14 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( { // Element settings are not in any storage => remove ConfigurationEvent aRemoveEvent; - + aRemoveEvent.ResourceURL = rElement.aResourceURL; aRemoveEvent.Accessor <<= xThis; aRemoveEvent.Source = xIfac; aRemoveEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aRemoveEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -755,7 +755,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( com::sun::star::uno: { for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) m_pStorageHandler[i] = 0; - + // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT ); @@ -775,7 +775,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u css::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aGuard( m_aLock ); Reference< XComponent > xModuleImageManager( m_xModuleImageManager ); @@ -791,7 +791,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u m_bDisposed = true; aGuard.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - + try { if ( xModuleImageManager.is() ) @@ -811,7 +811,7 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } @@ -825,7 +825,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); @@ -851,15 +851,15 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a css::uno::Reference< css::embed::XStorage >()); // no document root used here! } } - + // initialize root storages for all resource types m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); + m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser()); - + if ( m_xUserConfigStorage.is() ) { Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY ); @@ -871,10 +871,10 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } - + impl_Initialize(); - m_bInitialized = true; + m_bInitialized = true; } } @@ -883,12 +883,12 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe { { ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } @@ -898,7 +898,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const R m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } - + // XUIConfigurationManager void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException) { @@ -907,7 +907,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); - + bool bResetStorage( false ); if ( !isReadOnly() ) @@ -922,7 +922,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno if ( xSubStorage.is() ) { - bool bCommitSubStorage( false ); + bool bCommitSubStorage( false ); Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY ); Sequence< OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames(); for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ ) @@ -930,7 +930,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno xSubStorage->removeElement( aUIElementStreamNames[j] ); bCommitSubStorage = true; } - + if ( bCommitSubStorage ) { Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY ); @@ -942,7 +942,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno } bResetStorage = true; - + // remove settings from user defined layer and notify listener about removed settings data! ConfigEventNotifyContainer aRemoveEventNotifyContainer; ConfigEventNotifyContainer aReplaceEventNotifyContainer; @@ -952,7 +952,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][j]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][j]; - + impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer ); rUserElementType.bModified = sal_False; } @@ -961,12 +961,12 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno throw IOException(); } } - + m_bModified = sal_False; // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners sal_uInt32 k = 0; for ( k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) @@ -986,7 +986,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) { } - } + } } Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) @@ -1032,34 +1032,34 @@ throw ( IllegalArgumentException, RuntimeException ) Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + // Creates an empty item container which can be filled from outside return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); } -sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings ) return sal_True; } - + return sal_False; } @@ -1067,17 +1067,17 @@ Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( co throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -1088,16 +1088,16 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pDataSettings->xSettings; } } - + throw NoSuchElementException(); } -void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1105,7 +1105,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1142,9 +1142,9 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la aEvent.Source = xIfac; aEvent.ReplacedElement <<= xOldSettings; aEvent.Element <<= pDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else @@ -1169,7 +1169,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // Modify type container UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType]; rElementType.bModified = true; - + UIElementDataHashMap& rElements = rElementType.aElementsHashMap; // Check our user element settings hash map as it can already contain settings that have been set to default! @@ -1179,21 +1179,21 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la pIter->second = aUIElementData; else rElements.insert( UIElementDataHashMap::value_type( ResourceURL, aUIElementData )); - + Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.ReplacedElement <<= pDataSettings->xSettings; aEvent.Element <<= aUIElementData.xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } } @@ -1206,8 +1206,8 @@ void SAL_CALL ModuleUIConfigurationManager::removeSettings( const ::rtl::OUStrin throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1215,10 +1215,10 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -1229,7 +1229,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings; pDataSettings->bDefault = true; - + // check if this is a default layer node if ( !pDataSettings->bDefaultNode ) pDataSettings->bModified = true; // we have to remove this node from the user layer! @@ -1249,29 +1249,29 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xRemovedSettings; aEvent.ReplacedElement <<= pDefaultDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else { // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xRemovedSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Remove ); } } @@ -1279,14 +1279,14 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else throw NoSuchElementException(); } -} +} void SAL_CALL ModuleUIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1294,10 +1294,10 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType ); if ( !pDataSettings ) { @@ -1322,21 +1322,21 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, UIElementDataHashMap& rElements = rElementType.aElementsHashMap; rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, aUIElementData )); - + Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings ); Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = NewResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xInsertSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Insert ); } else @@ -1353,10 +1353,10 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() if ( !m_xModuleImageManager.is() ) { - m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), + m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), UNO_QUERY ); Reference< XInitialization > xInit( m_xModuleImageManager, UNO_QUERY ); - + Sequence< Any > aPropSeq( 3 ); PropertyValue aPropValue; aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); @@ -1368,7 +1368,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" )); aPropValue.Value = makeAny( m_xUserRootCommit ); aPropSeq[2] = makeAny( aPropValue ); - + xInit->initialize( aPropSeq ); } @@ -1387,20 +1387,20 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage if ( !m_xModuleAcceleratorManager.is() ) { - Reference< XInterface > xManager = xSMGR->createInstance(SERVICENAME_MODULEACCELERATORCONFIGURATION); + Reference< XInterface > xManager = xSMGR->createInstance(SERVICENAME_MODULEACCELERATORCONFIGURATION); Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW); - + PropertyValue aProp; aProp.Name = ::rtl::OUString::createFromAscii("ModuleIdentifier"); aProp.Value <<= aModule; - + Sequence< Any > lArgs(1); lArgs[0] <<= aProp; - + xInit->initialize(lArgs); m_xModuleAcceleratorManager = Reference< XInterface >( xManager, UNO_QUERY ); } - + return m_xModuleAcceleratorManager; } @@ -1414,14 +1414,14 @@ sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const ::rtl:: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1429,22 +1429,22 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: if ( pDataSettings && pDataSettings->bDefaultNode ) return sal_True; } - + return sal_False; } -Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) +Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1461,7 +1461,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pIter->second.xSettings; } } - + // Nothing has been found! throw NoSuchElementException(); } @@ -1485,7 +1485,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][i]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][i]; - + if ( rUserElementType.bModified ) impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer ); } @@ -1499,7 +1499,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ ) implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove ); @@ -1514,7 +1514,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno if ( m_bDisposed ) throw DisposedException(); - + if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder @@ -1524,7 +1524,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno { UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY ); - + if ( rElementType.bModified && xStorage.is() ) { impl_storeElementTypeData( xStorage, rElementType ); @@ -1536,7 +1536,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno throw IOException(); } } - + m_bModified = false; } } @@ -1555,10 +1555,10 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt { try { - Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( + Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; - + if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } @@ -1567,7 +1567,7 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt throw IOException(); } } - + Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); if ( xTransactedObject.is() ) xTransactedObject->commit(); @@ -1577,14 +1577,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bModified; } sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bReadOnly; } diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index a3510df76506..9ff03d3c6b39 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_UICONFIGURATION_UICATEGORYDESCRPTION_HXX_ @@ -41,7 +41,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase2.hxx> @@ -64,7 +64,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -75,7 +75,7 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -95,7 +95,7 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for PopupMenuControllerFactory implementation +// Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** class ConfigurationAccess_UICategory : // Order is neccessary for right initialization! @@ -157,7 +157,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali }; //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XMultiServiceFactory >& rServiceManager ) : @@ -436,11 +436,11 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICategoryDescription , - ::cppu::OWeakObject , - SERVICENAME_UICATEGORYDESCRIPTION , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICategoryDescription , + ::cppu::OWeakObject , + SERVICENAME_UICATEGORYDESCRIPTION , IMPLEMENTATIONNAME_UICATEGORYDESCRIPTION ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index dd9d42958a36..e704fe680ae9 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -54,14 +54,14 @@ #include <com/sun/star/embed/XTransactedObject.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using namespace com::sun::star::uno; @@ -76,7 +76,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_7 ( UIConfigurationManager , OWeakObject , @@ -90,8 +90,8 @@ DEFINE_XINTERFACE_7 ( UIConfigurationManager ) DEFINE_XTYPEPROVIDER_7 ( UIConfigurationManager , - css::lang::XTypeProvider , - css::lang::XServiceInfo , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::lang::XComponent , ::com::sun::star::ui::XUIConfiguration , ::com::sun::star::ui::XUIConfigurationManager , @@ -101,7 +101,7 @@ DEFINE_XTYPEPROVIDER_7 ( UIConfigurationManager DEFINE_XSERVICEINFO_MULTISERVICE ( UIConfigurationManager , ::cppu::OWeakObject , - SERVICENAME_UICONFIGURATIONMANAGER , + SERVICENAME_UICONFIGURATIONMANAGER , IMPLEMENTATIONNAME_UICONFIGURATIONMANAGER ) @@ -311,7 +311,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -325,7 +325,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, catch ( ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( ::com::sun::star::lang::IllegalArgumentException& ) { } catch ( ::com::sun::star::io::IOException& ) @@ -425,7 +425,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x } } break; - + default: break; } @@ -746,16 +746,16 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ ) { UIElementType& rDocElementType = m_aUIElements[j]; - + impl_resetElementTypeData( rDocElementType, aRemoveEventNotifyContainer ); rDocElementType.bModified = sal_False; } - + m_bModified = sal_False; // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners for ( sal_uInt32 k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove ); @@ -771,8 +771,8 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt } catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) { - } - } + } + } } Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) @@ -818,20 +818,20 @@ throw ( IllegalArgumentException, RuntimeException ) Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + // Creates an empty item container which can be filled from outside return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer()), UNO_QUERY ); } -sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else @@ -840,7 +840,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: if ( pDataSettings && !pDataSettings->bDefault ) return sal_True; } - + return sal_False; } @@ -848,17 +848,17 @@ Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const :: throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings && !pDataSettings->bDefault ) { @@ -869,16 +869,16 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pDataSettings->xSettings; } } - + throw NoSuchElementException(); } -void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -886,7 +886,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -922,9 +922,9 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la aEvent.Source = xIfac; aEvent.ReplacedElement <<= xOldSettings; aEvent.Element <<= pDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else @@ -936,8 +936,8 @@ void SAL_CALL UIConfigurationManager::removeSettings( const ::rtl::OUString& Res throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -945,10 +945,10 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -959,7 +959,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings; pDataSettings->bDefault = true; - + // check if this is a default layer node pDataSettings->bModified = true; // we have to remove this node from the user layer! pDataSettings->xSettings.clear(); @@ -974,28 +974,28 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xRemovedSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Remove ); } } else throw NoSuchElementException(); } -} +} void SAL_CALL UIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1003,23 +1003,23 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + bool bInsertData( false ); UIElementData aUIElementData; UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType ); - + if ( pDataSettings && !pDataSettings->bDefault ) throw ElementExistException(); - + if ( !pDataSettings ) { pDataSettings = &aUIElementData; bInsertData = true; } - + { pDataSettings->bDefault = false; pDataSettings->bModified = true; @@ -1040,25 +1040,25 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, { pDataSettings->aName = RetrieveNameFromResourceURL( NewResourceURL ) + m_aXMLPostfix; pDataSettings->aResourceURL = NewResourceURL; - + UIElementDataHashMap& rElements = rElementType.aElementsHashMap; rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, *pDataSettings )); } - + Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings ); Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = NewResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xInsertSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Insert ); } } @@ -1071,10 +1071,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw if ( !m_xImageManager.is() ) { - m_xImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), + m_xImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), UNO_QUERY ); Reference< XInitialization > xInit( m_xImageManager, UNO_QUERY ); - + Sequence< Any > aPropSeq( 2 ); PropertyValue aPropValue; aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); @@ -1083,7 +1083,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" )); aPropValue.Value = makeAny( m_aModuleIdentifier ); aPropSeq[1] = makeAny( aPropValue ); - + xInit->initialize( aPropSeq ); } @@ -1094,34 +1094,34 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th { // SAFE -> ResetableGuard aGuard( m_aLock ); - + if (m_xAccConfig.is()) return m_xAccConfig; - + Reference< XMultiServiceFactory > xSMGR = m_xServiceManager; Reference< XStorage > xDocumentRoot = m_xDocConfigStorage; - + aGuard.unlock(); // <- SAFE - - Reference< XInterface > xAccConfig = xSMGR->createInstance(SERVICENAME_DOCUMENTACCELERATORCONFIGURATION); + + Reference< XInterface > xAccConfig = xSMGR->createInstance(SERVICENAME_DOCUMENTACCELERATORCONFIGURATION); Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW); - + PropertyValue aProp; aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot"); aProp.Value <<= xDocumentRoot; - + Sequence< Any > lArgs(1); lArgs[0] <<= aProp; - + xInit->initialize(lArgs); - + // SAFE -> aGuard.lock(); - m_xAccConfig = xAccConfig; + m_xAccConfig = xAccConfig; aGuard.unlock(); // <- SAFE - + return xAccConfig; } @@ -1134,10 +1134,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() thro void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + if ( m_xDocConfigStorage.is() ) { try @@ -1159,7 +1159,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY); if ( xAccUpdate.is() ) xAccUpdate->setStorage( m_xDocConfigStorage ); - + if ( m_xImageManager.is() ) { ImageManager* pImageManager = (ImageManager*)m_xImageManager.get(); @@ -1232,7 +1232,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ ) implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove ); @@ -1247,7 +1247,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce if ( m_bDisposed ) throw DisposedException(); - + if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder @@ -1257,7 +1257,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce { UIElementType& rElementType = m_aUIElements[i]; Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY ); - + if ( rElementType.bModified && xStorage.is() ) impl_storeElementTypeData( xStorage, rElementType ); } @@ -1266,7 +1266,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce throw IOException(); } } - + m_bModified = false; Reference< XTransactedObject > xTransactedObject( m_xDocConfigStorage, UNO_QUERY ); if ( xTransactedObject.is() ) @@ -1288,10 +1288,10 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage { try { - Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( + Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[i]; - + if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } @@ -1300,7 +1300,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage throw IOException(); } } - + Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); if ( xTransactedObject.is() ) xTransactedObject->commit(); @@ -1310,14 +1310,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bModified; } sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bReadOnly; } diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index d6c7f26b958f..5b875d82f25a 100755 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/io/XStream.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -62,7 +62,7 @@ #include <boost/bind.hpp> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using rtl::OUString; @@ -147,7 +147,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType ); if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault )) @@ -159,7 +159,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement { xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName; } - + UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo )); } @@ -186,7 +186,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType ); if ( pDataSettings ) @@ -198,7 +198,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement { xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName; } - + UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } @@ -210,14 +210,14 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } } - + ++pDefIter; } // while ( pDefIter != rDefaultElements.end() ) } } void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType ) -{ +{ UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType]; if ( !rElementTypeData.bLoaded ) @@ -237,7 +237,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ ) { UIElementData aUIElementData; - + // Resource name must be without ".xml" sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() )) @@ -245,7 +245,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); - if (( aUIElementName.getLength() > 0 ) && + if (( aUIElementName.getLength() > 0 ) && ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 ))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; @@ -257,7 +257,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa aUIElementData.bDefault = false; aUIElementData.bDefaultNode = false; } - + // Create hash_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); @@ -307,7 +307,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy } } break; - + case ::com::sun::star::ui::UIElementType::POPUPMENU: { break; @@ -326,7 +326,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -343,7 +343,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -357,7 +357,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy catch ( ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( ::com::sun::star::lang::IllegalArgumentException& ) { } catch ( ::com::sun::star::io::IOException& ) @@ -392,7 +392,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin return &(pIter->second); } } - + if ( m_bUseDefault ) { // Not successfull, we have to look into our default vector/hash_map combination @@ -414,7 +414,7 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage { UIElementDataHashMap& rHashMap = rElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -429,7 +429,7 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage { Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY ); Reference< XOutputStream > xOutputStream( xStream->getOutputStream() ); - + if ( xOutputStream.is() ) { switch( rElementType.nElementType ) @@ -470,18 +470,18 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage } } break; - + default: break; } } - + // mark as not modified if we store to our own storage if ( bResetModifyState ) rElement.bModified = sal_False; } } - + ++pIter; } @@ -496,19 +496,19 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage } // This is only allowed to be called on the LAYER_USER_DEFINED! -void UIConfigurationManagerImpl::impl_resetElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void UIConfigurationManagerImpl::impl_resetElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling // our listeners! while ( pIter != rHashMap.end() ) @@ -521,16 +521,16 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( // Replace settings with data from default layer Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = m_xOwner; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; - + rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -544,9 +544,9 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -555,7 +555,7 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( } // if ( !rElement.bDefault ) else rElement.bModified = false; - + ++pIter; } @@ -563,10 +563,10 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( rHashMap.clear(); } -void UIConfigurationManagerImpl::impl_reloadElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void UIConfigurationManagerImpl::impl_reloadElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; @@ -575,10 +575,10 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage ); Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); - + Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -590,16 +590,16 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = m_xOwner; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + rElement.bModified = false; } else if ( m_bUseDefault && xDefaultNameAccess->hasByName( rElement.aName )) @@ -608,16 +608,16 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = m_xOwner; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -627,14 +627,14 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( { // Element settings are not in any storage => remove ConfigurationEvent aRemoveEvent; - + aRemoveEvent.ResourceURL = rElement.aResourceURL; aRemoveEvent.Accessor <<= xThis; aRemoveEvent.Source = m_xOwner; aRemoveEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aRemoveEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -735,7 +735,7 @@ UIConfigurationManagerImpl::UIConfigurationManagerImpl( const Reference< com::su { for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) m_pStorageHandler[i] = 0; - + // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT ); @@ -753,7 +753,7 @@ void UIConfigurationManagerImpl::dispose() throw (::com::sun::star::uno::Runtime { css::lang::EventObject aEvent( m_xOwner ); m_aListenerContainer.disposeAndClear( aEvent ); - + { ResetableGuard aGuard( m_aLock ); try @@ -764,7 +764,7 @@ void UIConfigurationManagerImpl::dispose() throw (::com::sun::star::uno::Runtime catch ( Exception& ) { } - + m_xModuleImageManager.clear(); m_aUIElements[LAYER_USERDEFINED].clear(); m_aUIElements[LAYER_DEFAULT].clear(); @@ -786,7 +786,7 @@ void UIConfigurationManagerImpl::addEventListener( const Reference< XEventListen if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } @@ -800,7 +800,7 @@ void UIConfigurationManagerImpl::removeEventListener( const Reference< XEventLis void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); @@ -826,15 +826,15 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) css::uno::Reference< css::embed::XStorage >()); // no document root used here! } } - + // initialize root storages for all resource types m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); + m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser()); - + if ( m_xUserConfigStorage.is() ) { Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY ); @@ -845,10 +845,10 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } - + impl_Initialize(); - m_bInitialized = true; + m_bInitialized = true; } } @@ -857,12 +857,12 @@ void UIConfigurationManagerImpl::addConfigurationListener( const Reference< ::co { { ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } @@ -872,7 +872,7 @@ void UIConfigurationManagerImpl::removeConfigurationListener( const Reference< : m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } - + // XUIConfigurationManager void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeException) { @@ -881,7 +881,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); - + bool bResetStorage( false ); if ( !isReadOnly() ) @@ -896,7 +896,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx if ( xSubStorage.is() ) { - bool bCommitSubStorage( false ); + bool bCommitSubStorage( false ); Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY ); Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames(); for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ ) @@ -904,7 +904,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx xSubStorage->removeElement( aUIElementStreamNames[j] ); bCommitSubStorage = true; } - + if ( bCommitSubStorage ) { Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY ); @@ -916,7 +916,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx } bResetStorage = true; - + // remove settings from user defined layer and notify listener about removed settings data! ConfigEventNotifyContainer aRemoveEventNotifyContainer; ConfigEventNotifyContainer aReplaceEventNotifyContainer; @@ -926,7 +926,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][j]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][j]; - + impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer ); rUserElementType.bModified = sal_False; } @@ -935,12 +935,12 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx throw IOException(); } } - + m_bModified = sal_False; // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners ::std::for_each(aRemoveEventNotifyContainer.begin(),aRemoveEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove)); ::std::for_each(aReplaceEventNotifyContainer.begin(),aReplaceEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace)); @@ -957,7 +957,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) { } - } + } } Sequence< Sequence< PropertyValue > > UIConfigurationManagerImpl::getUIElementsInfo( sal_Int16 ElementType ) @@ -1003,34 +1003,34 @@ throw ( IllegalArgumentException, RuntimeException ) Reference< XIndexContainer > UIConfigurationManagerImpl::createSettings() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + // Creates an empty item container which can be filled from outside return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); } -sal_Bool UIConfigurationManagerImpl::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool UIConfigurationManagerImpl::hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) ) return sal_True; } - + return sal_False; } @@ -1038,17 +1038,17 @@ Reference< XIndexAccess > UIConfigurationManagerImpl::getSettings( const ::rtl:: throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) ) { @@ -1059,16 +1059,16 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pDataSettings->xSettings; } } - + throw NoSuchElementException(); } -void UIConfigurationManagerImpl::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void UIConfigurationManagerImpl::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1076,7 +1076,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1112,9 +1112,9 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la aEvent.Source = m_xOwner; aEvent.ReplacedElement <<= xOldSettings; aEvent.Element <<= pDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else @@ -1139,7 +1139,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // Modify type container UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType]; rElementType.bModified = true; - + UIElementDataHashMap& rElements = rElementType.aElementsHashMap; // Check our user element settings hash map as it can already contain settings that have been set to default! @@ -1149,20 +1149,20 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la pIter->second = aUIElementData; else rElements.insert( UIElementDataHashMap::value_type( ResourceURL, aUIElementData )); - + Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.ReplacedElement <<= pDataSettings->xSettings; aEvent.Element <<= aUIElementData.xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } } @@ -1175,8 +1175,8 @@ void UIConfigurationManagerImpl::removeSettings( const ::rtl::OUString& Resource throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1184,10 +1184,10 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -1198,7 +1198,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings; pDataSettings->bDefault = true; - + // check if this is a default layer node if ( !m_bUseDefault || !pDataSettings->bDefaultNode ) pDataSettings->bModified = true; // we have to remove this node from the user layer! @@ -1216,29 +1216,29 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= xRemovedSettings; aEvent.ReplacedElement <<= pDefaultDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else { // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= xRemovedSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Remove ); } } @@ -1246,14 +1246,14 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else throw NoSuchElementException(); } -} +} void UIConfigurationManagerImpl::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1261,10 +1261,10 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + bool bInsertData( false ); UIElementData aUIElementData; UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType ); @@ -1291,7 +1291,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY ); else aUIElementData.xSettings = aNewData; - + m_bModified = true; UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType]; @@ -1304,20 +1304,20 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, UIElementDataHashMap& rElements = rElementType.aElementsHashMap; rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, aUIElementData )); } - + Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings ); Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = NewResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= xInsertSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Insert ); } else @@ -1335,13 +1335,13 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c if ( !m_xModuleImageManager.is() ) { if ( m_bUseDefault ) - m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), + m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), UNO_QUERY ); else - m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), + m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), UNO_QUERY ); Reference< XInitialization > xInit( m_xModuleImageManager, UNO_QUERY ); - + Sequence< Any > aPropSeq( m_bUseDefault ? 3 : 2 ); PropertyValue aPropValue; aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); @@ -1356,7 +1356,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c aPropValue.Value <<= m_xUserRootCommit; aPropSeq[2] <<= aPropValue; } - + xInit->initialize( aPropSeq ); } @@ -1375,9 +1375,9 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw ( ::rtl::OUString aModule = m_aModuleIdentifier; Reference< XStorage > xDocumentRoot = m_xUserConfigStorage; aGuard.unlock(); - Reference< XInterface > xManager = xSMGR->createInstance(m_bUseDefault ? SERVICENAME_MODULEACCELERATORCONFIGURATION : SERVICENAME_DOCUMENTACCELERATORCONFIGURATION ); + Reference< XInterface > xManager = xSMGR->createInstance(m_bUseDefault ? SERVICENAME_MODULEACCELERATORCONFIGURATION : SERVICENAME_DOCUMENTACCELERATORCONFIGURATION ); Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW); - + PropertyValue aProp; Sequence< Any > lArgs(1); if ( m_bUseDefault ) @@ -1397,11 +1397,11 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw ( { // SAFE -> aGuard.lock(); - m_xAccConfig = xManager; + m_xAccConfig = xManager; aGuard.unlock(); // <- SAFE } - + return xManager; } @@ -1413,10 +1413,10 @@ Reference< XInterface > UIConfigurationManagerImpl::getEventsManager() throw (:: void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + if ( m_xUserConfigStorage.is() ) { try @@ -1438,7 +1438,7 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY); if ( xAccUpdate.is() ) xAccUpdate->setStorage( m_xUserConfigStorage ); - + if ( m_xModuleImageManager.is() ) { ImageManager* pImageManager = (ImageManager*)m_xModuleImageManager.get(); @@ -1465,7 +1465,7 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT, rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... seee next lines! sEmpty, - m_xUserConfigStorage); + m_xUserConfigStorage); } } Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY ); @@ -1504,14 +1504,14 @@ sal_Bool UIConfigurationManagerImpl::isDefaultSettings( const ::rtl::OUString& R throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1519,22 +1519,22 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: if ( pDataSettings && pDataSettings->bDefaultNode ) return sal_True; } - + return sal_False; } -Reference< XIndexAccess > UIConfigurationManagerImpl::getDefaultSettings( const ::rtl::OUString& ResourceURL ) +Reference< XIndexAccess > UIConfigurationManagerImpl::getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1551,7 +1551,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pIter->second.xSettings; } } - + // Nothing has been found! throw NoSuchElementException(); } @@ -1575,7 +1575,7 @@ void UIConfigurationManagerImpl::reload() throw (::com::sun::star::uno::Exceptio { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][i]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][i]; - + if ( rUserElementType.bModified ) impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer ); } @@ -1589,7 +1589,7 @@ void UIConfigurationManagerImpl::reload() throw (::com::sun::star::uno::Exceptio // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners ::std::for_each(aRemoveNotifyContainer.begin(),aRemoveNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove)); ::std::for_each(aReplaceNotifyContainer.begin(),aReplaceNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace)); @@ -1602,7 +1602,7 @@ void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception if ( m_bDisposed ) throw DisposedException(); - + if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder @@ -1612,7 +1612,7 @@ void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception { UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY ); - + if ( rElementType.bModified && xStorage.is() ) { impl_storeElementTypeData( xStorage, rElementType ); @@ -1624,7 +1624,7 @@ void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception throw IOException(); } } - + m_bModified = false; } } @@ -1643,10 +1643,10 @@ void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& St { try { - Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( + Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; - + if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } @@ -1655,7 +1655,7 @@ void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& St throw IOException(); } } - + Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); if ( xTransactedObject.is() ) xTransactedObject->commit(); @@ -1665,14 +1665,14 @@ void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& St sal_Bool UIConfigurationManagerImpl::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bModified; } sal_Bool UIConfigurationManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bReadOnly; } diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx index c5854daae955..bc35def8036c 100755 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <accelerators/presethandler.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -49,7 +49,7 @@ #include <uiconfiguration/moduleimagemanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -64,7 +64,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -73,7 +73,7 @@ namespace framework { - class UIConfigurationManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. + class UIConfigurationManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. { public: // XInterface, XTypeProvider, XServiceInfo @@ -128,7 +128,7 @@ namespace framework LAYER_USERDEFINED, LAYER_COUNT }; - + enum NotifyOp { NotifyOp_Remove, @@ -143,7 +143,7 @@ namespace framework rtl::OUString aResourceURL; rtl::OUString aUIName; }; - + struct UIElementData { UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {}; @@ -159,14 +159,14 @@ namespace framework struct UIElementType; friend struct UIElementType; typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; - + struct UIElementType { UIElementType() : bModified( false ), - bLoaded( false ), + bLoaded( false ), bDefaultLayer( false ), nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {} - + bool bModified; bool bLoaded; diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 5d5fa60f140b..4ac316b73ab0 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uiconfiguration/windowstateconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -49,14 +49,14 @@ #include <com/sun/star/util/XChangesBatch.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -69,7 +69,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -137,7 +137,7 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for WindowState supplier implementation +// Configuration access class for WindowState supplier implementation //***************************************************************************************************************** class ConfigurationAccess_WindowState : // interfaces @@ -270,7 +270,7 @@ class ConfigurationAccess_WindowState : // interfaces }; //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_7 ( ConfigurationAccess_WindowState , OWeakObject , @@ -1340,26 +1340,26 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_4 ( WindowStateConfiguration , OWeakObject , DIRECT_INTERFACE( css::lang::XTypeProvider ), DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::container::XNameAccess ), + DIRECT_INTERFACE( css::container::XNameAccess ), DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess ) ) -DEFINE_XTYPEPROVIDER_4 ( WindowStateConfiguration , - css::lang::XTypeProvider , - css::lang::XServiceInfo , +DEFINE_XTYPEPROVIDER_4 ( WindowStateConfiguration , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::container::XNameAccess , css::container::XElementAccess ) -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowStateConfiguration , - ::cppu::OWeakObject , - SERVICENAME_WINDOWSTATECONFIGURATION , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowStateConfiguration , + ::cppu::OWeakObject , + SERVICENAME_WINDOWSTATECONFIGURATION , IMPLEMENTATIONNAME_WINDOWSTATECONFIGURATION ) diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 63caa7380fd2..0c4c610bd4b0 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <uielement/toolbarmerger.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -66,7 +66,7 @@ #include <uielement/toolbarmerger.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XToolbarController.hpp> @@ -82,7 +82,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> @@ -97,7 +97,7 @@ #include <vcl/taskpanelist.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using namespace ::com::sun::star; @@ -278,13 +278,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); for ( sal_uInt32 n = 0; n < (sal_uInt32)rAddonToolbar.getLength(); n++ ) { - rtl::OUString aValueName; + rtl::OUString aValueName; - rtl::OUString aURL; - rtl::OUString aTitle; - rtl::OUString aImageId; - rtl::OUString aContext; - rtl::OUString aTarget; + rtl::OUString aURL; + rtl::OUString aTitle; + rtl::OUString aImageId; + rtl::OUString aContext; + rtl::OUString aTarget; rtl::OUString aControlType; sal_uInt16 nWidth( 0 ); @@ -321,8 +321,8 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue // Create TbRuntimeItemData to hold additional information we will need in the future AddonsParams* pRuntimeItemData = new AddonsParams; - pRuntimeItemData->aImageId = aImageId; - pRuntimeItemData->aTarget = aTarget; + pRuntimeItemData->aImageId = aImageId; + pRuntimeItemData->aTarget = aTarget; m_pToolBar->SetItemData( nId, pRuntimeItemData ); m_pToolBar->SetItemCommand( nId, aURL ); @@ -533,9 +533,9 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { - if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || - ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && - ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) + if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || + ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && + ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 813567008411..315d1b6e0bf8 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -45,7 +45,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -57,7 +57,7 @@ #include <com/sun/star/ui/UIElementType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index d98caee191ae..4f55448d65d1 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -199,7 +199,7 @@ throw (::com::sun::star::uno::RuntimeException) } // XUpdatable -void SAL_CALL ButtonToolbarController::update() +void SAL_CALL ButtonToolbarController::update() throw (::com::sun::star::uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); @@ -208,8 +208,8 @@ throw (::com::sun::star::uno::RuntimeException) } // XEventListener -void SAL_CALL ButtonToolbarController::disposing( - const com::sun::star::lang::EventObject& Source ) +void SAL_CALL ButtonToolbarController::disposing( + const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ) { uno::Reference< uno::XInterface > xSource( Source.Source ); @@ -224,7 +224,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) m_xFrame.clear(); } -void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) +void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) throw ( ::com::sun::star::uno::RuntimeException ) { // do nothing @@ -233,7 +233,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } // XToolbarController -void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) +void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException) { uno::Reference< frame::XDispatch > xDispatch; @@ -241,25 +241,25 @@ throw (::com::sun::star::uno::RuntimeException) uno::Reference< util::XURLTransformer > xURLTransformer; rtl::OUString aCommandURL; ::com::sun::star::util::URL aTargetURL; - + { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + if ( m_bDisposed ) throw DisposedException(); - if ( m_bInitialized && + if ( m_bInitialized && m_xFrame.is() && m_xServiceManager.is() && m_aCommandURL.getLength() ) { if ( !m_xURLTransformer.is() ) { - m_xURLTransformer = uno::Reference< util::XURLTransformer >( + m_xURLTransformer = uno::Reference< util::XURLTransformer >( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), uno::UNO_QUERY_THROW ); } - + xFrame = m_xFrame; aCommandURL = m_aCommandURL; xURLTransformer = m_xURLTransformer; @@ -283,7 +283,7 @@ throw (::com::sun::star::uno::RuntimeException) // Provide key modifier information to dispatch function aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); aArgs[0].Value <<= KeyModifier; - + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); @@ -291,22 +291,22 @@ throw (::com::sun::star::uno::RuntimeException) catch ( DisposedException& ) { } - } + } } -void SAL_CALL ButtonToolbarController::click() +void SAL_CALL ButtonToolbarController::click() throw (::com::sun::star::uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + if ( m_bDisposed ) throw DisposedException(); - + sal_Int16 nKeyModifier( (sal_Int16)m_pToolbar->GetModifier() ); execute( nKeyModifier ); } -void SAL_CALL ButtonToolbarController::doubleClick() +void SAL_CALL ButtonToolbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException) { // do nothing @@ -314,22 +314,22 @@ throw (::com::sun::star::uno::RuntimeException) throw DisposedException(); } -uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() +uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) { if ( m_bDisposed ) throw DisposedException(); - + return uno::Reference< awt::XWindow >(); } -uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) +uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) throw (::com::sun::star::uno::RuntimeException) { if ( m_bDisposed ) throw DisposedException(); - + return uno::Reference< awt::XWindow >(); } diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 6a0516e25881..058005ffdc40 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/util/Color.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 328d68fd8003..2e1c88740750 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/uielement/constitemcontainer.cxx index 979c6085bdc9..9ef9a72e5093 100644 --- a/framework/source/uielement/constitemcontainer.cxx +++ b/framework/source/uielement/constitemcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> @@ -36,12 +36,12 @@ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> @@ -133,15 +133,15 @@ sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const ::rtl::OUString & } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_6 ( ConstItemContainer , OWeakObject , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), DIRECT_INTERFACE( ::com::sun::star::container::XElementAccess ), DIRECT_INTERFACE( ::com::sun::star::container::XIndexAccess ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel ) ) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 546d141e0fb6..49501194a014 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/controlmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> @@ -66,56 +66,56 @@ // Copied from svx // Function-Id's #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) -#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) +#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) #define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Forms - Ids, used to address images from image list -#define SID_FMSLOTS_START (SID_SVX_START + 592) -#define SID_MORE_FMSLOTS_START (SID_SVX_START + 702) - -#define SID_FM_CONVERTTO_EDIT (SID_MORE_FMSLOTS_START + 32) -#define SID_FM_CONVERTTO_BUTTON (SID_MORE_FMSLOTS_START + 33) -#define SID_FM_CONVERTTO_FIXEDTEXT (SID_MORE_FMSLOTS_START + 34) -#define SID_FM_CONVERTTO_LISTBOX (SID_MORE_FMSLOTS_START + 35) -#define SID_FM_CONVERTTO_CHECKBOX (SID_MORE_FMSLOTS_START + 36) -#define SID_FM_CONVERTTO_RADIOBUTTON (SID_MORE_FMSLOTS_START + 37) -#define SID_FM_CONVERTTO_GROUPBOX (SID_MORE_FMSLOTS_START + 38) -#define SID_FM_CONVERTTO_COMBOBOX (SID_MORE_FMSLOTS_START + 39) -#define SID_FM_CONVERTTO_GRID (SID_MORE_FMSLOTS_START + 40) -#define SID_FM_CONVERTTO_IMAGEBUTTON (SID_MORE_FMSLOTS_START + 41) -#define SID_FM_CONVERTTO_FILECONTROL (SID_MORE_FMSLOTS_START + 42) -#define SID_FM_CONVERTTO_DATE (SID_MORE_FMSLOTS_START + 43) -#define SID_FM_CONVERTTO_TIME (SID_MORE_FMSLOTS_START + 44) -#define SID_FM_CONVERTTO_NUMERIC (SID_MORE_FMSLOTS_START + 45) -#define SID_FM_CONVERTTO_CURRENCY (SID_MORE_FMSLOTS_START + 46) -#define SID_FM_CONVERTTO_PATTERN (SID_MORE_FMSLOTS_START + 47) -#define SID_FM_CONVERTTO_IMAGECONTROL (SID_MORE_FMSLOTS_START + 48) -#define SID_FM_CONVERTTO_FORMATTED (SID_MORE_FMSLOTS_START + 49) +#define SID_FMSLOTS_START (SID_SVX_START + 592) +#define SID_MORE_FMSLOTS_START (SID_SVX_START + 702) + +#define SID_FM_CONVERTTO_EDIT (SID_MORE_FMSLOTS_START + 32) +#define SID_FM_CONVERTTO_BUTTON (SID_MORE_FMSLOTS_START + 33) +#define SID_FM_CONVERTTO_FIXEDTEXT (SID_MORE_FMSLOTS_START + 34) +#define SID_FM_CONVERTTO_LISTBOX (SID_MORE_FMSLOTS_START + 35) +#define SID_FM_CONVERTTO_CHECKBOX (SID_MORE_FMSLOTS_START + 36) +#define SID_FM_CONVERTTO_RADIOBUTTON (SID_MORE_FMSLOTS_START + 37) +#define SID_FM_CONVERTTO_GROUPBOX (SID_MORE_FMSLOTS_START + 38) +#define SID_FM_CONVERTTO_COMBOBOX (SID_MORE_FMSLOTS_START + 39) +#define SID_FM_CONVERTTO_GRID (SID_MORE_FMSLOTS_START + 40) +#define SID_FM_CONVERTTO_IMAGEBUTTON (SID_MORE_FMSLOTS_START + 41) +#define SID_FM_CONVERTTO_FILECONTROL (SID_MORE_FMSLOTS_START + 42) +#define SID_FM_CONVERTTO_DATE (SID_MORE_FMSLOTS_START + 43) +#define SID_FM_CONVERTTO_TIME (SID_MORE_FMSLOTS_START + 44) +#define SID_FM_CONVERTTO_NUMERIC (SID_MORE_FMSLOTS_START + 45) +#define SID_FM_CONVERTTO_CURRENCY (SID_MORE_FMSLOTS_START + 46) +#define SID_FM_CONVERTTO_PATTERN (SID_MORE_FMSLOTS_START + 47) +#define SID_FM_CONVERTTO_IMAGECONTROL (SID_MORE_FMSLOTS_START + 48) +#define SID_FM_CONVERTTO_FORMATTED (SID_MORE_FMSLOTS_START + 49) #define SID_FM_CONVERTTO_SCROLLBAR (SID_MORE_FMSLOTS_START + 68) #define SID_FM_CONVERTTO_SPINBUTTON (SID_MORE_FMSLOTS_START + 69) -#define SID_FM_DATEFIELD (SID_MORE_FMSLOTS_START + 2) -#define SID_FM_TIMEFIELD (SID_MORE_FMSLOTS_START + 3) -#define SID_FM_NUMERICFIELD (SID_MORE_FMSLOTS_START + 4) -#define SID_FM_CURRENCYFIELD (SID_MORE_FMSLOTS_START + 5) -#define SID_FM_PATTERNFIELD (SID_MORE_FMSLOTS_START + 6) -#define SID_FM_IMAGECONTROL (SID_MORE_FMSLOTS_START + 8) -#define SID_FM_FORMATTEDFIELD (SID_MORE_FMSLOTS_START + 26) +#define SID_FM_DATEFIELD (SID_MORE_FMSLOTS_START + 2) +#define SID_FM_TIMEFIELD (SID_MORE_FMSLOTS_START + 3) +#define SID_FM_NUMERICFIELD (SID_MORE_FMSLOTS_START + 4) +#define SID_FM_CURRENCYFIELD (SID_MORE_FMSLOTS_START + 5) +#define SID_FM_PATTERNFIELD (SID_MORE_FMSLOTS_START + 6) +#define SID_FM_IMAGECONTROL (SID_MORE_FMSLOTS_START + 8) +#define SID_FM_FORMATTEDFIELD (SID_MORE_FMSLOTS_START + 26) #define SID_FM_SCROLLBAR (SID_MORE_FMSLOTS_START + 66) #define SID_FM_SPINBUTTON (SID_MORE_FMSLOTS_START + 67) -#define SID_FM_CONFIG (SID_FMSLOTS_START + 1) -#define SID_FM_PUSHBUTTON (SID_FMSLOTS_START + 2) -#define SID_FM_RADIOBUTTON (SID_FMSLOTS_START + 3) -#define SID_FM_CHECKBOX (SID_FMSLOTS_START + 4) -#define SID_FM_FIXEDTEXT (SID_FMSLOTS_START + 5) -#define SID_FM_GROUPBOX (SID_FMSLOTS_START + 6) -#define SID_FM_EDIT (SID_FMSLOTS_START + 7) -#define SID_FM_LISTBOX (SID_FMSLOTS_START + 8) -#define SID_FM_COMBOBOX (SID_FMSLOTS_START + 9) -#define SID_FM_URLBUTTON (SID_FMSLOTS_START + 10) -#define SID_FM_DBGRID (SID_FMSLOTS_START + 11) -#define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) -#define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) +#define SID_FM_CONFIG (SID_FMSLOTS_START + 1) +#define SID_FM_PUSHBUTTON (SID_FMSLOTS_START + 2) +#define SID_FM_RADIOBUTTON (SID_FMSLOTS_START + 3) +#define SID_FM_CHECKBOX (SID_FMSLOTS_START + 4) +#define SID_FM_FIXEDTEXT (SID_FMSLOTS_START + 5) +#define SID_FM_GROUPBOX (SID_FMSLOTS_START + 6) +#define SID_FM_EDIT (SID_FMSLOTS_START + 7) +#define SID_FM_LISTBOX (SID_FMSLOTS_START + 8) +#define SID_FM_COMBOBOX (SID_FMSLOTS_START + 9) +#define SID_FM_URLBUTTON (SID_FMSLOTS_START + 10) +#define SID_FM_DBGRID (SID_FMSLOTS_START + 11) +#define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) +#define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) sal_Int16 nConvertSlots[] = { @@ -127,7 +127,7 @@ sal_Int16 nConvertSlots[] = SID_FM_CONVERTTO_RADIOBUTTON, SID_FM_CONVERTTO_GROUPBOX, SID_FM_CONVERTTO_COMBOBOX, -// SID_FM_CONVERTTO_GRID, +// SID_FM_CONVERTTO_GRID, SID_FM_CONVERTTO_IMAGEBUTTON, SID_FM_CONVERTTO_FILECONTROL, SID_FM_CONVERTTO_DATE, @@ -151,7 +151,7 @@ sal_Int16 nCreateSlots[] = SID_FM_RADIOBUTTON, SID_FM_GROUPBOX, SID_FM_COMBOBOX, -// SID_FM_DBGRID, +// SID_FM_DBGRID, SID_FM_IMAGEBUTTON, SID_FM_FILECONTROL, SID_FM_DATEFIELD, @@ -190,9 +190,9 @@ const char* aCommands[] = }; //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -205,9 +205,9 @@ using namespace com::sun::star::container; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( ControlMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( ControlMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_CONTROLMENUCONTROLLER ) @@ -231,11 +231,11 @@ ControlMenuController::~ControlMenuController() void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" )); - + ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US )); ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); - + if ( pResMgr->IsAvailable( aResId )) { ImageList aImageList( aResId ); @@ -257,13 +257,13 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + if ( pVCLPopupMenu && m_pResPopupMenu ) *pVCLPopupMenu = *m_pResPopupMenu; } @@ -277,7 +277,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run m_xFrame.clear(); m_xDispatch.clear(); m_xServiceManager.clear(); - + if ( m_xPopupMenu.is() ) m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); m_xPopupMenu.clear(); @@ -288,8 +288,8 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { osl::ResettableMutexGuard aLock( m_aMutex ); - - USHORT nMenuId = 0; + + USHORT nMenuId = 0; for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i) { if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] )) @@ -302,9 +302,9 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve if ( nMenuId ) { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !Event.IsEnabled && pVCLPopupMenu->GetItemPos( nMenuId ) != MENU_ITEM_NOTFOUND ) @@ -323,11 +323,11 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve if ( nPrevInConversion != MENU_ITEM_NOTFOUND ) break; } - + if ( MENU_ITEM_NOTFOUND == nPrevInConversion ) // none of the items which precede the nSID-slot in the source menu are present in our conversion menu - nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position - + nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position + pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), ++nPrevInConversion ); pVCLPopupMenu->SetItemImage( nMenuId, m_pResPopupMenu->GetItemImage( nMenuId )); pVCLPopupMenu->SetHelpId( nMenuId, m_pResPopupMenu->GetHelpId( nMenuId )); @@ -341,7 +341,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat UrlToDispatchMap::iterator pIter = m_aURLToDispatchMap.find( aURL.Complete ); if ( pIter != m_aURLToDispatchMap.end() ) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; Reference< XDispatch > xDispatch = pIter->second; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs); @@ -353,11 +353,11 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); - + if ( m_xPopupMenu.is() ) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + // Check if some modes have changed so we have to update our menu images const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bIsHiContrast = rSettings.GetHighContrastMode(); @@ -367,8 +367,8 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro if ( bUpdateImages ) { // The mode has changed or the complete menu so we have to retrieve all images again - m_bWasHiContrast = bIsHiContrast; - m_bShowMenuImages = bShowMenuImages; + m_bWasHiContrast = bIsHiContrast; + m_bShowMenuImages = bShowMenuImages; VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu ); if ( pPopupMenu ) @@ -402,25 +402,25 @@ void ControlMenuController::impl_setPopupMenu() } } // if ( m_pResPopupMenu == 0 ) } - + void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); throwIfDisposed(); - + if ( m_xFrame.is() && m_xPopupMenu.is() ) { URL aTargetURL; Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); fillPopupMenu( m_xPopupMenu ); m_aURLToDispatchMap.free(); - + for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i) { aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] ); m_xURLTransformer->parseStrict( aTargetURL ); - + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) { @@ -437,7 +437,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen { osl::ResettableMutexGuard aLock( m_aMutex ); svt::PopupMenuControllerBase::initialize(aArguments); - m_aBaseURL = ::rtl::OUString(); + m_aBaseURL = ::rtl::OUString(); } } diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 0325817d8ec2..0800103c743e 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 23e5eea145db..387213d7c3eb 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 6a885e972d4e..c2625a951efb 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/fontmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -45,7 +45,7 @@ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -62,9 +62,9 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -83,9 +83,9 @@ bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FontMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( FontMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FONTMENUCONTROLLER ) @@ -106,13 +106,13 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont const rtl::OUString* pFontNameArray = rFontNameSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + if ( pVCLPopupMenu ) { vector<rtl::OUString> aVector; @@ -179,7 +179,7 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event // XMenuListener void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log( m_xServiceManager, @@ -194,7 +194,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { osl::MutexGuard aLock( m_aMutex ); - + if ( m_xPopupMenu.is() ) { // find new font name and set check mark! @@ -232,14 +232,14 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw ( void FontMenuController::impl_setPopupMenu() { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - + com::sun::star::util::URL aTargetURL; // Register for font list updates to get the current font list from the controller aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" )); m_xURLTransformer->parseStrict( aTargetURL ); m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); } - + void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) { svt::PopupMenuControllerBase::updatePopupMenu(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 24fb1abc15b0..58cf3a3b02be 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/fontsizemenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -45,7 +45,7 @@ #include <com/sun/star/view/XPrintable.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -67,9 +67,9 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -82,9 +82,9 @@ using namespace com::sun::star::beans; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FontSizeMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( FontSizeMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER ) @@ -106,7 +106,7 @@ FontSizeMenuController::~FontSizeMenuController() rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) { rtl::OUString aPrinterName; - + if ( rFrame.is() ) { Reference< XController > xController = m_xFrame->getController(); @@ -127,7 +127,7 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno:: } } } - + return aPrinterName; } @@ -135,9 +135,9 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno:: void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu >& rPopupMenu ) { // check menu item - rtl::OUString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE ); - USHORT nChecked = 0; - USHORT nItemCount = rPopupMenu->getItemCount(); + rtl::OUString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE ); + USHORT nChecked = 0; + USHORT nItemCount = rPopupMenu->getItemCount(); for( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = rPopupMenu->getItemId( i ); @@ -162,19 +162,19 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r const rtl::OUString aFontNameCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight=" )); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + if ( pVCLPopupMenu ) { FontList* pFontList = 0; Printer* pInfoPrinter = 0; rtl::OUString aPrinterName; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + // try to retrieve printer name of document aPrinterName = retrievePrinterName( m_xFrame ); if ( aPrinterName.getLength() > 0 ) @@ -183,12 +183,12 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r if ( pInfoPrinter && pInfoPrinter->GetDevFontCount() > 0 ) pFontList = new FontList( pInfoPrinter ); } - + if ( pFontList == 0 ) pFontList = new FontList( Application::GetDefaultDevice() ); FontInfo aFntInfo = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName ); - + // setup font size array if ( m_pHeightArray ) delete m_pHeightArray; @@ -201,14 +201,14 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r USHORT nPos = 0; const rtl::OUString aFontHeightCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight.Height:float=" )); - + // first insert font size names (for simplified/traditional chinese) float fPoint; rtl::OUString aHeightString; FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguage() ); m_pHeightArray = new long[nSizeCount+aFontSizeNames.Count()]; rtl::OUString aCommand; - + if ( !aFontSizeNames.IsEmpty() ) { if ( pAry == pFontList->GetStdSizeAry() ) @@ -217,13 +217,13 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r ULONG nCount = aFontSizeNames.Count(); for( ULONG i = 0; i < nCount; i++ ) { - String aSizeName = aFontSizeNames.GetIndexName( i ); - long nSize = aFontSizeNames.GetIndexSize( i ); + String aSizeName = aFontSizeNames.GetIndexName( i ); + long nSize = aFontSizeNames.GetIndexSize( i ); m_pHeightArray[nPos] = nSize; nPos++; // Id is nPos+1 pVCLPopupMenu->InsertItem( nPos, aSizeName, MIB_RADIOCHECK | MIB_AUTOCHECK ); fPoint = float( m_pHeightArray[nPos-1] ) / 10; - + // Create dispatchable .uno command and set it aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); @@ -246,7 +246,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r // Create dispatchable .uno command and set it aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); - } + } pTempAry++; } } @@ -265,12 +265,12 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r // Create dispatchable .uno command and set it aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); - + pTempAry++; } setCurHeight( long( m_aFontHeight.Height * 10), rPopupMenu ); - + delete pFontList; delete pInfoPrinter; } @@ -300,7 +300,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev { osl::MutexGuard aLock( m_aMutex ); m_aFontDescriptor = aFontDescriptor; - + if ( m_xPopupMenu.is() ) fillPopupMenu( m_xPopupMenu ); @@ -321,7 +321,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev // XMenuListener void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch"); @@ -339,13 +339,13 @@ void FontSizeMenuController::impl_setPopupMenu() m_xURLTransformer->parseStrict( aTargetURL ); m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); } - + void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) { osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); - + Reference< XDispatch > xDispatch( m_xCurrentFontDispatch ); com::sun::star::util::URL aTargetURL; aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" )); diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index fb74197e8ef2..16f26404697c 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/footermenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -40,7 +40,7 @@ #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -65,9 +65,9 @@ #include <dispatch/uieventloghelper.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -80,9 +80,9 @@ using namespace com::sun::star::container; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FooterMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( FooterMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER ) diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 53ea643e379d..3f37050e6780 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -344,7 +344,7 @@ MenuToolbarController::~MenuToolbarController() delete pMenu; pMenu = NULL; } - + } class Toolbarmenu : public PopupMenu @@ -369,10 +369,10 @@ void SAL_CALL MenuToolbarController::click() throw (RuntimeException) createPopupWindow(); } -Reference< XWindow > SAL_CALL +Reference< XWindow > SAL_CALL MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) { - if ( !pMenu ) + if ( !pMenu ) { Reference< XDispatchProvider > xDispatch; Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); @@ -387,7 +387,7 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) ); pMenu->Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN ); - return NULL; + return NULL; } } // namespace diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f10507f73435..c0d7b48a401b 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/headermenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -41,7 +41,7 @@ #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -67,9 +67,9 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -88,9 +88,9 @@ const USHORT ALL_MENUITEM_ID = 1; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( HeaderMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( HeaderMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_HEADERMENUCONTROLLER ) @@ -111,18 +111,18 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + Reference< XStyleFamiliesSupplier > xStyleFamiliesSupplier( rModel, UNO_QUERY ); if ( pVCLPopupMenu && xStyleFamiliesSupplier.is()) { Reference< XNameAccess > xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies(); - + rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageHeader" )); rtl::OUString aHeaderFooterIsOnStr(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )); if ( m_bFooter ) @@ -132,7 +132,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra } const rtl::OUString aIsPhysicalStr( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" )); const rtl::OUString aDisplayNameStr( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" )); - + try { Reference< XNameContainer > xNameContainer; @@ -158,8 +158,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra rtl::OUString aDisplayName; sal_Bool bHeaderIsOn( sal_False ); xPropSet->getPropertyValue( aDisplayNameStr ) >>= aDisplayName; - xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; - + xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; + rtl::OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?PageStyle:string="); aStrBuf.append( aDisplayName ); @@ -175,13 +175,13 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra bFirstItemInserted = sal_True; bFirstChecked = bHeaderIsOn; } - + pVCLPopupMenu->SetItemCommand( nId, aCommand ); if ( bHeaderIsOn ) pVCLPopupMenu->CheckItem( nId, sal_True ); ++nId; - + // Check if all entries have the same state if( bAllOneState && n && bHeaderIsOn != bLastCheck ) bAllOneState = FALSE; @@ -198,7 +198,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra rtl::OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?On:bool=" ); - + // Command depends on check state of first menu item entry if ( !bFirstChecked ) aStrBuf.appendAscii( "true" ); @@ -225,7 +225,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt m_xFrame.clear(); m_xDispatch.clear(); m_xServiceManager.clear(); - + if ( m_xPopupMenu.is() ) m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); m_xPopupMenu.clear(); @@ -248,7 +248,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even // XMenuListener void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(m_bFooter ? "FooterMenuController" : "HeaderMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"HeaderMenuController::impl_select: No dispatch"); @@ -259,15 +259,15 @@ void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch, void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); - + throwIfDisposed(); Reference< com::sun::star::frame::XModel > xModel( m_xModel ); aLock.clear(); - + if ( !xModel.is() ) svt::PopupMenuControllerBase::updatePopupMenu(); - + aLock.reset(); if ( m_xPopupMenu.is() && m_xModel.is() ) fillPopupMenu( m_xModel, m_xPopupMenu ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 0100618dd58b..5126ffdd253a 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx index d1358e54a4c0..943a5abe2f03 100644 --- a/framework/source/uielement/itemcontainer.cxx +++ b/framework/source/uielement/itemcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/itemcontainer.hxx> #include <uielement/constitemcontainer.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ using namespace cppu; @@ -50,10 +50,10 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** -ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : +ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) { } @@ -64,7 +64,7 @@ ItemContainer::ItemContainer( const ConstItemContainer& rConstItemContainer, con copyItemContainer( rConstItemContainer.m_aItemVector, rMutex ); } -ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, const ShareableMutex& rMutex ) : +ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) { if ( rSourceContainer.is() ) diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 22154db37252..651c9bbfdc86 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ #include <uielement/langselectionmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -45,7 +45,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -83,7 +83,7 @@ #include <set> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // using namespace ::com::sun::star; @@ -98,9 +98,9 @@ using ::rtl::OUString; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LanguageSelectionMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LanguageSelectionMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER ) @@ -161,7 +161,7 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState } else if ( !Event.State.hasValue() ) { - m_bShowMenu = sal_False; // no language -> no sub-menu entries -> disable menu + m_bShowMenu = sal_False; // no language -> no sub-menu entries -> disable menu } } @@ -171,15 +171,15 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& Reference< XDispatch > xDispatch = _xDispatch; if ( aTargetURL.Complete == m_aMenuCommandURL_Font ) - { //open format/character dialog for current selection + { //open format/character dialog for current selection xDispatch = m_xMenuDispatch_Font; } else if ( aTargetURL.Complete == m_aMenuCommandURL_Lang ) - { //open language tab-page in tools/options dialog + { //open language tab-page in tools/options dialog xDispatch = m_xMenuDispatch_Lang; } else if ( aTargetURL.Complete == m_aMenuCommandURL_CharDlgForParagraph ) - { //open format/character dialog for current selection + { //open format/character dialog for current selection xDispatch = m_xMenuDispatch_CharDlgForParagraph; } @@ -191,8 +191,8 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& } if ( xDispatch.is() ) - { - Sequence<PropertyValue> aArgs; + { + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs ); xDispatch->dispatch( aTargetURL, aArgs ); @@ -264,7 +264,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup // get languages to be displayed in the menu std::set< OUString > aLangItems; - FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, + FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang ); // @@ -366,9 +366,9 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any > if ( m_bInitialized ) { - m_aLangStatusCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" )); - m_aMenuCommandURL_Lang = m_aLangStatusCommandURL; - m_aMenuCommandURL_Font = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" )); + m_aLangStatusCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" )); + m_aMenuCommandURL_Lang = m_aLangStatusCommandURL; + m_aMenuCommandURL_Font = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" )); m_aMenuCommandURL_CharDlgForParagraph = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" )); } } diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index cc408eb6f263..021ee4e8f8df 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,9 +92,9 @@ namespace framework //////////////////////////////////////////////////////////// -DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER ) @@ -199,10 +199,10 @@ throw (::com::sun::star::uno::RuntimeException) Reference< awt::XPopupMenu > subPopupMenu(m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY ); SvtLanguageTable aLanguageTable; - + // get languages to be displayed in the menu std::set< OUString > aLangItems; - FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, + FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang ); // @@ -431,7 +431,7 @@ throw ( RuntimeException ) else if ( !Event.State.hasValue() ) { pStatusBar->SetItemText( m_nID, String() ); - m_bShowMenu = sal_False; // no language -> no menu + m_bShowMenu = sal_False; // no language -> no menu } } } diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index 602d2dc6dd4c..10dc8489e592 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ using namespace ::com::sun::star::frame; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LOGOIMAGESTATUSBARCONTROLLER ) @@ -85,12 +85,12 @@ void SAL_CALL LogoImageStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + svt::StatusbarController::initialize( aArguments ); } @@ -100,14 +100,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL LogoImageStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 925127fc0316..606c644eeba9 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ using namespace ::com::sun::star::frame; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LOGOTEXTSTATUSBARCONTROLLER ) @@ -85,12 +85,12 @@ void SAL_CALL LogoTextStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + svt::StatusbarController::initialize( aArguments ); if ( m_xParentWindow.is() && m_nID > 0 ) @@ -110,14 +110,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL LogoTextStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL LogoTextStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 7c82e2e8257a..30b0fe5fec1c 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,10 +61,10 @@ using namespace ::com::sun::star::frame; namespace framework { -class -DEFINE_XSERVICEINFO_MULTISERVICE ( MacrosMenuController , +class +DEFINE_XSERVICEINFO_MULTISERVICE ( MacrosMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_MACROSMENUCONTROLLER ) @@ -86,16 +86,16 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo { VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pVCLPopupMenu ) pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu(); if (!pPopupMenu) return; - + // insert basic String aCommand = String::CreateFromAscii( ".uno:MacroDialog" ); String aDisplayName = RetrieveLabelFromCommand( aCommand ); @@ -118,7 +118,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt m_xFrame.clear(); m_xDispatch.clear(); m_xServiceManager.clear(); - + if ( m_xPopupMenu.is() ) { m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); @@ -149,11 +149,11 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; - //pExecuteInfo->aArgs = aArgs; + //pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); // xDispatch->dispatch( aTargetURL, aArgs ); - Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); } else { @@ -175,7 +175,7 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* } delete pExecuteInfo; return 0; -} +} String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL ) { @@ -190,7 +190,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt const ::rtl::OUString providerKey = ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" ); const ::rtl::OUString languageProviderName = - ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" ); + ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" ); USHORT itemId = startItemId; Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW ); Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); @@ -203,7 +203,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt break; } Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); - + if ( serviceNames.getLength() > 0 ) { for ( sal_Int32 index = 0; index < serviceNames.getLength(); index++ ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index b76ab6f697e6..9d8aa9205c90 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/menubarmanager.hxx> #include <xml/menuconfiguration.hxx> @@ -48,7 +48,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -75,7 +75,7 @@ #include <com/sun/star/frame/status/Visibility.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> @@ -112,7 +112,7 @@ struct SystemMenuData }; //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::cppu; @@ -165,15 +165,15 @@ namespace framework { // special menu ids/command ids for dynamic popup menus -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) -#define SID_MDIWINDOWLIST (SID_SFX_START + 610) -#define SID_ADDONLIST (SID_SFX_START + 1677) -#define SID_HELPMENU (SID_SFX_START + 410) +#define SID_SFX_START 5000 +#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) +#define SID_PICKLIST (SID_SFX_START + 510) +#define SID_MDIWINDOWLIST (SID_SFX_START + 610) +#define SID_ADDONLIST (SID_SFX_START + 1677) +#define SID_HELPMENU (SID_SFX_START + 410) -#define SFX_REFERER_USER "private:user" +#define SFX_REFERER_USER "private:user" const ::rtl::OUString aCmdHelpIndex( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpIndex" )); const ::rtl::OUString aCmdToolsMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolsMenu" )); @@ -315,7 +315,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces if ( m_pVCLMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + OGuard aSolarGuard( Application::GetSolarMutex() ); SystemMenuData aSystemMenuData; aSystemMenuData.nSize = sizeof( SystemMenuData ); @@ -352,7 +352,7 @@ MenuBarManager::~MenuBarManager() void MenuBarManager::Destroy() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Destroy" ); - OGuard aGuard( Application::GetSolarMutex() ); + OGuard aGuard( Application::GetSolarMutex() ); if ( !m_bDisposed ) { @@ -511,7 +511,7 @@ throw ( RuntimeException ) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" ); ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete; - OGuard aSolarGuard( Application::GetSolarMutex() ); + OGuard aSolarGuard( Application::GetSolarMutex() ); { ResetableGuard aGuard( m_aLock ); @@ -660,7 +660,7 @@ void MenuBarManager::RemoveListener() if ( pItemHandler->xMenuItemDispatch.is() ) { URL aTargetURL; - aTargetURL.Complete = pItemHandler->aMenuItemURL; + aTargetURL.Complete = pItemHandler->aMenuItemURL; m_xURLTransformer->parseStrict( aTargetURL ); pItemHandler->xMenuItemDispatch->removeStatusListener( @@ -672,7 +672,7 @@ void MenuBarManager::RemoveListener() { { // Remove popup menu from menu structure - OGuard aGuard2( Application::GetSolarMutex() ); + OGuard aGuard2( Application::GetSolarMutex() ); m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); } @@ -749,7 +749,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Release references to the dispatch object URL aTargetURL; - aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; + aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; // Check reference of service manager before we use it. Reference could // be cleared due to RemoveListener call! @@ -770,7 +770,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Remove popup menu from menu structure as we release our reference to // the controller. - OGuard aGuard2( Application::GetSolarMutex() ); + OGuard aGuard2( Application::GetSolarMutex() ); m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 ); } @@ -847,9 +847,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( pMenu == m_pVCLMenu ) { // set/unset hiding disabled menu entries - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); ResetableGuard aGuard( m_aLock ); @@ -882,10 +882,10 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) nSymbolsStyle != m_nSymbolsStyle ) { // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; - m_bShowMenuImages = bShowMenuImages; - m_bRetrieveImages = sal_False; - m_nSymbolsStyle = nSymbolsStyle; + m_bWasHiContrast = bIsHiContrast; + m_bShowMenuImages = bShowMenuImages; + m_bRetrieveImages = sal_False; + m_nSymbolsStyle = nSymbolsStyle; MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); } @@ -995,7 +995,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( xMenuItemDispatch.is() ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; - pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; + pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; if ( !bPopupMenu ) { @@ -1064,7 +1064,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) { - OGuard aGuard( Application::GetSolarMutex() ); + OGuard aGuard( Application::GetSolarMutex() ); Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY_THROW ); @@ -1081,9 +1081,9 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Select" ); - URL aTargetURL; - Sequence<PropertyValue> aArgs; - Reference< XDispatch > xDispatch; + URL aTargetURL; + Sequence<PropertyValue> aArgs; + Reference< XDispatch > xDispatch; { ResetableGuard aGuard( m_aLock ); @@ -1260,18 +1260,18 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const rtl::OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuManager" ); - m_xFrame = rFrame; - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pMenu; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_False; + m_xFrame = rFrame; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pMenu; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_False; m_xDispatchProvider = rDispatchProvider; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); - m_bShowMenuImages = rSettings.GetUseImagesInMenus(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bShowMenuImages = rSettings.GetUseImagesInMenus(); m_bRetrieveImages = sal_False; sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); @@ -1291,8 +1291,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF aCommand == aSpecialWindowCommand ) { // Retrieve addon popup menus and add them to our menu bar - Reference< com::sun::star::frame::XModel > xModel; - Reference< com::sun::star::frame::XController > xController( rFrame->getController(), UNO_QUERY ); + Reference< com::sun::star::frame::XModel > xModel; + Reference< com::sun::star::frame::XController > xController( rFrame->getController(), UNO_QUERY ); if ( xController.is() ) xModel = Reference< com::sun::star::frame::XModel >( xController->getModel(), UNO_QUERY ); framework::AddonMenuManager::MergeAddonPopupMenus( rFrame, xModel, nPos, (MenuBar *)pMenu ); @@ -1811,7 +1811,7 @@ void MenuBarManager::FillMenu( if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK ) nBits |= MIB_RADIOCHECK; pMenu->SetItemBits( nId, nBits ); - } + } if ( xIndexContainer.is() ) { PopupMenu* pNewPopupMenu = new PopupMenu; @@ -2055,13 +2055,13 @@ USHORT MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMe void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Init" ); - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pAddonMenu; - m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_True; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pAddonMenu; + m_xFrame = rFrame; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_True; rtl::OUString aModuleIdentifier; m_xPopupMenuControllerRegistration = Reference< ::com::sun::star::frame::XUIControllerRegistration >( @@ -2069,7 +2069,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen UNO_QUERY ); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); Reference< XStatusListener > xStatusListener; Reference< XDispatch > xDispatch; diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 51f87a400a9e..f82253345778 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,7 +204,7 @@ bool MenuBarMerger::CreateSubMenu( return true; } -bool MenuBarMerger::MergeMenuItems( +bool MenuBarMerger::MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, @@ -233,7 +233,7 @@ bool MenuBarMerger::MergeMenuItems( PopupMenu* pSubMenu = new PopupMenu(); pMenu->SetPopupMenu( nItemId, pSubMenu ); ++nItemId; - + CreateSubMenu( pSubMenu, nItemId, rModuleIdentifier, rMenuItem.aSubMenu ); } else @@ -246,11 +246,11 @@ bool MenuBarMerger::MergeMenuItems( return true; } -bool MenuBarMerger::ReplaceMenuItem( - Menu* pMenu, - sal_uInt16 nPos, - sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, +bool MenuBarMerger::ReplaceMenuItem( + Menu* pMenu, + sal_uInt16 nPos, + sal_uInt16& rItemId, + const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { // There is no replace available. Therfore we first have to @@ -261,15 +261,15 @@ bool MenuBarMerger::ReplaceMenuItem( } bool MenuBarMerger::RemoveMenuItems( - Menu* pMenu, - sal_uInt16 nPos, + Menu* pMenu, + sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ) { const sal_uInt16 nParam( sal_uInt16( rMergeCommandParameter.toInt32() )); sal_uInt16 nCount( 1 ); - + nCount = std::max( nParam, nCount ); - + sal_uInt16 i = 0; while (( nPos < pMenu->GetItemCount() ) && ( i < nCount )) { @@ -280,8 +280,8 @@ bool MenuBarMerger::RemoveMenuItems( return true; } -bool MenuBarMerger::ProcessMergeOperation( - Menu* pMenu, +bool MenuBarMerger::ProcessMergeOperation( + Menu* pMenu, sal_uInt16 nPos, sal_uInt16& nItemId, const ::rtl::OUString& rMergeCommand, @@ -334,7 +334,7 @@ bool MenuBarMerger::ProcessFallbackOperation( sal_Int32 nLevel( aRefPathInfo.nLevel ); const sal_Int32 nSize( rReferencePath.size() ); bool bFirstLevel( true ); - + while ( nLevel < nSize ) { if ( nLevel == nSize-1 ) @@ -359,10 +359,10 @@ bool MenuBarMerger::ProcessFallbackOperation( else { const ::rtl::OUString aCmd( rReferencePath[nLevel] ); - + sal_uInt16 nInsPos( MENU_APPEND ); PopupMenu* pPopupMenu( new PopupMenu ); - + if ( bFirstLevel && ( aRefPathInfo.eResult == RP_MENUITEM_INSTEAD_OF_POPUPMENU_FOUND )) { // special case: menu item without popup @@ -371,14 +371,14 @@ bool MenuBarMerger::ProcessFallbackOperation( pCurrMenu->SetItemCommand( nSetItemId, aCmd ); pCurrMenu->SetPopupMenu( nSetItemId, pPopupMenu ); } - else + else { // normal case: insert a new item with popup pCurrMenu->InsertItem( rItemId, ::rtl::OUString(), 0, MENU_APPEND ); pCurrMenu->SetItemCommand( rItemId, aCmd ); pCurrMenu->SetPopupMenu( rItemId, pPopupMenu ); } - + pCurrMenu = pPopupMenu; ++rItemId; bFirstLevel = false; @@ -391,13 +391,13 @@ bool MenuBarMerger::ProcessFallbackOperation( return false; } -void MenuBarMerger::GetMenuEntry( +void MenuBarMerger::GetMenuEntry( const uno::Sequence< beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& rAddonMenuItem ) { // Reset submenu member rAddonMenuItem.aSubMenu.clear(); - + for ( sal_Int32 i = 0; i < rAddonMenuEntry.getLength(); i++ ) { ::rtl::OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; @@ -425,14 +425,14 @@ void MenuBarMerger::GetSubMenu( AddonMenuContainer& rSubMenu ) { rSubMenu.clear(); - + const sal_Int32 nCount = rSubMenuEntries.getLength(); rSubMenu.reserve(rSubMenu.size() + nCount); for ( sal_Int32 i = 0; i < nCount; i++ ) { const uno::Sequence< beans::PropertyValue >& rMenuEntry = rSubMenuEntries[ i ]; - AddonMenuItem aMenuItem; + AddonMenuItem aMenuItem; GetMenuEntry( rMenuEntry, aMenuItem ); rSubMenu.push_back( aMenuItem ); } diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 44e133934c9a..da3092c2c725 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/menubarwrapper.hxx> #include <threadhelp/resetableguard.hxx> @@ -37,7 +37,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <tools/solar.h> @@ -70,7 +70,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_11 ( MenuBarWrapper , UIConfigElementWrapperBase , diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index fd04594c4ecc..786795ff1d14 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/newmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -43,7 +43,7 @@ #include <xml/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -55,7 +55,7 @@ #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> @@ -70,7 +70,7 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -89,7 +89,7 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE ( NewMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_NEWMENUCONTROLLER ) diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 5c06d1b7a179..80dccb76db05 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/objectmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -48,7 +48,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -62,7 +62,7 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -75,9 +75,9 @@ using namespace com::sun::star::util; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( ObjectMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( ObjectMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_OBJECTMENUCONTROLLER ) @@ -155,7 +155,7 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even // XMenuListener void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch"); diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index 5f6e21c22ee8..328777db2b79 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -59,7 +59,7 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE ( PopupMenuController , OWeakObject , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ) , + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ) , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PopupMenuController" ) ) ) @@ -93,7 +93,7 @@ Any SAL_CALL PopupMenuController::queryInterface( const Type& aType ) throw (Ru Any a( ToolboxController::queryInterface( aType ) ); if ( a.hasValue() ) return a; - + return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this )); } @@ -137,7 +137,7 @@ void SAL_CALL PopupMenuController::dispose() throw (RuntimeException) void SAL_CALL PopupMenuController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException ) { svt::ToolboxController::statusChanged(rEvent); - enable( rEvent.IsEnabled ); + enable( rEvent.IsEnabled ); } // -------------------------------------------------------------------- diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 5693bd6346ab..a20f107ea22e 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,41 +33,41 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/statusindicator.hxx> #include <threadhelp/resetableguard.hxx> #include <uielement/statusindicatorinterfacewrapper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star; namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ ProgressBarWrapper::ProgressBarWrapper() : @@ -120,7 +120,7 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const } // wrapped methods of ::com::sun::star::task::XStatusIndicator -void ProgressBarWrapper::start( const ::rtl::OUString& Text, ::sal_Int32 Range ) +void ProgressBarWrapper::start( const ::rtl::OUString& Text, ::sal_Int32 Range ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -131,7 +131,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; m_nValue = 0; m_nRange = Range; @@ -152,7 +152,7 @@ throw (uno::RuntimeException) pStatusBar->SetUpdateMode( FALSE ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); - pStatusBar->SetProgressValue( USHORT( nValue )); + pStatusBar->SetProgressValue( USHORT( nValue )); pStatusBar->SetUpdateMode( TRUE ); } pStatusBar->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); @@ -160,7 +160,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::end() +void ProgressBarWrapper::end() throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -170,7 +170,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; m_nRange = 100; m_nValue = 0; @@ -189,7 +189,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::setText( const ::rtl::OUString& Text ) +void ProgressBarWrapper::setText( const ::rtl::OUString& Text ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -200,7 +200,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; m_aText = Text; nValue = m_nValue; @@ -218,7 +218,7 @@ throw (uno::RuntimeException) pStatusBar->SetUpdateMode( FALSE ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); - pStatusBar->SetProgressValue( USHORT( nValue )); + pStatusBar->SetProgressValue( USHORT( nValue )); pStatusBar->SetUpdateMode( TRUE ); } else @@ -227,7 +227,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::setValue( ::sal_Int32 nValue ) +void ProgressBarWrapper::setValue( ::sal_Int32 nValue ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -239,7 +239,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; double fVal( 0 ); @@ -248,7 +248,7 @@ throw (uno::RuntimeException) fVal = ( double( nValue ) / double( m_nRange )) * 100; fVal = std::max( double( 0 ), std::min( fVal, double( 100 ))); } - + if ( m_nValue != sal_Int32( fVal )) { m_nValue = sal_Int32( fVal ); @@ -273,7 +273,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::reset() +void ProgressBarWrapper::reset() throw (uno::RuntimeException) { setText( rtl::OUString() ); @@ -281,30 +281,30 @@ throw (uno::RuntimeException) } // XInitialization -void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& ) +void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& ) throw (uno::Exception, uno::RuntimeException) { // dummy - do nothing } // XUpdatable -void SAL_CALL ProgressBarWrapper::update() +void SAL_CALL ProgressBarWrapper::update() throw (uno::RuntimeException) { // dummy - do nothing } // XComponent -void SAL_CALL ProgressBarWrapper::dispose() +void SAL_CALL ProgressBarWrapper::dispose() throw (uno::RuntimeException) { - uno::Reference< lang::XComponent > xThis( - static_cast< cppu::OWeakObject* >(this), + uno::Reference< lang::XComponent > xThis( + static_cast< cppu::OWeakObject* >(this), uno::UNO_QUERY ); { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) return; } @@ -312,7 +312,7 @@ throw (uno::RuntimeException) { lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - + ResetableGuard aLock( m_aLock ); if ( m_bOwnsInstance ) { @@ -326,14 +326,14 @@ throw (uno::RuntimeException) { } } - + m_xStatusBar.clear(); m_bDisposed = sal_True; } } // XUIElement -uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface() +uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface() throw (uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -347,19 +347,19 @@ throw (uno::RuntimeException) uno::Reference< uno::XInterface > xComp( m_xProgressBarIfacWrapper ); if ( !xComp.is() ) { - StatusIndicatorInterfaceWrapper* pWrapper = - new StatusIndicatorInterfaceWrapper( - uno::Reference< lang::XComponent >( - static_cast< cppu::OWeakObject* >( this ), + StatusIndicatorInterfaceWrapper* pWrapper = + new StatusIndicatorInterfaceWrapper( + uno::Reference< lang::XComponent >( + static_cast< cppu::OWeakObject* >( this ), uno::UNO_QUERY )); xComp = uno::Reference< uno::XInterface >( - static_cast< cppu::OWeakObject* >( pWrapper ), + static_cast< cppu::OWeakObject* >( pWrapper ), uno::UNO_QUERY ); m_xProgressBarIfacWrapper = xComp; } - + return xComp; } } -} // namespace framework +} // namespace framework diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index a61cbf882393..2e36a319efb6 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/recentfilesmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -41,14 +41,14 @@ #include <classes/fwkresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/util/XStringWidth.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -71,7 +71,7 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -103,7 +103,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star DEFINE_XSERVICEINFO_MULTISERVICE ( RecentFilesMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER ) @@ -194,10 +194,10 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > } // Abbreviate URL - rtl::OUString aURLString( aCmdPrefix + rtl::OUString::valueOf( sal_Int32( i ))); - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; - INetURLObject aURL( m_aRecentFilesItems[i].aURL ); + rtl::OUString aURLString( aCmdPrefix + rtl::OUString::valueOf( sal_Int32( i ))); + rtl::OUString aTipHelpText; + rtl::OUString aMenuTitle; + INetURLObject aURL( m_aRecentFilesItems[i].aURL ); if ( aURL.GetProtocol() == INET_PROT_FILE ) { @@ -205,8 +205,8 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > // path and abbreviate it with a special function: String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + ::rtl::OUString aSystemPath( aFileSystemPath ); + ::rtl::OUString aCompactedSystemPath; aTipHelpText = aSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); @@ -253,7 +253,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > else { // Use INetURLObject to abbreviate all other URLs - String aShortURL; + String aShortURL; aShortURL = aURL.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); aMenuTitle += aShortURL; aTipHelpText = aURLString; diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx index eeeb6216138a..8c81f31f2394 100644 --- a/framework/source/uielement/rootitemcontainer.cxx +++ b/framework/source/uielement/rootitemcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/rootitemcontainer.hxx> @@ -44,12 +44,12 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ using namespace cppu; @@ -68,7 +68,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_10 ( RootItemContainer , OWeakObject , @@ -76,9 +76,9 @@ DEFINE_XINTERFACE_10 ( RootItemContainer DIRECT_INTERFACE( ::com::sun::star::container::XIndexContainer ), DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel ), DIRECT_INTERFACE( ::com::sun::star::lang::XSingleComponentFactory ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DERIVED_INTERFACE( ::com::sun::star::container::XIndexReplace, com::sun::star::container::XIndexContainer ), DERIVED_INTERFACE( ::com::sun::star::container::XIndexAccess, com::sun::star::container::XIndexReplace ), DERIVED_INTERFACE( ::com::sun::star::container::XElementAccess, ::com::sun::star::container::XIndexAccess ) @@ -348,8 +348,8 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any& aConve const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index e5fae0992fa8..4e7855fb4900 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ using namespace ::com::sun::star::frame; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_SIMPLETEXTSTATUSBARCONTROLLER ) @@ -84,19 +84,19 @@ void SAL_CALL SimpleTextStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); - - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + svt::StatusbarController::initialize( aArguments ); rtl::OUString aValue; beans::PropertyValue aPropValue; - + // Check arguments for optional "Value" property. We need it // to set our internal simple text. for ( int i = 0; i < aArguments.getLength(); i++ ) @@ -106,8 +106,8 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException aPropValue.Value >>= aValue; break; } - } - + } + m_aText = aValue; if ( m_xParentWindow.is() && m_nID > 0 ) { @@ -126,14 +126,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL SimpleTextStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL SimpleTextStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index d5d64a32c91e..dad2775dc453 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -44,7 +44,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -55,7 +55,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 502253255c00..132a42456d1e 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,11 +30,11 @@ #include <uielement/statusbar.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -42,7 +42,7 @@ namespace framework { -FrameworkStatusBar::FrameworkStatusBar( +FrameworkStatusBar::FrameworkStatusBar( Window* pParent, WinBits nWinBits ) : StatusBar( pParent, nWinBits ), @@ -57,7 +57,7 @@ FrameworkStatusBar::FrameworkStatusBar( FrameworkStatusBar::~FrameworkStatusBar() { } - + void FrameworkStatusBar::SetStatusBarManager( StatusBarManager* pStatusBarManager ) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 957857fe3ec1..0bbdbc339a34 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <uielement/statusbarmanager.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> @@ -46,7 +46,7 @@ #include <helper/mischelper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -59,7 +59,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -115,12 +115,12 @@ static USHORT impl_convertItemStyleToItemBits( sal_Int16 nStyle ) nItemBits |= SIB_AUTOSIZE; if ( nStyle & css_ui::ItemStyle::OWNER_DRAW ) nItemBits |= SIB_USERDRAW; - + return nItemBits; } - + //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_5 ( StatusBarManager , ::cppu::OWeakObject , @@ -132,16 +132,16 @@ DEFINE_XINTERFACE_5 ( StatusBarManager ) DEFINE_XTYPEPROVIDER_5 ( StatusBarManager , - lang::XTypeProvider , + lang::XTypeProvider , lang::XComponent , css::ui::XUIConfigurationListener , frame::XFrameActionListener , lang::XEventListener ) -StatusBarManager::StatusBarManager( - const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, - const uno::Reference< frame::XFrame >& rFrame, +StatusBarManager::StatusBarManager( + const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, + const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rResourceName, StatusBar* pStatusBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), @@ -159,8 +159,8 @@ StatusBarManager::StatusBarManager( RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::StatusBarManager" ); if ( m_xServiceManager.is() ) - m_xStatusbarControllerRegistration = uno::Reference< css::frame::XUIControllerRegistration >( - m_xServiceManager->createInstance( SERVICENAME_STATUSBARCONTROLLERFACTORY ), + m_xStatusbarControllerRegistration = uno::Reference< css::frame::XUIControllerRegistration >( + m_xServiceManager->createInstance( SERVICENAME_STATUSBARCONTROLLERFACTORY ), uno::UNO_QUERY ); m_pStatusBar->SetClickHdl( LINK( this, StatusBarManager, Click ) ); @@ -177,7 +177,7 @@ StatusBar* StatusBarManager::GetStatusBar() const ResetableGuard aGuard( m_aLock ); return m_pStatusBar; } - + void StatusBarManager::frameAction( const frame::FrameActionEvent& Action ) throw ( uno::RuntimeException ) { @@ -202,7 +202,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr ResetableGuard aGuard( m_aLock ); if ( Source.Source == uno::Reference< uno::XInterface >( m_xFrame, uno::UNO_QUERY )) m_xFrame.clear(); - + m_xServiceManager.clear(); } } @@ -211,18 +211,18 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::dispose" ); - uno::Reference< lang::XComponent > xThis( + uno::Reference< lang::XComponent > xThis( static_cast< OWeakObject* >(this), uno::UNO_QUERY ); lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - + { ResetableGuard aGuard( m_aLock ); if ( !m_bDisposed ) { RemoveControllers(); - + delete m_pStatusBar; m_pStatusBar = 0; @@ -230,8 +230,8 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) { try { - m_xFrame->removeFrameActionListener( uno::Reference< frame::XFrameActionListener >( - static_cast< ::cppu::OWeakObject *>( this ), + m_xFrame->removeFrameActionListener( uno::Reference< frame::XFrameActionListener >( + static_cast< ::cppu::OWeakObject *>( this ), uno::UNO_QUERY )); } catch ( uno::Exception& ) @@ -255,15 +255,15 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw lang::DisposedException(); - - m_aListenerContainer.addInterface( ::getCppuType( + + m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::removeEventListener" ); - m_aListenerContainer.removeInterface( ::getCppuType( + m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } @@ -272,7 +272,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementInserted" ); ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) return; @@ -282,17 +282,17 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementRemoved" ); ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) return; } - + void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementReplaced" ); ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) return; @@ -334,7 +334,7 @@ void StatusBarManager::RemoveControllers() { try { - uno::Reference< lang::XComponent > xComponent( + uno::Reference< lang::XComponent > xComponent( m_aControllerVector[n], uno::UNO_QUERY ); if ( xComponent.is() ) xComponent->dispose(); @@ -342,7 +342,7 @@ void StatusBarManager::RemoveControllers() catch ( uno::Exception& ) { } - + m_aControllerVector[n].clear(); } } @@ -359,30 +359,30 @@ void StatusBarManager::CreateControllers() uno::Reference< uno::XComponentContext > xComponentContext; uno::Reference< beans::XPropertySet > xProps( m_xServiceManager, uno::UNO_QUERY ); uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar ); - + if ( xProps.is() ) xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext; - + for ( USHORT i = 0; i < m_pStatusBar->GetItemCount(); i++ ) { USHORT nId = m_pStatusBar->GetItemId( i ); if ( nId == 0 ) continue; - + rtl::OUString aCommandURL( m_pStatusBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); uno::Reference< frame::XStatusListener > xController; - + svt::StatusbarController* pController( 0 ); - - if ( m_xStatusbarControllerRegistration.is() && + + if ( m_xStatusbarControllerRegistration.is() && m_xStatusbarControllerRegistration->hasController( aCommandURL, m_aModuleIdentifier )) { if ( xStatusbarControllerFactory.is() ) { - uno::Sequence< uno::Any > aSeq( 5 ); + uno::Sequence< uno::Any > aSeq( 5 ); beans::PropertyValue aPropValue; - + aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); aPropValue.Value = uno::makeAny( m_aModuleIdentifier ); aSeq[0] = uno::makeAny( aPropValue ); @@ -399,29 +399,29 @@ void StatusBarManager::CreateControllers() aPropValue.Value = uno::makeAny( nId ); aSeq[4] = uno::makeAny( aPropValue ); - xController = uno::Reference< frame::XStatusListener >( - xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( - aCommandURL, aSeq, xComponentContext ), + xController = uno::Reference< frame::XStatusListener >( + xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( + aCommandURL, aSeq, xComponentContext ), uno::UNO_QUERY ); bInit = sal_False; // Initialization is done through the factory service } } - + if ( !xController.is() ) { pController = CreateStatusBarController( m_xFrame, m_pStatusBar, nId, aCommandURL ); if ( !pController ) pController = new svt::StatusbarController( m_xServiceManager, m_xFrame, aCommandURL, nId ); - + if ( pController ) - xController = uno::Reference< frame::XStatusListener >( - static_cast< ::cppu::OWeakObject *>( pController ), + xController = uno::Reference< frame::XStatusListener >( + static_cast< ::cppu::OWeakObject *>( pController ), uno::UNO_QUERY ); } - + m_aControllerVector.push_back( xController ); uno::Reference< lang::XInitialization > xInit( xController, uno::UNO_QUERY ); - + if ( xInit.is() ) { if ( bInit ) @@ -450,22 +450,22 @@ void StatusBarManager::CreateControllers() AddFrameActionListener(); } - + void StatusBarManager::AddFrameActionListener() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::AddFrameActionListener" ); if ( !m_bFrameActionRegistered && m_xFrame.is() ) { m_bFrameActionRegistered = sal_True; - m_xFrame->addFrameActionListener( uno::Reference< frame::XFrameActionListener >( + m_xFrame->addFrameActionListener( uno::Reference< frame::XFrameActionListener >( static_cast< ::cppu::OWeakObject *>( this ), uno::UNO_QUERY )); } } void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAccess >& rItemContainer ) -{ +{ RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::StatusBarManager::FillStatusbar" ); - + ResetableGuard aGuard( m_aLock ); if ( m_bDisposed || !m_pStatusBar ) @@ -476,7 +476,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc RemoveControllers(); - // reset and fill command map + // reset and fill command map m_pStatusBar->Clear(); m_aControllerVector.clear(); @@ -527,12 +527,12 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc { rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL )); USHORT nItemBits( impl_convertItemStyleToItemBits( nStyle )); - + m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset ); m_pStatusBar->SetItemCommand( nId, aCommandURL ); m_pStatusBar->SetAccessibleName( nId, aString ); // m_pStatusBar->SetHelpText( nId, aString ); - + if ( aHelpURL.indexOf( aHelpIdPrefix ) == 0 ) { rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); @@ -540,7 +540,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc if ( nHelpId > 0 ) m_pStatusBar->SetHelpId( nId, nHelpId ); } - + ++nId; } } @@ -567,12 +567,12 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::DataChanged" ); ResetableGuard aGuard( m_aLock ); - - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || ( rDCEvt.GetType() == DATACHANGED_FONTS ) || ( rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY ); @@ -590,23 +590,23 @@ void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::UserDraw" ); ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return; - + USHORT nId( rUDEvt.GetItemId() ); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { - uno::Reference< frame::XStatusbarController > xController( + uno::Reference< frame::XStatusbarController > xController( m_aControllerVector[nId-1], uno::UNO_QUERY ); if ( xController.is() && rUDEvt.GetDevice() ) { - uno::Reference< awt::XGraphics > xGraphics = + uno::Reference< awt::XGraphics > xGraphics = rUDEvt.GetDevice()->CreateUnoGraphics(); - awt::Rectangle aRect( rUDEvt.GetRect().Left(), + awt::Rectangle aRect( rUDEvt.GetRect().Left(), rUDEvt.GetRect().Top(), - rUDEvt.GetRect().GetWidth(), + rUDEvt.GetRect().GetWidth(), rUDEvt.GetRect().GetHeight() ); aGuard.unlock(); xController->paint( xGraphics, aRect, rUDEvt.GetItemId(), rUDEvt.GetStyle() ); @@ -618,10 +618,10 @@ void StatusBarManager::Command( const CommandEvent& rEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::Command" ); ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return; - + if ( rEvt.GetCommand() == COMMAND_CONTEXTMENU ) { USHORT nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() ); @@ -649,13 +649,13 @@ void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::MouseButton" ); ResetableGuard aGuard( m_aLock ); - + if ( !m_bDisposed ) { USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() ); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { - uno::Reference< frame::XStatusbarController > xController( + uno::Reference< frame::XStatusbarController > xController( m_aControllerVector[nId-1], uno::UNO_QUERY ); if ( xController.is() ) { @@ -684,29 +684,29 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt ) IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG ) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return 1; - + USHORT nId = m_pStatusBar->GetCurItemId(); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { - uno::Reference< frame::XStatusbarController > xController( + uno::Reference< frame::XStatusbarController > xController( m_aControllerVector[nId-1], uno::UNO_QUERY ); if ( xController.is() ) xController->click(); } - + return 1; } IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG ) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return 1; - + USHORT nId = m_pStatusBar->GetCurItemId(); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { @@ -715,7 +715,7 @@ IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG ) if ( xController.is() ) xController->doubleClick(); } - + return 1; } diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 18bef609fa06..030a790b35e3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <uielement/statusbarwrapper.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include <helper/actiontriggerhelper.hxx> @@ -41,7 +41,7 @@ #include <helpid.hrc> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/ui/UIElementType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -77,7 +77,7 @@ namespace framework StatusBarWrapper::StatusBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) - : UIConfigElementWrapperBase( UIElementType::STATUSBAR,xServiceManager ) + : UIConfigElementWrapperBase( UIElementType::STATUSBAR,xServiceManager ) { } diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 5f9d979e368c..7be64c053b4e 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/statusindicatorinterfacewrapper.hxx> #include <uielement/progressbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 1055a3ef061f..cf39edec2a7c 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx index b99fed9e5ffb..48716b89f0cd 100644 --- a/framework/source/uielement/toolbar.cxx +++ b/framework/source/uielement/toolbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/toolbar.hxx> #include <uielement/toolbarmanager.hxx> @@ -47,7 +47,7 @@ ToolBar::ToolBar( Window* pParent, WinBits nWinBits ) : ToolBar::~ToolBar() { } - + void ToolBar::SetToolBarManager( ToolBarManager* pTbMgr ) { m_pToolBarManager = pTbMgr; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 4a1f2fe98403..8152ea8519ce 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/toolbarmanager.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -55,7 +55,7 @@ #include <helper/acceleratorinfo.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -79,7 +79,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> @@ -102,7 +102,7 @@ #include <svtools/acceleratorexecute.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using rtl::OUString; @@ -220,7 +220,7 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_6 ( ToolBarManager , OWeakObject , @@ -232,8 +232,8 @@ DEFINE_XINTERFACE_6 ( ToolBarManager DERIVED_INTERFACE( ::com::sun::star::lang::XEventListener, ::com::sun::star::frame::XFrameActionListener ) ) -DEFINE_XTYPEPROVIDER_6 ( ToolBarManager , - ::com::sun::star::lang::XTypeProvider , +DEFINE_XTYPEPROVIDER_6 ( ToolBarManager , + ::com::sun::star::lang::XTypeProvider , ::com::sun::star::lang::XComponent , ::com::sun::star::ui::XUIConfigurationListener , ::com::sun::star::frame::XFrameActionListener , @@ -352,7 +352,7 @@ void ToolBarManager::Destroy() /* #i99167# removed change for i93173 since there is some weird crash */ // #i93173# delete toolbar lazily as we can still be in one of its handlers m_pToolBar->doLazyDelete(); - + Link aEmpty; m_pToolBar->SetSelectHdl( aEmpty ); m_pToolBar->SetActivateHdl( aEmpty ); @@ -874,7 +874,7 @@ void ToolBarManager::RemoveControllers() uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL ) { Sequence< PropertyValue > aPropSeq; - + // Retrieve properties for command try { @@ -882,7 +882,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const { Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW ); Reference< XInterface > xIfac( m_xFrame, UNO_QUERY ); - + m_bModuleIdentified = sal_True; m_aModuleIdentifier = xModuleManager->identify( xIfac ); @@ -893,7 +893,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels; } } - + if ( m_xUICommandLabels.is() ) { if ( rCmdURL.getLength() > 0 ) @@ -952,7 +952,7 @@ void ToolBarManager::CreateControllers() Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY ); Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); - css::util::URL aURL; + css::util::URL aURL; sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); SvtCommandOptions aCmdOptions; @@ -1052,9 +1052,9 @@ void ToolBarManager::CreateControllers() MenuDescriptionMap::iterator it = m_aMenuMap.find( nId ); if ( it == m_aMenuMap.end() ) { - xController = Reference< XStatusListener >( + xController = Reference< XStatusListener >( new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL )); - + // Accessibility support: Set toggle button role for specific commands sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL ); if ( nProps & UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON ) @@ -1116,7 +1116,7 @@ void ToolBarManager::CreateControllers() aPropertyVector.push_back( makeAny( aPropValue )); aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )); aPropValue.Value <<= xToolbarWindow; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( makeAny( aPropValue )); aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); aPropValue.Value <<= m_aModuleIdentifier; aPropertyVector.push_back( makeAny( aPropValue )); @@ -1131,17 +1131,17 @@ void ToolBarManager::CreateControllers() Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector )); xInit->initialize( aArgs ); //for Support Visiblitly by shizhoubo - if (pController) + if (pController) { - // rtl::OUString aCommandURL = pController->m_aCommandURL; - if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) || - aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) || - aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) || - aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" )) + // rtl::OUString aCommandURL = pController->m_aCommandURL; + if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) || + aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) || + aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) || + aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" )) ) pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True)); } - + //end } @@ -1341,7 +1341,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, sal_False ); if ( xMenuContainer.is() && xMenuContainer->getCount() ) { - Sequence< PropertyValue > aProps; + Sequence< PropertyValue > aProps; // drop down menu info is currently // the first ( and only ) menu // in the menusettings container @@ -1349,7 +1349,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine for ( sal_Int32 index=0; index<aProps.getLength(); ++index ) { if ( aProps[ index ].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN )) - + { aProps[ index ].Value >>= aMenuDesc; break; @@ -2161,9 +2161,9 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType ) IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { - if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || - ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && - ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) + if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || + ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && + ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); @@ -2241,7 +2241,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe { pExecuteInfo->xLayoutManager->dockAllWindows( UIElementType::TOOLBAR ); } - } + } catch ( Exception& ) { } diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 43f9068513a2..83f280cb46a7 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index d9ae3cfbe1df..65162b96561f 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <algorithm> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -45,7 +45,7 @@ #include <classes/sfxhelperfunctions.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -60,7 +60,7 @@ #include <com/sun/star/ui/UIElementType.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -82,7 +82,7 @@ #include <svtools/miscopt.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -104,7 +104,7 @@ static const char CMD_FORMULABAR[] = ".uno:InsertFormula"; static const char CMD_INPUTLINEBAR[] = ".uno:InputLineVisible"; static const char CMD_RESTOREVISIBILITY[] = ".cmd:RestoreVisibility"; static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; -static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; +static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; static const char STATIC_PRIVATE_TB_RESOURCE[] = "private:resource/toolbar/"; static const char STATIC_CMD_PART[] = ".uno:AvailableToolbars?Toolbar:string="; @@ -158,9 +158,9 @@ struct ToolBarInfo rtl::OUString aToolBarUIName; }; -DEFINE_XSERVICEINFO_MULTISERVICE ( ToolbarsMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( ToolbarsMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER ) @@ -225,7 +225,7 @@ void ToolbarsMenuController::addCommand( Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const rtl::OUString& rCommandURL ) { URL aTargetURL; - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; Reference< XURLTransformer > xURLTransformer; Reference< XFrame > xFrame; @@ -339,7 +339,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl aToolBarInfo.aToolBarResName = aResName; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -481,7 +481,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->checkItem( nIndex, sal_True ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -585,7 +585,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev // All other status events will be processed here sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; + sal_Bool bCheckmark = sal_False; osl::ClearableMutexGuard aLock( m_aMutex ); Reference< css::awt::XPopupMenu > xPopupMenu( m_xPopupMenu ); @@ -593,7 +593,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev if ( xPopupMenu.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -737,7 +737,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent else if ( aCmd.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_CMD_PART ))) < 0 ) { URL aTargetURL; - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; aTargetURL.Complete = aCmd; xURLTransformer->parseStrict( aTargetURL ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index bc3c5a752c40..5a4fb7cddde4 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -44,7 +44,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -56,7 +56,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index a6fedb662469..0d50aa4c36d4 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uielement/uicommanddescription.hxx" #include <threadhelp/resetableguard.hxx> @@ -38,7 +38,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase2.hxx> @@ -61,7 +61,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -72,7 +72,7 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -107,7 +107,7 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for PopupMenuControllerFactory implementation +// Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** class ConfigurationAccess_UICommand : // Order is neccessary for right initialization! @@ -207,7 +207,7 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ }; //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XMultiServiceFactory >& rServiceManager ) : ThreadHelpBase(), @@ -627,11 +627,11 @@ void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEven } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICommandDescription , - ::cppu::OWeakObject , - SERVICENAME_UICOMMANDDESCRIPTION , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICommandDescription , + ::cppu::OWeakObject , + SERVICENAME_UICOMMANDDESCRIPTION , IMPLEMENTATIONNAME_UICOMMANDDESCRIPTION ) diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index c324284fdc1f..68331e1e0e97 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uifactory/addonstoolboxfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/addonstoolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -49,14 +49,14 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -71,11 +71,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( AddonsToolBoxFactory , - ::cppu::OWeakObject , - SERVICENAME_TOOLBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( AddonsToolBoxFactory , + ::cppu::OWeakObject , + SERVICENAME_TOOLBARFACTORY , IMPLEMENTATIONNAME_ADDONSTOOLBARFACTORY ) @@ -207,7 +207,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xServiceManager ); xToolBar = Reference< ::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY ); Reference< XInitialization > xInit( xToolBar, UNO_QUERY ); diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index dc2ff7e78b23..505f3418ed8c 100755 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/factoryconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -45,16 +45,16 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,9 +63,9 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { @@ -78,7 +78,7 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( Reference< XMultiServiceFactory >& rServiceManager,const ::rtl::OUString& _sRoot,bool _bAskValue ) : ThreadHelpBase(), @@ -87,7 +87,7 @@ ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( Re m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )), m_aPropValue( RTL_CONSTASCII_USTRINGPARAM( "Value" )), m_sRoot(_sRoot), - m_xServiceManager( rServiceManager ), + m_xServiceManager( rServiceManager ), m_bConfigAccessInitialized( sal_False ), m_bAskValue(_bAskValue) { @@ -99,7 +99,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory() { // SAFE ResetableGuard aLock( m_aLock ); - + Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener( this ); @@ -111,18 +111,18 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule // SAFE ResetableGuard aLock( m_aLock ); MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aImplementationName; else if ( rModule.getLength() ) { // Try to detect if we have a generic popup menu controller pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aImplementationName; } - + return rtl::OUString(); } rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const @@ -130,27 +130,27 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getValueFromCommandModule" ); // SAFE ResetableGuard aLock( m_aLock ); - + MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aValue; else if ( rModule.getLength() ) { // Try to detect if we have a generic popup menu controller pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aValue; } - + return rtl::OUString(); } -void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( - const rtl::OUString& rCommandURL, - const rtl::OUString& rModule, +void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( + const rtl::OUString& rCommandURL, + const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::addServiceToCommandModule" ); @@ -161,14 +161,14 @@ void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,::rtl::OUString()) )); } -void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( - const rtl::OUString& rCommandURL, +void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( + const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule" ); // SAFE ResetableGuard aLock( m_aLock ); - + rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule ); m_aMenuControllerMap.erase( aHashKey ); } @@ -181,7 +181,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont rtl::OUString aModule; rtl::OUString aService; rtl::OUString aValue; - + // SAFE ResetableGuard aLock( m_aLock ); @@ -203,10 +203,10 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont rtl::OUString aModule; rtl::OUString aService; rtl::OUString aValue; - + // SAFE ResetableGuard aLock( m_aLock ); - + if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue )) { // Create hash key from command and module as they are together a primary key to @@ -229,7 +229,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObjec // SAFE // remove our reference to the config access ResetableGuard aLock( m_aLock ); - m_xConfigAccess.clear(); + m_xConfigAccess.clear(); } void ConfigurationAccess_ControllerFactory::readConfigurationData() @@ -237,16 +237,16 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::readConfigurationData" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigAccessInitialized ) { Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - + aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; - + try { m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY ); @@ -254,10 +254,10 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() catch ( WrappedTargetException& ) { } - + m_bConfigAccessInitialized = sal_True; } - + if ( m_xConfigAccess.is() ) { // Read and update configuration data @@ -280,13 +280,13 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData() if ( m_xConfigAccess.is() ) { Sequence< rtl::OUString > aPopupMenuControllers = m_xConfigAccess->getElementNames(); - + rtl::OUString aCommand; rtl::OUString aModule; rtl::OUString aService; rtl::OUString aHashKey; rtl::OUString aValue; - + m_aMenuControllerMap.clear(); for ( sal_Int32 i = 0; i < aPopupMenuControllers.getLength(); i++ ) { diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index e897ce5d2492..3cc132d9cb48 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,14 +30,14 @@ #include <uifactory/menubarfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <uielement/menubarwrapper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -50,7 +50,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -62,9 +62,9 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -77,11 +77,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MenuBarFactory , - ::cppu::OWeakObject , - SERVICENAME_MENUBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MenuBarFactory , + ::cppu::OWeakObject , + SERVICENAME_MENUBARFACTORY , IMPLEMENTATIONNAME_MENUBARFACTORY ) @@ -105,8 +105,8 @@ MenuBarFactory::~MenuBarFactory() } // XUIElementFactory -Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( - const ::rtl::OUString& ResourceURL, +Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( + const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { @@ -127,7 +127,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >& _xModuleManager ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) { - Reference< XUIConfigurationManager > xCfgMgr; + Reference< XUIConfigurationManager > xCfgMgr; Reference< XUIConfigurationManager > xConfigSource; Reference< XFrame > xFrame; rtl::OUString aResourceURL( ResourceURL ); @@ -182,7 +182,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL } } } - + PropertyValue aPropValue; Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4); aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); @@ -203,8 +203,8 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL aPropValue.Value <<= bExtraMode; aPropSeq[4] <<= aPropValue; } - - vos::OGuard aGuard( Application::GetSolarMutex() ); + + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< XInitialization > xInit( _xMenuBar, UNO_QUERY ); xInit->initialize( aPropSeq ); } diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx index 586ada8907fa..8736aa5dcf80 100644 --- a/framework/source/uifactory/popupmenucontrollerfactory.cxx +++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/popupmenucontrollerfactory.hxx" #include <threadhelp/resetableguard.hxx> @@ -37,7 +37,7 @@ #include "uifactory/factoryconfiguration.hxx" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,16 +46,16 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -64,19 +64,19 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( PopupMenuControllerFactory , - ::cppu::OWeakObject , - SERVICENAME_POPUPMENUCONTROLLERFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( PopupMenuControllerFactory , + ::cppu::OWeakObject , + SERVICENAME_POPUPMENUCONTROLLERFACTORY , IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY ) diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx index e11b435d9a01..cfbfcd49e23f 100644 --- a/framework/source/uifactory/statusbarcontrollerfactory.cxx +++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/statusbarcontrollerfactory.hxx" #include "uifactory/factoryconfiguration.hxx" @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,15 +46,15 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,18 +63,18 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusbarControllerFactory , - ::cppu::OWeakObject , - SERVICENAME_STATUSBARCONTROLLERFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusbarControllerFactory , + ::cppu::OWeakObject , + SERVICENAME_STATUSBARCONTROLLERFACTORY , IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY ) @@ -85,7 +85,7 @@ StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiS { m_pConfigAccess = new ConfigurationAccess_ControllerFactory( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" )),true ); m_pConfigAccess->acquire(); -} +} } // namespace framework diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 8841b7c577e8..ddbe47912a0e 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ #include <uifactory/menubarfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/statusbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -50,14 +50,14 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -72,11 +72,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusBarFactory , - ::cppu::OWeakObject , - SERVICENAME_STATUSBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusBarFactory , + ::cppu::OWeakObject , + SERVICENAME_STATUSBARFACTORY , IMPLEMENTATIONNAME_STATUSBARFACTORY ) diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 896b6b44db33..1905375f7022 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/toolbarcontrollerfactory.hxx" #include "uifactory/factoryconfiguration.hxx" @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,15 +46,15 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,19 +63,19 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolbarControllerFactory , - ::cppu::OWeakObject , - SERVICENAME_TOOLBARCONTROLLERFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolbarControllerFactory , + ::cppu::OWeakObject , + SERVICENAME_TOOLBARCONTROLLERFACTORY , IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY ) @@ -101,26 +101,26 @@ ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServi ToolbarControllerFactory::~ToolbarControllerFactory() { ResetableGuard aLock( m_aLock ); - + // reduce reference count m_pConfigAccess->release(); } // XMultiComponentFactory -Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( - const ::rtl::OUString& aServiceSpecifier, +Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( + const ::rtl::OUString& aServiceSpecifier, const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() ); if ( aServiceName.getLength() > 0 ) return m_xServiceManager->createInstance( aServiceName ); @@ -129,18 +129,18 @@ throw (Exception, RuntimeException) // SAFE } -Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( - const ::rtl::OUString& ServiceSpecifier, - const Sequence< Any >& Arguments, +Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( + const ::rtl::OUString& ServiceSpecifier, + const Sequence< Any >& Arguments, const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); - + rtl::OUString aPropName; PropertyValue aPropValue; - + // Retrieve the optional module name form the Arguments sequence. It is used as a part of // the hash map key to support different controller implementation for the same URL but different // module!! @@ -152,9 +152,9 @@ throw (Exception, RuntimeException) break; } } - + Sequence< Any > aNewArgs( Arguments ); - + sal_Int32 nAppendIndex = aNewArgs.getLength(); bool bHasValue = m_pConfigAccess->hasValue(); aNewArgs.realloc( aNewArgs.getLength() + (bHasValue ? 2 : 1) ); @@ -164,7 +164,7 @@ throw (Exception, RuntimeException) aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )); aPropValue.Value <<= ServiceSpecifier; aNewArgs[nAppendIndex] <<= aPropValue; - + if ( bHasValue ) { // Append the optional value argument. It's an empty string if no additional info @@ -178,20 +178,20 @@ throw (Exception, RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName ); Reference< XMultiServiceFactory > xServiceManager( m_xServiceManager ); - + aLock.unlock(); // SAFE - + if ( aServiceName.getLength() > 0 ) return xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs ); else @@ -206,9 +206,9 @@ throw (RuntimeException) } // XUIControllerRegistration -sal_Bool SAL_CALL ToolbarControllerFactory::hasController( - const ::rtl::OUString& aCommandURL, - const rtl::OUString& aModuleName ) +sal_Bool SAL_CALL ToolbarControllerFactory::hasController( + const ::rtl::OUString& aCommandURL, + const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -218,19 +218,19 @@ throw (::com::sun::star::uno::RuntimeException) m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 ); } -void SAL_CALL ToolbarControllerFactory::registerController( - const ::rtl::OUString& aCommandURL, - const ::rtl::OUString& aModuleName, - const ::rtl::OUString& aControllerImplementationName ) +void SAL_CALL ToolbarControllerFactory::registerController( + const ::rtl::OUString& aCommandURL, + const ::rtl::OUString& aModuleName, + const ::rtl::OUString& aControllerImplementationName ) throw (RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; @@ -241,14 +241,14 @@ throw (RuntimeException) // SAFE } -void SAL_CALL ToolbarControllerFactory::deregisterController( - const ::rtl::OUString& aCommandURL, - const rtl::OUString& aModuleName ) +void SAL_CALL ToolbarControllerFactory::deregisterController( + const ::rtl::OUString& aCommandURL, + const rtl::OUString& aModuleName ) throw (RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx index 502ee251dff9..f2e9aa9bc0d2 100644 --- a/framework/source/uifactory/toolboxfactory.cxx +++ b/framework/source/uifactory/toolboxfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uifactory/toolboxfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/toolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -49,14 +49,14 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -71,11 +71,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolBoxFactory , - ::cppu::OWeakObject , - SERVICENAME_TOOLBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolBoxFactory , + ::cppu::OWeakObject , + SERVICENAME_TOOLBARFACTORY , IMPLEMENTATIONNAME_TOOLBARFACTORY ) diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 6579d985eb00..171acce9cb72 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uifactory/uielementfactorymanager.hxx> #include <uifactory/windowcontentfactorymanager.hxx> @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> @@ -55,9 +55,9 @@ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -68,9 +68,9 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { @@ -88,7 +88,7 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUSt //***************************************************************************************************************** -// Configuration access class for UIElementFactoryManager implementation +// Configuration access class for UIElementFactoryManager implementation //***************************************************************************************************************** @@ -111,7 +111,7 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager() { // SAFE ResetableGuard aLock( m_aLock ); - + Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener( this ); @@ -123,7 +123,7 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam // SAFE ResetableGuard aLock( m_aLock ); - FactoryManagerMap::const_iterator pIter = + FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rModule )); if ( pIter != m_aFactoryManagerMap.end() ) return pIter->second; @@ -149,7 +149,7 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam return pIter->second; } } - + return rtl::OUString(); } @@ -162,7 +162,7 @@ void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( co rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey ); - + if ( pIter != m_aFactoryManagerMap.end() ) throw ElementExistException(); else @@ -175,11 +175,11 @@ void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModul RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule" ); // SAFE ResetableGuard aLock( m_aLock ); - + rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey ); - + if ( pIter == m_aFactoryManagerMap.end() ) throw NoSuchElementException(); else @@ -191,7 +191,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactoriesDescription" ); // SAFE ResetableGuard aLock( m_aLock ); - + Sequence< Sequence< PropertyValue > > aSeqSeq; sal_Int32 nIndex( 0 ); @@ -219,10 +219,10 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac aSeq[2].Value = makeAny( aFactory.getToken( 0, '^', nToken )); } } - + aSeqSeq[nIndex++] = aSeq; } - + ++pIter; } @@ -237,7 +237,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain rtl::OUString aName; rtl::OUString aModule; rtl::OUString aService; - + // SAFE ResetableGuard aLock( m_aLock ); @@ -257,10 +257,10 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain rtl::OUString aName; rtl::OUString aModule; rtl::OUString aService; - + // SAFE ResetableGuard aLock( m_aLock ); - + if ( impl_getElementProps( aEvent.Element, aType, aName, aModule, aService )) { // Create hash key from command and model as they are together a primary key to @@ -277,7 +277,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain rtl::OUString aName; rtl::OUString aModule; rtl::OUString aService; - + // SAFE ResetableGuard aLock( m_aLock ); @@ -298,7 +298,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& // SAFE // remove our reference to the config access ResetableGuard aLock( m_aLock ); - m_xConfigAccess.clear(); + m_xConfigAccess.clear(); } void ConfigurationAccess_FactoryManager::readConfigurationData() @@ -306,16 +306,16 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::readConfigurationData" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigAccessInitialized ) { Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - + aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; - + try { m_xConfigAccess.set( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY ); @@ -323,14 +323,14 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() catch ( WrappedTargetException& ) { } - + m_bConfigAccessInitialized = sal_True; } - + if ( m_xConfigAccess.is() ) { Sequence< rtl::OUString > aUIElementFactories = m_xConfigAccess->getElementNames(); - + rtl::OUString aType; rtl::OUString aName; rtl::OUString aModule; @@ -347,7 +347,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService )); } } - + Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); aLock.unlock(); // UNSAFE @@ -385,10 +385,10 @@ sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aE } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UIElementFactoryManager , - ::cppu::OWeakObject , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UIElementFactoryManager , + ::cppu::OWeakObject , SERVICENAME_UIELEMENTFACTORYMANAGER , IMPLEMENTATIONNAME_UIELEMENTFACTORYMANAGER ) @@ -409,33 +409,33 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XMultiService UIElementFactoryManager::~UIElementFactoryManager() { ResetableGuard aLock( m_aLock ); - + // reduce reference count m_pConfigAccess->release(); } // XUIElementFactory -Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( - const ::rtl::OUString& ResourceURL, +Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( + const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::createUIElement" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + const rtl::OUString aPropFrame( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); - + rtl::OUString aModuleId; PropertyValue aPropValue; Reference< XFrame > xFrame; - + // Retrieve the frame instance from the arguments to determine the module identifier. This must be provided // to the search function. An empty module identifier is provided if the frame is missing or the module id cannot // retrieve from it. @@ -444,7 +444,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l if ( Args[i].Name.equals( aPropFrame )) Args[i].Value >>= xFrame; } - + Reference< XModuleManager > xManager( m_xModuleManager ); aLock.unlock(); @@ -453,7 +453,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l { if ( xFrame.is() && xManager.is() ) aModuleId = xManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ) ); - + Reference< XUIElementFactory > xUIElementFactory = getFactory( ResourceURL, aModuleId ); if ( xUIElementFactory.is() ) return xUIElementFactory->createUIElement( ResourceURL, Args ); @@ -466,19 +466,19 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l } // XUIElementFactoryRegistration -Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories() +Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories() throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getRegisteredFactories" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + return m_pConfigAccess->getFactoriesDescription(); } @@ -493,16 +493,16 @@ throw ( RuntimeException ) m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + rtl::OUString aType; rtl::OUString aName; - + WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName ); - + Reference< XMultiServiceFactory > xSManager( m_xServiceManager ); - + rtl::OUString aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); - + aLock.unlock(); if ( aServiceSpecifier.getLength() ) return Reference< XUIElementFactory >( xSManager->createInstance( aServiceSpecifier ), UNO_QUERY ); @@ -510,13 +510,13 @@ throw ( RuntimeException ) return Reference< XUIElementFactory >(); } -void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName ) +void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName ) throw ( ElementExistException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::registerFactory" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; @@ -533,7 +533,7 @@ throw ( NoSuchElementException, RuntimeException ) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::deregisterFactory" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index fb70fdb942b5..352fc1ad21f7 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uifactory/windowcontentfactorymanager.hxx> #include <uifactory/uielementfactorymanager.hxx> @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/awt/XControl.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> @@ -58,25 +58,25 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace ::com::sun::star; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowContentFactoryManager , - ::cppu::OWeakObject , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowContentFactoryManager , + ::cppu::OWeakObject , SERVICENAME_WINDOWCONTENTFACTORYMANAGER , IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER ) @@ -96,7 +96,7 @@ WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< WindowContentFactoryManager::~WindowContentFactoryManager() { ResetableGuard aLock( m_aLock ); - + // reduce reference count m_pConfigAccess->release(); } @@ -131,8 +131,8 @@ void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OU } // XSingleComponentFactory -uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithContext( - const uno::Reference< uno::XComponentContext >& /*xContext*/ ) +uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithContext( + const uno::Reference< uno::XComponentContext >& /*xContext*/ ) throw (uno::Exception, uno::RuntimeException) { /* @@ -140,10 +140,10 @@ throw (uno::Exception, uno::RuntimeException) code to get a handle to the dialog model. uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY ); - + const ::rtl::OUString sToolkitService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")); uno::Reference< awt::XToolkit > xToolkit( xServiceManager->createInstance( sToolkitService ), uno::UNO_QUERY_THROW ); - + const ::rtl::OUString sDialogModelService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialogModel")); uno::Reference< awt::XControlModel > xDialogModel( xServiceManager->createInstance( sDialogModelService ), uno::UNO_QUERY_THROW ); @@ -155,7 +155,7 @@ throw (uno::Exception, uno::RuntimeException) uno::Reference< awt::XControl > xDialogControl( xServiceManager->createInstance( sDialogService ), uno::UNO_QUERY_THROW ); xDialogControl->setModel( xDialogModel ); - + uno::Reference< awt::XWindowPeer > xWindowParentPeer( xToolkit->getDesktopWindow(), uno::UNO_QUERY ); xDialogControl->createPeer( xToolkit, xWindowParentPeer ); uno::Reference< uno::XInterface > xWindow( xDialogControl->getPeer(), uno::UNO_QUERY ); @@ -164,8 +164,8 @@ throw (uno::Exception, uno::RuntimeException) return xWindow; } -uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithArgumentsAndContext( - const uno::Sequence< uno::Any >& Arguments, const uno::Reference< uno::XComponentContext >& Context ) +uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithArgumentsAndContext( + const uno::Sequence< uno::Any >& Arguments, const uno::Reference< uno::XComponentContext >& Context ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< uno::XInterface > xWindow; @@ -185,13 +185,13 @@ throw (uno::Exception, uno::RuntimeException) } uno::Reference< frame::XModuleManager > xModuleManager; - // SAFE + // SAFE { ResetableGuard aLock( m_aLock ); xModuleManager = m_xModuleManager; } // UNSAFE - + // Determine the module identifier ::rtl::OUString aType; ::rtl::OUString aName; @@ -206,16 +206,16 @@ throw (uno::Exception, uno::RuntimeException) } RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName ); - if ( aType.getLength() > 0 && - aName.getLength() > 0 && + if ( aType.getLength() > 0 && + aName.getLength() > 0 && aModuleId.getLength() > 0 ) { ::rtl::OUString aImplementationName; uno::Reference< uno::XInterface > xHolder( static_cast<cppu::OWeakObject*>(this), uno::UNO_QUERY ); - + // Detetmine the implementation name of the window content factory dependent on the // module identifier, user interface element type and name - // SAFE + // SAFE ResetableGuard aLock( m_aLock ); if ( !m_bConfigRead ) @@ -233,7 +233,7 @@ throw (uno::Exception, uno::RuntimeException) uno::Reference< lang::XMultiServiceFactory > xServiceManager( Context->getServiceManager(), uno::UNO_QUERY ); if ( xServiceManager.is() ) { - uno::Reference< lang::XSingleComponentFactory > xFactory( + uno::Reference< lang::XSingleComponentFactory > xFactory( xServiceManager->createInstance( aImplementationName ), uno::UNO_QUERY ); if ( xFactory.is() ) { @@ -252,7 +252,7 @@ throw (uno::Exception, uno::RuntimeException) } } } - + // UNSAFE if ( !xWindow.is()) { diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml index f9274345909f..1cd72a64fa87 100644 --- a/framework/source/unotypes/fwk.xml +++ b/framework/source/unotypes/fwk.xml @@ -132,7 +132,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.ProtocolHandler </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.LayoutManager </name> @@ -144,7 +144,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.LayoutManager </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.PopupMenuControllerFactory </name> @@ -156,7 +156,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.PopupMenuControllerFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.FontMenuController </name> @@ -290,7 +290,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.ModuleManager </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.UIConfigurationManager </name> @@ -303,7 +303,7 @@ <status value="final"/> <supported-service> com.sun.star.ui.UIConfigurationManager </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier </name> @@ -391,7 +391,7 @@ <status value="final"/> <supported-service> com.sun.star.ui.ToolBarFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.ToolBarControllerFactory </name> @@ -403,7 +403,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.ToolBarControllerFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.StatusbarFactory </name> @@ -415,7 +415,7 @@ <status value="final"/> <supported-service> com.sun.star.ui.StatusbarFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.StatusbarControllerFactory </name> @@ -428,32 +428,32 @@ <supported-service> com.sun.star.frame.StatusbarControllerFactory </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> - <project-build-dependency> svtools </project-build-dependency> - <project-build-dependency> toolkit </project-build-dependency> - <project-build-dependency> sv </project-build-dependency> - <project-build-dependency> comphelper </project-build-dependency> - <project-build-dependency> unotools </project-build-dependency> - <project-build-dependency> ucbhelper </project-build-dependency> - <project-build-dependency> svl </project-build-dependency> - <project-build-dependency> sot </project-build-dependency> - - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> svt </runtime-module-dependency> - <runtime-module-dependency> svl </runtime-module-dependency> - <runtime-module-dependency> tk </runtime-module-dependency> - <runtime-module-dependency> sv </runtime-module-dependency> - <runtime-module-dependency> comphelp2 </runtime-module-dependency> - <runtime-module-dependency> utl </runtime-module-dependency> - <runtime-module-dependency> ucb </runtime-module-dependency> - <runtime-module-dependency> sot </runtime-module-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> svtools </project-build-dependency> + <project-build-dependency> toolkit </project-build-dependency> + <project-build-dependency> sv </project-build-dependency> + <project-build-dependency> comphelper </project-build-dependency> + <project-build-dependency> unotools </project-build-dependency> + <project-build-dependency> ucbhelper </project-build-dependency> + <project-build-dependency> svl </project-build-dependency> + <project-build-dependency> sot </project-build-dependency> + + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> svt </runtime-module-dependency> + <runtime-module-dependency> svl </runtime-module-dependency> + <runtime-module-dependency> tk </runtime-module-dependency> + <runtime-module-dependency> sv </runtime-module-dependency> + <runtime-module-dependency> comphelp2 </runtime-module-dependency> + <runtime-module-dependency> utl </runtime-module-dependency> + <runtime-module-dependency> ucb </runtime-module-dependency> + <runtime-module-dependency> sot </runtime-module-dependency> </module-description> diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml index f91b01c22cf8..4d652ef7b0ec 100644 --- a/framework/source/unotypes/fwl.xml +++ b/framework/source/unotypes/fwl.xml @@ -78,20 +78,20 @@ <supported-service> com.sun.star.util.PathSettings </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> comphelper </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> svl </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> comphelper </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> svl </project-build-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> comphelp2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> svl </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> comphelp2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> svl </runtime-module-dependency> </module-description> diff --git a/framework/source/unotypes/lgd.xml b/framework/source/unotypes/lgd.xml index d62a77c6c09e..278d8f97b3bc 100644 --- a/framework/source/unotypes/lgd.xml +++ b/framework/source/unotypes/lgd.xml @@ -17,18 +17,18 @@ <supported-service> com.sun.star.comp.framework.LoginDialog </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> sv </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> sv </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> sv </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> sv </runtime-module-dependency> </module-description> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 8ab3a1bc0e63..418280360bf0 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ namespace framework{ //----------------------------------------------- /* Throws a SaxException in case a wrong formated XML structure was detected. - + This macro combined the given comment with a generic way to find out the XML line (where the error occured) to format a suitable message. - + @param COMMENT - an ascii string, which describe the problem. + an ascii string, which describe the problem. */ #define THROW_PARSEEXCEPTION(COMMENT) \ { \ @@ -77,12 +77,12 @@ namespace framework{ css::uno::Any()); \ } -//----------------------------------------------- +//----------------------------------------------- // XInterface DEFINE_XINTERFACE_1(AcceleratorConfigurationReader , OWeakObject , DIRECT_INTERFACE(css::xml::sax::XDocumentHandler)) - + //----------------------------------------------- AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) : ThreadHelpBase (&Application::GetSolarMutex()) @@ -92,12 +92,12 @@ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& , m_bInsideAcceleratorItem(sal_False ) { } - + //----------------------------------------------- AcceleratorConfigurationReader::~AcceleratorConfigurationReader() { } - + //----------------------------------------------- void SAL_CALL AcceleratorConfigurationReader::startDocument() throw(css::xml::sax::SAXException, @@ -129,7 +129,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString css::uno::RuntimeException ) { EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); - + // Note: We handle "accel:item" before "accel:acceleratorlist" to perform this operation. // Because an item occures very often ... a list should occure one times only! if (eElement == E_ELEMENT_ITEM) @@ -139,10 +139,10 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString if (m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.") m_bInsideAcceleratorItem = sal_True; - - ::rtl::OUString sCommand; + + ::rtl::OUString sCommand; css::awt::KeyEvent aEvent ; - + sal_Int16 c = xAttributeList->getLength(); sal_Int16 i = 0; for (i=0; i<c; ++i) @@ -155,19 +155,19 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString case E_ATTRIBUTE_URL : sCommand = sValue.intern(); break; - + case E_ATTRIBUTE_KEYCODE : aEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sValue); break; - + case E_ATTRIBUTE_MOD_SHIFT : aEvent.Modifiers |= css::awt::KeyModifier::SHIFT; break; - + case E_ATTRIBUTE_MOD_MOD1 : aEvent.Modifiers |= css::awt::KeyModifier::MOD1; break; - + case E_ATTRIBUTE_MOD_MOD2 : aEvent.Modifiers |= css::awt::KeyModifier::MOD2; break; @@ -176,7 +176,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString aEvent.Modifiers |= css::awt::KeyModifier::MOD3; } } - + // validate command and key event. if ( (!sCommand.getLength()) || @@ -185,7 +185,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString { THROW_PARSEEXCEPTION("XML element does not describe a valid accelerator nor a valid command.") } - + // register key event + command inside cache ... // Check for already existing items there. if (!m_rContainer.hasKey(aEvent)) @@ -207,7 +207,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString LOG_WARNING("AcceleratorConfigurationReader::startElement()", U2B(sMsg.makeStringAndClear())) } #endif // ENABLE_WARNINGS - } + } if (eElement == E_ELEMENT_ACCELERATORLIST) { @@ -224,7 +224,7 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& css::uno::RuntimeException ) { EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); - + // Note: We handle "accel:item" before "accel:acceleratorlist" to perform this operation. // Because an item occures very often ... a list should occure one times only! if (eElement == E_ELEMENT_ITEM) @@ -233,7 +233,7 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& THROW_PARSEEXCEPTION("Found end element 'accel:item', but no start element.") m_bInsideAcceleratorItem = sal_False; } - + if (eElement == E_ELEMENT_ACCELERATORLIST) { if (!m_bInsideAcceleratorList) @@ -276,7 +276,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno: AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const ::rtl::OUString& sElement) { AcceleratorConfigurationReader::EXMLElement eElement; - + if (sElement.equals(NS_ELEMENT_ACCELERATORLIST)) eElement = E_ELEMENT_ACCELERATORLIST; else @@ -286,15 +286,15 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl throw css::uno::RuntimeException( DECLARE_ASCII("Unknown XML element detected!"), css::uno::Reference< css::xml::sax::XDocumentHandler >()); - - return eElement; + + return eElement; } //----------------------------------------------- AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const ::rtl::OUString& sAttribute) { AcceleratorConfigurationReader::EXMLAttribute eAttribute; - + if (sAttribute.equals(NS_ATTRIBUTE_KEYCODE)) eAttribute = E_ATTRIBUTE_KEYCODE; else @@ -316,8 +316,8 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im throw css::uno::RuntimeException( DECLARE_ASCII("Unknown XML attribute detected!"), css::uno::Reference< css::xml::sax::XDocumentHandler >()); - - return eAttribute; + + return eAttribute; } //----------------------------------------------- @@ -325,7 +325,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im { if (!m_xLocator.is()) return DECLARE_ASCII("Error during parsing XML. (No further info available ...)"); - + ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("Error during parsing XML in\nline = "); sMsg.append (m_xLocator->getLineNumber() ); diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index f08a7c324d38..f372067fa13a 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ void AcceleratorConfigurationWriter::flush() css::uno::Reference< css::xml::sax::XDocumentHandler > xCFG = m_xConfig; css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > xExtendedCFG(m_xConfig, css::uno::UNO_QUERY_THROW); - aReadLock.unlock(); + aReadLock.unlock(); // <- SAFE ---------------------------------- // prepare attribute list @@ -106,7 +106,7 @@ void AcceleratorConfigurationWriter::flush() const css::awt::KeyEvent& rKey = *pKey; const ::rtl::OUString& rCommand = m_rContainer.getCommandByKey(rKey); impl_ts_writeKeyCommandPair(rKey, rCommand, xCFG); - } + } /* TODO write key-command list std::vector< SfxAcceleratorConfigItem>::const_iterator p; diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/xml/eventsconfiguration.cxx index eb79b319844c..75a024eb8405 100644 --- a/framework/source/xml/eventsconfiguration.cxx +++ b/framework/source/xml/eventsconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -54,7 +54,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/xml/eventsdocumenthandler.cxx index 4cc61462dcfe..a1cc33b02dad 100644 --- a/framework/source/xml/eventsdocumenthandler.cxx +++ b/framework/source/xml/eventsdocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ @@ -47,7 +47,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/config.h> @@ -57,7 +57,7 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -65,40 +65,40 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; -#define XMLNS_EVENT "http://openoffice.org/2001/event" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_EVENT_PREFIX "event:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_EVENT "http://openoffice.org/2001/event" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_EVENT_PREFIX "event:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define ATTRIBUTE_XMLNS_EVENT "xmlns:event" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" +#define ATTRIBUTE_XMLNS_EVENT "xmlns:event" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define ELEMENT_EVENTS "events" -#define ELEMENT_EVENT "event" +#define ELEMENT_EVENTS "events" +#define ELEMENT_EVENT "event" -#define ATTRIBUTE_LANGUAGE "language" -#define ATTRIBUTE_LIBRARY "library" -#define ATTRIBUTE_NAME "name" -#define ATTRIBUTE_HREF "href" -#define ATTRIBUTE_TYPE "type" -#define ATTRIBUTE_MACRONAME "macro-name" +#define ATTRIBUTE_LANGUAGE "language" +#define ATTRIBUTE_LIBRARY "library" +#define ATTRIBUTE_NAME "name" +#define ATTRIBUTE_HREF "href" +#define ATTRIBUTE_TYPE "type" +#define ATTRIBUTE_MACRONAME "macro-name" -#define ELEMENT_NS_EVENTS "event:events" -#define ELEMENT_NS_EVENT "event:event" +#define ELEMENT_NS_EVENTS "event:events" +#define ELEMENT_NS_EVENT "event:event" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define EVENTS_DOCTYPE "<!DOCTYPE event:events PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"event.dtd\">" +#define EVENTS_DOCTYPE "<!DOCTYPE event:events PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"event.dtd\">" // Property names for events -#define PROP_EVENT_TYPE "EventType" -#define PROP_LIBRARY "Library" -#define PROP_SCRIPT "Script" -#define PROP_MACRO_NAME "MacroName" -#define STAR_BASIC "StarBasic" -#define JAVA_SCRIPT "JavaScript" +#define PROP_EVENT_TYPE "EventType" +#define PROP_LIBRARY "Library" +#define PROP_SCRIPT "Script" +#define PROP_MACRO_NAME "MacroName" +#define STAR_BASIC "StarBasic" +#define JAVA_SCRIPT "JavaScript" namespace framework @@ -106,20 +106,20 @@ namespace framework struct EventEntryProperty { - OReadEventsDocumentHandler::Event_XML_Namespace nNamespace; - char aEntryName[20]; + OReadEventsDocumentHandler::Event_XML_Namespace nNamespace; + char aEntryName[20]; }; static EventEntryProperty EventEntries[OReadEventsDocumentHandler::EV_XML_ENTRY_COUNT] = { - { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENTS }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENT }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LANGUAGE }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_NAME }, - { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_HREF }, - { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_TYPE }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_MACRONAME }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LIBRARY } + { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENTS }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENT }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LANGUAGE }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_NAME }, + { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_HREF }, + { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_TYPE }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_MACRONAME }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LIBRARY } }; @@ -150,9 +150,9 @@ OReadEventsDocumentHandler::OReadEventsDocumentHandler( EventsConfig& aItems ) : } } - m_bEventsStartFound = sal_False; - m_bEventsEndFound = sal_False; - m_bEventStartFound = sal_False; + m_bEventsStartFound = sal_False; + m_bEventsEndFound = sal_False; + m_bEventStartFound = sal_False; } OReadEventsDocumentHandler::~OReadEventsDocumentHandler() @@ -161,17 +161,17 @@ OReadEventsDocumentHandler::~OReadEventsDocumentHandler() // XDocumentHandler void SAL_CALL OReadEventsDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bEventsStartFound && !m_bEventsEndFound ) || - ( !m_bEventsStartFound && m_bEventsEndFound ) ) + ( !m_bEventsStartFound && m_bEventsEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'event:events' found!" )); @@ -181,7 +181,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadEventsDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -227,8 +227,8 @@ throw( SAXException, RuntimeException ) m_bEventStartFound = sal_True; - long nIndex = m_aEventItems.aEventNames.getLength(); - long nPropCount = 2; // every event config entry needs at least 2 properties + long nIndex = m_aEventItems.aEventNames.getLength(); + long nPropCount = 2; // every event config entry needs at least 2 properties Sequence< PropertyValue > aEventProperties( nPropCount ); m_aEventItems.aEventNames.realloc( nIndex + 1 ); @@ -337,7 +337,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadEventsDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -379,24 +379,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadEventsDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -420,7 +420,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteEventsDocumentHandler +// OWriteEventsDocumentHandler //_________________________________________________________________________________________________________________ OWriteEventsDocumentHandler::OWriteEventsDocumentHandler( @@ -431,10 +431,10 @@ OWriteEventsDocumentHandler::OWriteEventsDocumentHandler( m_xWriteDocumentHandler( rWriteDocumentHandler ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLEventNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT_PREFIX )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aXMLEventNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT_PREFIX )); } OWriteEventsDocumentHandler::~OWriteEventsDocumentHandler() @@ -485,7 +485,7 @@ void OWriteEventsDocumentHandler::WriteEventsDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName, const Sequence< PropertyValue >& aPropertyValues ) throw @@ -514,9 +514,9 @@ void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName, pList->AddAttribute( m_aAttributeName, m_aAttributeType, aEventName ); - sal_Bool bURLSet = sal_False; - ::rtl::OUString aValue; - ::rtl::OUString aName; + sal_Bool bURLSet = sal_False; + ::rtl::OUString aValue; + ::rtl::OUString aName; // save attributes for ( int i = 0; i < aPropertyValues.getLength(); i++ ) diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 55bcd3564bae..75517d2766dd 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <xml/saxnamespacefilter.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -54,7 +54,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index e67ec74fa691..83d42b82c539 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ @@ -47,7 +47,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> @@ -56,76 +56,76 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -#define ELEMENT_IMAGECONTAINER "imagescontainer" -#define ELEMENT_IMAGES "images" -#define ELEMENT_ENTRY "entry" -#define ELEMENT_EXTERNALIMAGES "externalimages" -#define ELEMENT_EXTERNALENTRY "externalentry" +#define ELEMENT_IMAGECONTAINER "imagescontainer" +#define ELEMENT_IMAGES "images" +#define ELEMENT_ENTRY "entry" +#define ELEMENT_EXTERNALIMAGES "externalimages" +#define ELEMENT_EXTERNALENTRY "externalentry" -#define ELEMENT_NS_IMAGESCONTAINER "image:imagescontainer" -#define ELEMENT_NS_IMAGES "image:images" -#define ELEMENT_NS_ENTRY "image:entry" -#define ELEMENT_NS_EXTERNALIMAGES "image:externalimages" -#define ELEMENT_NS_EXTERNALENTRY "image:externalentry" +#define ELEMENT_NS_IMAGESCONTAINER "image:imagescontainer" +#define ELEMENT_NS_IMAGES "image:images" +#define ELEMENT_NS_ENTRY "image:entry" +#define ELEMENT_NS_EXTERNALIMAGES "image:externalimages" +#define ELEMENT_NS_EXTERNALENTRY "image:externalentry" -#define ATTRIBUTE_HREF "href" -#define ATTRIBUTE_MASKCOLOR "maskcolor" -#define ATTRIBUTE_COMMAND "command" -#define ATTRIBUTE_BITMAPINDEX "bitmap-index" -#define ATTRIBUTE_MASKURL "maskurl" -#define ATTRIBUTE_MASKMODE "maskmode" -#define ATTRIBUTE_HIGHCONTRASTURL "highcontrasturl" -#define ATTRIBUTE_HIGHCONTRASTMASKURL "highcontrastmaskurl" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_HREF "href" +#define ATTRIBUTE_MASKCOLOR "maskcolor" +#define ATTRIBUTE_COMMAND "command" +#define ATTRIBUTE_BITMAPINDEX "bitmap-index" +#define ATTRIBUTE_MASKURL "maskurl" +#define ATTRIBUTE_MASKMODE "maskmode" +#define ATTRIBUTE_HIGHCONTRASTURL "highcontrasturl" +#define ATTRIBUTE_HIGHCONTRASTMASKURL "highcontrastmaskurl" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define ATTRIBUTE_MASKMODE_BITMAP "maskbitmap" -#define ATTRIBUTE_MASKMODE_COLOR "maskcolor" +#define ATTRIBUTE_MASKMODE_BITMAP "maskbitmap" +#define ATTRIBUTE_MASKMODE_COLOR "maskcolor" -#define ATTRIBUTE_XMLNS_IMAGE "xmlns:image" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" +#define ATTRIBUTE_XMLNS_IMAGE "xmlns:image" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" -#define ATTRIBUTE_XLINK_TYPE "xlink:type" -#define ATTRIBUTE_XLINK_TYPE_VALUE "simple" +#define ATTRIBUTE_XLINK_TYPE "xlink:type" +#define ATTRIBUTE_XLINK_TYPE_VALUE "simple" -#define XMLNS_IMAGE "http://openoffice.org/2001/image" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_IMAGE_PREFIX "image:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_IMAGE "http://openoffice.org/2001/image" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_IMAGE_PREFIX "image:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define IMAGES_DOCTYPE "<!DOCTYPE image:imagecontainer PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"image.dtd\">" +#define IMAGES_DOCTYPE "<!DOCTYPE image:imagecontainer PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"image.dtd\">" namespace framework { struct ImageXMLEntryProperty { - OReadImagesDocumentHandler::Image_XML_Namespace nNamespace; - char aEntryName[20]; + OReadImagesDocumentHandler::Image_XML_Namespace nNamespace; + char aEntryName[20]; }; ImageXMLEntryProperty ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_COUNT] = { - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGECONTAINER }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGES }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_ENTRY }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALIMAGES }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALENTRY }, - { OReadImagesDocumentHandler::IMG_NS_XLINK, ATTRIBUTE_HREF }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKCOLOR }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_COMMAND }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_BITMAPINDEX }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKURL }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKMODE }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTURL }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTMASKURL } + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGECONTAINER }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGES }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_ENTRY }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALIMAGES }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALENTRY }, + { OReadImagesDocumentHandler::IMG_NS_XLINK, ATTRIBUTE_HREF }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKCOLOR }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_COMMAND }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_BITMAPINDEX }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKURL }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKMODE }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTURL }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTMASKURL } }; @@ -135,11 +135,11 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI m_pImages( 0 ), m_pExternalImages( 0 ) { - m_aImageList.pImageList = NULL; + m_aImageList.pImageList = NULL; m_aImageList.pExternalImageList = NULL; - m_nHashMaskModeBitmap = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode(); - m_nHashMaskModeColor = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode(); + m_nHashMaskModeBitmap = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode(); + m_nHashMaskModeColor = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode(); // create hash map to speed up lookup for ( int i = 0; i < (int)IMG_XML_ENTRY_COUNT; i++ ) @@ -157,14 +157,14 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI } // reset states - m_bImageContainerStartFound = sal_False; - m_bImageContainerEndFound = sal_False; - m_bImagesStartFound = sal_False; - m_bImagesEndFound = sal_False; - m_bImageStartFound = sal_False; - m_bExternalImagesStartFound = sal_False; - m_bExternalImagesEndFound = sal_False; - m_bExternalImageStartFound = sal_False; + m_bImageContainerStartFound = sal_False; + m_bImageContainerEndFound = sal_False; + m_bImagesStartFound = sal_False; + m_bImagesEndFound = sal_False; + m_bImageStartFound = sal_False; + m_bExternalImagesStartFound = sal_False; + m_bExternalImagesEndFound = sal_False; + m_bExternalImageStartFound = sal_False; } OReadImagesDocumentHandler::~OReadImagesDocumentHandler() @@ -173,17 +173,17 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler() // XDocumentHandler void SAL_CALL OReadImagesDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bImageContainerStartFound && !m_bImageContainerEndFound ) || - ( !m_bImageContainerStartFound && m_bImageContainerEndFound ) ) + ( !m_bImageContainerStartFound && m_bImageContainerEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'image:imagecontainer' found!" )); @@ -193,7 +193,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadImagesDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -355,13 +355,13 @@ throw( SAXException, RuntimeException ) { case IMG_ATTRIBUTE_COMMAND: { - pItem->aCommandURL = xAttribs->getValueByIndex( n ); + pItem->aCommandURL = xAttribs->getValueByIndex( n ); } break; case IMG_ATTRIBUTE_BITMAPINDEX: { - pItem->nIndex = xAttribs->getValueByIndex( n ).toInt32(); + pItem->nIndex = xAttribs->getValueByIndex( n ).toInt32(); } break; @@ -470,13 +470,13 @@ throw( SAXException, RuntimeException ) { case IMG_ATTRIBUTE_COMMAND: { - pItem->aCommandURL = xAttribs->getValueByIndex( n ); + pItem->aCommandURL = xAttribs->getValueByIndex( n ); } break; case IMG_ATTRIBUTE_HREF: { - pItem->aURL = xAttribs->getValueByIndex( n ); + pItem->aURL = xAttribs->getValueByIndex( n ); } break; @@ -526,7 +526,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadImagesDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -585,24 +585,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadImagesDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -626,7 +626,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteImagesDocumentHandler +// OWriteImagesDocumentHandler //_________________________________________________________________________________________________________________ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( @@ -637,11 +637,11 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( m_xWriteDocumentHandler( rWriteDocumentHandler ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLImageNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aAttributeXlinkType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLImageNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aAttributeXlinkType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE )); m_aAttributeValueSimple = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE_VALUE )); } @@ -701,7 +701,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw @@ -738,8 +738,8 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* } else { - ::rtl::OUStringBuffer aColorStrBuffer( 8 ); - sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor(); + ::rtl::OUStringBuffer aColorStrBuffer( 8 ); + sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor(); aColorStrBuffer.appendAscii( "#" ); aColorStrBuffer.append( ::rtl::OUString::valueOf( nValue, 16 )); diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/xml/menuconfiguration.cxx index aac1751b1a14..010c96349d8c 100644 --- a/framework/source/xml/menuconfiguration.cxx +++ b/framework/source/xml/menuconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <xml/menuconfiguration.hxx> @@ -46,14 +46,14 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -79,7 +79,7 @@ BOOL MenuConfiguration::IsWindowListItemId( USHORT nId ) MenuConfiguration::MenuConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ) -: m_rxServiceManager( rServiceManager ) +: m_rxServiceManager( rServiceManager ) { } diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx index 054fbb146012..3fc5d1775be4 100644 --- a/framework/source/xml/menudocumenthandler.cxx +++ b/framework/source/xml/menudocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,14 +31,14 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <xml/menudocumenthandler.hxx> #include <xml/menuconfiguration.hxx> #include <classes/addonmenu.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> @@ -49,48 +49,48 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <rtl/logfile.hxx> #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ -#define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" +#define XMLNS_MENU "http://openoffice.org/2001/menu" +#define XMLNS_PREFIX "menu:" -#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" -#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" -#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" -#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" -#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" +#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" +#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" +#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" +#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" +#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" -#define ELEMENT_NS_MENUBAR "menu:menubar" -#define ELEMENT_NS_MENU "menu:menu" -#define ELEMENT_NS_MENUPOPUP "menu:menupopup" -#define ELEMENT_NS_MENUITEM "menu:menuitem" -#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" +#define ELEMENT_NS_MENUBAR "menu:menubar" +#define ELEMENT_NS_MENU "menu:menu" +#define ELEMENT_NS_MENUPOPUP "menu:menupopup" +#define ELEMENT_NS_MENUITEM "menu:menuitem" +#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" -#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" -#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" -#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" -#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style" +#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" +#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" +#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" +#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" +#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style" -#define ATTRIBUTE_NS_ID "menu:id" -#define ATTRIBUTE_NS_LABEL "menu:label" -#define ATTRIBUTE_NS_HELPID "menu:helpid" -#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" -#define ATTRIBUTE_NS_STYLE "menu:style" +#define ATTRIBUTE_NS_ID "menu:id" +#define ATTRIBUTE_NS_LABEL "menu:label" +#define ATTRIBUTE_NS_HELPID "menu:helpid" +#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" +#define ATTRIBUTE_NS_STYLE "menu:style" -#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" +#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" +#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" #define ATTRIBUTE_ITEMSTYLE_TEXT "text" #define ATTRIBUTE_ITEMSTYLE_IMAGE "image" @@ -113,7 +113,7 @@ static const char FILEMENU_CMD[] = ".uno:Picklist" ; static const char WINDOWMENU_CMD[] = ".uno:WindowList" ; //_________________________________________________________________________________________________________________ -// using namespaces +// using namespaces //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -213,7 +213,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { m_xLocator = xLocator; } @@ -256,7 +256,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( OReadMenuDocumentHandler::OReadMenuDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Reference< XIndexContainer >& rMenuBarContainer ) -: m_nElementDepth( 0 ), +: m_nElementDepth( 0 ), m_bMenuBarMode( sal_False ), m_xMenuBarContainer( rMenuBarContainer ), m_xContainerFactory( rMenuBarContainer, UNO_QUERY ), @@ -317,7 +317,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -353,7 +353,7 @@ OReadMenuBarHandler::OReadMenuBarHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) -: m_nElementDepth( 0 ), +: m_nElementDepth( 0 ), m_bMenuMode( sal_False ), m_xMenuBarContainer( rMenuBarContainer ), m_xContainerFactory( rFactory ), @@ -445,7 +445,7 @@ throw( SAXException, RuntimeException ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } - while ( nIndex >= 0 ); + while ( nIndex >= 0 ); } } @@ -478,7 +478,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -564,7 +564,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -680,7 +680,7 @@ throw( SAXException, RuntimeException ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } - while ( nIndex >= 0 ); + while ( nIndex >= 0 ); } } @@ -737,7 +737,7 @@ throw( SAXException, RuntimeException ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } - while ( nIndex >= 0 ); + while ( nIndex >= 0 ); } } @@ -773,7 +773,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -836,7 +836,7 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); } diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/xml/saxnamespacefilter.cxx index 2514e67b216c..a92c58547e06 100644 --- a/framework/source/xml/saxnamespacefilter.cxx +++ b/framework/source/xml/saxnamespacefilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,18 +65,18 @@ SaxNamespaceFilter::~SaxNamespaceFilter() // XDocumentHandler void SAL_CALL SaxNamespaceFilter::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException ) { } void SAL_CALL SaxNamespaceFilter::endDocument(void) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { } void SAL_CALL SaxNamespaceFilter::startElement( const rtl::OUString& rName, const Reference< XAttributeList > &xAttribs ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { XMLNamespaces aXMLNamespaces; if ( !m_aNamespaceStack.empty() ) @@ -107,8 +107,8 @@ void SAL_CALL SaxNamespaceFilter::startElement( aAttributeIndexes.begin()); i != aAttributeIndexes.end(); ++i ) { - ::rtl::OUString aAttributeName = xAttribs->getNameByIndex( *i ); - ::rtl::OUString aValue = xAttribs->getValueByIndex( *i ); + ::rtl::OUString aAttributeName = xAttribs->getNameByIndex( *i ); + ::rtl::OUString aValue = xAttribs->getValueByIndex( *i ); ::rtl::OUString aNamespaceAttributeName = aXMLNamespaces.applyNSToAttributeName( aAttributeName ); pNewList->AddAttribute( aNamespaceAttributeName, aXMLAttributeType, aValue ); } @@ -135,7 +135,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( } void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top(); ::rtl::OUString aNamespaceElementName; @@ -155,27 +155,27 @@ void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) } void SAL_CALL SaxNamespaceFilter::characters(const rtl::OUString& aChars) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { xDocumentHandler->characters( aChars ); } void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { xDocumentHandler->ignorableWhitespace( aWhitespaces ); } void SAL_CALL SaxNamespaceFilter::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { xDocumentHandler->processingInstruction( aTarget, aData ); } void SAL_CALL SaxNamespaceFilter::setDocumentLocator( const Reference< XLocator > &xLocator) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { m_xLocator = xLocator; xDocumentHandler->setDocumentLocator( xLocator ); diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/xml/statusbarconfiguration.cxx index 26853a699516..2b9d3e5baa58 100644 --- a/framework/source/xml/statusbarconfiguration.cxx +++ b/framework/source/xml/statusbarconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -42,7 +42,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -52,7 +52,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/xml/statusbardocumenthandler.cxx index d6f4caebf08a..370ca6e3f18a 100644 --- a/framework/source/xml/statusbardocumenthandler.cxx +++ b/framework/source/xml/statusbardocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ @@ -50,7 +50,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/status.hxx> @@ -58,7 +58,7 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -67,45 +67,45 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::container; -#define XMLNS_STATUSBAR "http://openoffice.org/2001/statusbar" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_STATUSBAR_PREFIX "statusbar:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_STATUSBAR "http://openoffice.org/2001/statusbar" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_STATUSBAR_PREFIX "statusbar:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define ELEMENT_STATUSBAR "statusbar" -#define ELEMENT_STATUSBARITEM "statusbaritem" +#define ELEMENT_STATUSBAR "statusbar" +#define ELEMENT_STATUSBARITEM "statusbaritem" -#define ATTRIBUTE_ALIGN "align" -#define ATTRIBUTE_STYLE "style" -#define ATTRIBUTE_URL "href" -#define ATTRIBUTE_WIDTH "width" -#define ATTRIBUTE_OFFSET "offset" -#define ATTRIBUTE_AUTOSIZE "autosize" -#define ATTRIBUTE_OWNERDRAW "ownerdraw" +#define ATTRIBUTE_ALIGN "align" +#define ATTRIBUTE_STYLE "style" +#define ATTRIBUTE_URL "href" +#define ATTRIBUTE_WIDTH "width" +#define ATTRIBUTE_OFFSET "offset" +#define ATTRIBUTE_AUTOSIZE "autosize" +#define ATTRIBUTE_OWNERDRAW "ownerdraw" #define ATTRIBUTE_HELPURL "helpid" -#define ELEMENT_NS_STATUSBAR "statusbar:statusbar" -#define ELEMENT_NS_STATUSBARITEM "statusbar:statusbaritem" +#define ELEMENT_NS_STATUSBAR "statusbar:statusbar" +#define ELEMENT_NS_STATUSBARITEM "statusbar:statusbaritem" -#define ATTRIBUTE_XMLNS_STATUSBAR "xmlns:statusbar" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" +#define ATTRIBUTE_XMLNS_STATUSBAR "xmlns:statusbar" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define ATTRIBUTE_BOOLEAN_TRUE "true" -#define ATTRIBUTE_BOOLEAN_FALSE "false" +#define ATTRIBUTE_BOOLEAN_TRUE "true" +#define ATTRIBUTE_BOOLEAN_FALSE "false" -#define ATTRIBUTE_ALIGN_LEFT "left" -#define ATTRIBUTE_ALIGN_RIGHT "right" -#define ATTRIBUTE_ALIGN_CENTER "center" +#define ATTRIBUTE_ALIGN_LEFT "left" +#define ATTRIBUTE_ALIGN_RIGHT "right" +#define ATTRIBUTE_ALIGN_CENTER "center" -#define ATTRIBUTE_STYLE_IN "in" -#define ATTRIBUTE_STYLE_OUT "out" -#define ATTRIBUTE_STYLE_FLAT "flat" +#define ATTRIBUTE_STYLE_IN "in" +#define ATTRIBUTE_STYLE_OUT "out" +#define ATTRIBUTE_STYLE_FLAT "flat" -#define STATUSBAR_DOCTYPE "<!DOCTYPE statusbar:statusbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"statusbar.dtd\">" +#define STATUSBAR_DOCTYPE "<!DOCTYPE statusbar:statusbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"statusbar.dtd\">" namespace framework { @@ -154,21 +154,21 @@ static void ExtractStatusbarItemParameters( struct StatusBarEntryProperty { - OReadStatusBarDocumentHandler::StatusBar_XML_Namespace nNamespace; - char aEntryName[20]; + OReadStatusBarDocumentHandler::StatusBar_XML_Namespace nNamespace; + char aEntryName[20]; }; StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_ENTRY_COUNT] = { - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBAR }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBARITEM }, - { OReadStatusBarDocumentHandler::SB_NS_XLINK, ATTRIBUTE_URL }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_ALIGN }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_STYLE }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_AUTOSIZE }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OWNERDRAW }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_WIDTH }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OFFSET }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBAR }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBARITEM }, + { OReadStatusBarDocumentHandler::SB_NS_XLINK, ATTRIBUTE_URL }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_ALIGN }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_STYLE }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_AUTOSIZE }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OWNERDRAW }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_WIDTH }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OFFSET }, { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_HELPURL } }; @@ -201,9 +201,9 @@ OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( } } - m_bStatusBarStartFound = sal_False; - m_bStatusBarEndFound = sal_False; - m_bStatusBarItemStartFound = sal_False; + m_bStatusBarStartFound = sal_False; + m_bStatusBarEndFound = sal_False; + m_bStatusBarItemStartFound = sal_False; } OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() @@ -212,17 +212,17 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() // XDocumentHandler void SAL_CALL OReadStatusBarDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bStatusBarStartFound && !m_bStatusBarEndFound ) || - ( !m_bStatusBarStartFound && m_bStatusBarEndFound ) ) + ( !m_bStatusBarStartFound && m_bStatusBarEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'statusbar' found!" )); @@ -232,7 +232,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadStatusBarDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -287,7 +287,7 @@ throw( SAXException, RuntimeException ) { case SB_ATTRIBUTE_URL: { - bCommandURL = sal_True; + bCommandURL = sal_True; aCommandURL = xAttribs->getValueByIndex( n ); } break; @@ -431,7 +431,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadStatusBarDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -473,24 +473,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadStatusBarDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -514,7 +514,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteStatusBarDocumentHandler +// OWriteStatusBarDocumentHandler //_________________________________________________________________________________________________________________ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( @@ -525,10 +525,10 @@ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( m_xWriteDocumentHandler( rWriteDocumentHandler ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLStatusBarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR_PREFIX )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aXMLStatusBarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR_PREFIX )); } OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler() @@ -599,7 +599,7 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteStatusBarDocumentHandler::WriteStatusBarItem( diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx index 4ed368af214f..9d1c91aa6849 100644 --- a/framework/source/xml/toolboxconfiguration.cxx +++ b/framework/source/xml/toolboxconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -42,7 +42,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -52,7 +52,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx index deea79beb2b0..acb88ef16e75 100644 --- a/framework/source/xml/toolboxdocumenthandler.cxx +++ b/framework/source/xml/toolboxdocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -40,7 +40,7 @@ #include <xml/toolboxconfigurationdefines.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/ui/ItemType.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/config.h> @@ -59,7 +59,7 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -68,7 +68,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; -#define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" +#define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" namespace framework { @@ -138,28 +138,28 @@ sal_Int32 nStyleItemEntries = sizeof( Styles ) / sizeof( Styles[ 0 ] ); struct ToolBarEntryProperty { - OReadToolBoxDocumentHandler::ToolBox_XML_Namespace nNamespace; - char aEntryName[20]; + OReadToolBoxDocumentHandler::ToolBox_XML_Namespace nNamespace; + char aEntryName[20]; }; ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_COUNT] = { - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBAR }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARITEM }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSPACE }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARBREAK }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSEPARATOR }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TEXT }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_BITMAP }, - { OReadToolBoxDocumentHandler::TB_NS_XLINK, ATTRIBUTE_URL }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMBITS }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_VISIBLE }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_WIDTH }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_USER }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_HELPID }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMSTYLE }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBAR }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARITEM }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSPACE }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARBREAK }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSEPARATOR }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TEXT }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_BITMAP }, + { OReadToolBoxDocumentHandler::TB_NS_XLINK, ATTRIBUTE_URL }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMBITS }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_VISIBLE }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_WIDTH }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_USER }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_HELPID }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMSTYLE }, { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_UINAME }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TOOLTIP }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TOOLTIP }, }; OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) : @@ -197,22 +197,22 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde } // pre-calculate a hash code for all style strings to speed up xml read process - m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); - m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); - m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); - m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); - m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); - m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); + m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); + m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); + m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); + m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); + m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); + m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode(); m_nHashCode_Style_Text = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); m_nHashCode_Style_Image = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); - m_bToolBarStartFound = sal_False; - m_bToolBarEndFound = sal_False; - m_bToolBarItemStartFound = sal_False; - m_bToolBarSpaceStartFound = sal_False; - m_bToolBarBreakStartFound = sal_False; - m_bToolBarSeparatorStartFound = sal_False; + m_bToolBarStartFound = sal_False; + m_bToolBarEndFound = sal_False; + m_bToolBarItemStartFound = sal_False; + m_bToolBarSpaceStartFound = sal_False; + m_bToolBarBreakStartFound = sal_False; + m_bToolBarSeparatorStartFound = sal_False; } OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() @@ -221,17 +221,17 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() // XDocumentHandler void SAL_CALL OReadToolBoxDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bToolBarStartFound && !m_bToolBarEndFound ) || - ( !m_bToolBarStartFound && m_bToolBarEndFound ) ) + ( !m_bToolBarStartFound && m_bToolBarEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'toolbar' found!" )); @@ -241,7 +241,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadToolBoxDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -319,7 +319,7 @@ throw( SAXException, RuntimeException ) } ::rtl::OUString aAttribute; - sal_Bool bAttributeURL = sal_False; + sal_Bool bAttributeURL = sal_False; m_bToolBarItemStartFound = sal_True; ::rtl::OUString aLabel; @@ -353,8 +353,8 @@ throw( SAXException, RuntimeException ) case TB_ATTRIBUTE_URL: { - bAttributeURL = sal_True; - aCommandURL = xAttribs->getValueByIndex( n ).intern(); + bAttributeURL = sal_True; + aCommandURL = xAttribs->getValueByIndex( n ).intern(); } break; @@ -411,7 +411,7 @@ throw( SAXException, RuntimeException ) do { - ::rtl::OUString aToken = aTemp.getToken( 0, ' ', nIndex ); + ::rtl::OUString aToken = aTemp.getToken( 0, ' ', nIndex ); if ( aToken.getLength() > 0 ) { sal_Int32 nHashCode = aToken.hashCode(); @@ -558,7 +558,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadToolBoxDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -639,24 +639,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadToolBoxDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -680,7 +680,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteToolBoxDocumentHandler +// OWriteToolBoxDocumentHandler //_________________________________________________________________________________________________________________ OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( @@ -691,10 +691,10 @@ OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( m_rItemAccess( rItemAccess ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLToolbarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR_PREFIX )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aXMLToolbarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR_PREFIX )); } OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler() @@ -785,7 +785,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( @@ -851,7 +851,7 @@ throw ( SAXException, RuntimeException ) aValue = aValue.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" ") ) ); aValue += rtl::OUString::createFromAscii( pStyle->attrName ); } - } + } pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE )), m_aAttributeType, aValue ); diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/xml/xmlnamespaces.cxx index 924fdcfef861..fbaf51613d15 100644 --- a/framework/source/xml/xmlnamespaces.cxx +++ b/framework/source/xml/xmlnamespaces.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS { // xml draft: there is no default namespace for attributes! - int index; + int index; if (( index = aName.indexOf( ':' )) > 0 ) { if ( aName.getLength() > index+1 ) @@ -130,13 +130,13 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS return aName; } -::rtl::OUString XMLNamespaces::applyNSToElementName( const ::rtl::OUString& aName ) const throw( SAXException ) +::rtl::OUString XMLNamespaces::applyNSToElementName( const ::rtl::OUString& aName ) const throw( SAXException ) { // xml draft: element names can have a default namespace - int index = aName.indexOf( ':' ); - ::rtl::OUString aNamespace; - ::rtl::OUString aElementName = aName; + int index = aName.indexOf( ':' ); + ::rtl::OUString aNamespace; + ::rtl::OUString aElementName = aName; if ( index > 0 ) aNamespace = getNamespaceValue( aName.copy( 0, index ) ); |