diff options
Diffstat (limited to 'framework/source')
220 files changed, 1736 insertions, 1959 deletions
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index d6e596d6a4..a1742b688c 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,22 +33,16 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ #include <xml/acceleratorconfigurationreader.hxx> -#endif #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HPP_ #include <com/sun/star/container/ElementExistException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include <com/sun/star/container/NoSuchElementException.hpp> -#endif //_______________________________________________ // other includes @@ -248,3 +243,5 @@ void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 88a941294a..a3ca851fc8 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,41 +59,23 @@ // other includes #include <vcl/svapp.hxx> -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include <com/sun/star/awt/KeyModifier.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_ #include <com/sun/star/util/XChangesNotifier.hpp> -#endif -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED #include <unotools/configpathes.hxx> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.hxx> -#endif #include <svtools/acceleratorexecute.hxx> @@ -103,6 +86,12 @@ namespace framework { + const ::rtl::OUString CFG_ENTRY_PRIMARY(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeys")); + const ::rtl::OUString CFG_ENTRY_SECONDARY(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeys")); + const ::rtl::OUString CFG_ENTRY_GLOBAL(RTL_CONSTASCII_USTRINGPARAM("Global")); + const ::rtl::OUString CFG_ENTRY_MODULES(RTL_CONSTASCII_USTRINGPARAM("Modules")); + const ::rtl::OUString CFG_PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command")); + #ifdef fpc #error "Who exports this define? I use it as namespace alias ..." @@ -206,13 +195,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE (aKeyEvent.Modifiers == 0) ) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")), static_cast< ::cppu::OWeakObject* >(this), 0); if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -252,7 +241,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -289,7 +278,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g const ::rtl::OUString& rCommand = lCommandList[i]; if (!rCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); @@ -318,7 +307,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 0); @@ -328,7 +317,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co 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."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")), static_cast< ::cppu::OWeakObject* >(this)); rCache.removeCommand(sCommand); @@ -359,7 +348,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() xIn = xStream->getInputStream(); if (!xIn.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for reading.")), static_cast< ::cppu::OWeakObject* >(this)); // impl_ts_load() does not clear the cache @@ -398,7 +387,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")), static_cast< ::cppu::OWeakObject* >(this)); impl_ts_save(xOut); @@ -425,7 +414,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")), static_cast< ::cppu::OWeakObject* >(this)); impl_ts_save(xOut); @@ -517,7 +506,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::u //----------------------------------------------- // IStorageListener -void XMLBasedAcceleratorConfiguration::changesOccured(const ::rtl::OUString& /*sPath*/) +void XMLBasedAcceleratorConfiguration::changesOccurred(const ::rtl::OUString& /*sPath*/) { reload(); } @@ -652,9 +641,9 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA //----------------------------------------------- ::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" ); + static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); + static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N")); + static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -777,13 +766,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE (aKeyEvent.Modifiers == 0) ) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")), static_cast< ::cppu::OWeakObject* >(this), 0); if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -900,7 +889,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -964,7 +953,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g const ::rtl::OUString& rCommand = lCommandList[i]; if (!rCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); @@ -997,7 +986,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 0); @@ -1009,7 +998,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString::createFromAscii("Command does not exists inside this container."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")), static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasCommand(sCommand)) @@ -1101,17 +1090,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R return; long nOpenModes = css::embed::ElementModes::READWRITE; - css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString::createFromAscii("accelerator"), nOpenModes); + css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("accelerator")), nOpenModes); if (!xAcceleratorTypeStorage.is()) return; - css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString::createFromAscii("current"), nOpenModes); + css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("current")), nOpenModes); css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")), static_cast< ::cppu::OWeakObject* >(this)); // the original m_aCache has been split into primay cache and secondary cache... @@ -1207,14 +1196,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() { css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY); ::rtl::OUString sConfig = xNamed->getName(); - if ( sConfig.equalsAscii("Global") ) + if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("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 ); XCUBasedAcceleratorConfiguration::reload(); } - else if ( sConfig.equalsAscii("Modules") ) + else if ( sConfig.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules")) ) { m_xCfg = css::uno::Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), @@ -1300,9 +1289,9 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const { AcceleratorCache aReadCache = AcceleratorCache(); css::uno::Reference< css::container::XNameAccess > xAccess; - if (m_sGlobalOrModules.equalsAscii("Global")) + if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Global"))) xCfg->getByName(CFG_ENTRY_GLOBAL) >>= xAccess; - else if (m_sGlobalOrModules.equalsAscii("Modules")) + else if (m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Modules"))) { css::uno::Reference< css::container::XNameAccess > xModules; xCfg->getByName(CFG_ENTRY_MODULES) >>= xModules; @@ -1310,7 +1299,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const } const ::rtl::OUString sIsoLang = impl_ts_getLocale().toISO(); - const ::rtl::OUString sDefaultLocale = ::rtl::OUString::createFromAscii("en-US"); + const ::rtl::OUString sDefaultLocale(RTL_CONSTASCII_USTRINGPARAM("en-US")); css::uno::Reference< css::container::XNameAccess > xKey; css::uno::Reference< css::container::XNameAccess > xCommand; @@ -1359,7 +1348,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const sal_Int32 nIndex = 0; ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex); - ::rtl::OUString sPrefix = ::rtl::OUString::createFromAscii("KEY_"); + ::rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("KEY_")); aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand); css::uno::Sequence< ::rtl::OUString > sToken(4); @@ -1379,11 +1368,11 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const break; } - if (sToken[k].equalsAscii("SHIFT")) + if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT; - else if (sToken[k].equalsAscii("MOD1")) + else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1; - else if (sToken[k].equalsAscii("MOD2")) + else if (sToken[k].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2; else if (sToken[k].equalsAscii("MOD3")) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3; @@ -1594,7 +1583,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr sal_Int32 nIndex = 0; sKeyIdentifier = sKey.getToken(0, '_', nIndex); - aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier); + aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_"))+sKeyIdentifier); css::uno::Sequence< ::rtl::OUString > sToken(3); const sal_Int32 nToken = 3; @@ -1604,13 +1593,13 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr break; sToken[i] = sKey.getToken(0, '_', nIndex); - if (sToken[i].equalsAscii("SHIFT")) + if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SHIFT"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::SHIFT; - else if (sToken[i].equalsAscii("MOD1")) + else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD1"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD1; - else if (sToken[i].equalsAscii("MOD2")) + else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD2"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD2; - else if (sToken[i].equalsAscii("MOD3")) + else if (sToken[i].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MOD3"))) aKeyEvent.Modifiers |= css::awt::KeyModifier::MOD3; } @@ -1694,9 +1683,9 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer //----------------------------------------------- ::comphelper::Locale XCUBasedAcceleratorConfiguration::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" ); + static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); + static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N")); + static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -1715,3 +1704,5 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx index 9ed0e11786..81466165ca 100644 --- a/framework/source/accelerators/acceleratorexecute.cxx +++ b/framework/source/accelerators/acceleratorexecute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,33 +33,19 @@ //=============================================== // includes -#ifndef __COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include <com/sun/star/frame/XModuleManager.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include <com/sun/star/awt/KeyModifier.hpp> -#endif -#ifndef __COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef __COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif //=============================================== // namespace @@ -371,7 +358,7 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid) if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# { Sequence<css::beans::PropertyValue> source; - ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString::createFromAscii("AcceleratorExecute")); + ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString(RTL_CONSTASCII_USTRINGPARAM("AcceleratorExecute"))); ::comphelper::UiEventsLogger::logDispatch(aURL, source); } xDispatch->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >()); @@ -380,3 +367,5 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid) } } // namespace svt + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx index 87c5717d65..14bc3d611a 100644 --- a/framework/source/accelerators/acceleratorexecute.hxx +++ b/framework/source/accelerators/acceleratorexecute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,29 +34,17 @@ #include <vector> -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include <com/sun/star/frame/XDispatchProvider.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#endif -#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ #include <com/sun/star/util/XURLTransformer.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif #include <vcl/keycod.hxx> #include <vcl/evntpost.hxx> #include <osl/mutex.h> @@ -253,3 +242,5 @@ class AcceleratorExecute : private TMutexInit } // namespace svt #endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 644b41b706..0ad751e9e6 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,61 +30,39 @@ #include "precompiled_framework.hxx" #include <accelerators/documentacceleratorconfiguration.hxx> -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_ #include <xml/acceleratorconfigurationreader.hxx> -#endif -#ifndef __FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_ #include <xml/acceleratorconfigurationwriter.hxx> -#endif -#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_ #include <xml/saxnamespacefilter.hxx> -#endif //_______________________________________________ // own includes #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include <acceleratorconst.h> -#endif #include <services.h> //_______________________________________________ // interface includes -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_ #include <com/sun/star/io/XSeekable.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XTRUNCATE_HPP_ #include <com/sun/star/io/XTruncate.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #include <com/sun/star/xml/sax/InputSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_ #include <com/sun/star/xml/sax/XParser.hpp> -#endif //_______________________________________________ // other includes -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include <comphelper/sequenceashashmap.hxx> -#endif //_______________________________________________ // const @@ -142,7 +121,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque ::comphelper::SequenceAsHashMap lArgs(lArguments); m_xDocumentRoot = lArgs.getUnpackedValueOrDefault( - ::rtl::OUString::createFromAscii("DocumentRoot"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")), css::uno::Reference< css::embed::XStorage >()); aWriteLock.unlock(); @@ -238,3 +217,5 @@ void DocumentAcceleratorConfiguration::impl_ts_clearCache() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index ba103a9e27..3d2c8d9bad 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,5 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index b1d00d0ef9..c5effdcb82 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,6 +155,9 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = {css::awt::Key::DECIMAL , "KEY_DECIMAL" }, {css::awt::Key::TILDE , "KEY_TILDE" }, {css::awt::Key::QUOTELEFT , "KEY_QUOTELEFT" }, + {css::awt::Key::BRACKETLEFT , "KEY_BRACKETLEFT" }, + {css::awt::Key::BRACKETRIGHT , "KEY_BRACKETRIGHT" }, + {css::awt::Key::SEMICOLON , "KEY_SEMICOLON" }, {0 , "" } // mark the end of this array! }; @@ -223,7 +227,9 @@ sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUStr // 0 is normaly an error of the called method toInt32() ... // But we must be aware, that the identifier is "0"! rCode = 0; - return sIdentifier.equalsAscii("0"); + return sIdentifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")); } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index c85cb404ff..e0ee119910 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include <acceleratorconst.h> -#endif #include <services.h> //_______________________________________________ @@ -48,26 +47,16 @@ //_______________________________________________ // other includes -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include <comphelper/sequenceashashmap.hxx> -#endif #include <vcl/svapp.hxx> -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef _COM_SUN_STAR_UTIL_XCHANGESNOTIFIER_HPP_ #include <com/sun/star/util/XChangesNotifier.hpp> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.hxx> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.h> -#endif //_______________________________________________ // const @@ -125,12 +114,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc 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")); + m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString()); + m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale")) , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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!"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The module dependend accelerator configuration service was initialized with an empty module identifier!")), static_cast< ::cppu::OWeakObject* >(this)); aWriteLock.unlock(); @@ -173,3 +162,4 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache() } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index f35d8ac84a..408833e5e1 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,41 +42,25 @@ //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_CONFIGURATION_CORRUPTEDUICONFIGURATIONEXCEPTION_HPP_ #include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include <com/sun/star/container/NoSuchElementException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif //_______________________________________________ // other includes #include <vcl/svapp.hxx> -#ifndef _RTL_USTRBUF_HXX #include <rtl/ustrbuf.hxx> -#endif //_______________________________________________ // const @@ -227,7 +212,7 @@ void PresetHandler::forgetCachedStorages() //----------------------------------------------- ::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID) { - ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error."); + ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error.")); switch(nID) { @@ -275,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // 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 += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); sShareLayer += RELPATH_SHARE_LAYER; // folder /* @@ -331,7 +316,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // 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 += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); sUserLayer += RELPATH_USER_LAYER; // storage file @@ -431,7 +416,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType { if (!xDocumentRoot.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("There is valid root storage, where the UI configuration can work on."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is valid root storage, where the UI configuration can work on.")), css::uno::Reference< css::uno::XInterface >()); m_lDocumentStorages.setRootStorage(xDocumentRoot); xShare = xDocumentRoot; @@ -935,3 +920,5 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat //----------------------------------------------- } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 48c45e8193..43051b58ba 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,37 +39,21 @@ //=============================================== // interface includes -#ifndef __COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HPP_ #include <com/sun/star/container/NoSuchElementException.hpp> -#endif -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef __COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> -#endif -#ifndef __COM_SUN_STAR_EMBED_XPACKAGESTRUCTURECREATOR_HPP_ #include <com/sun/star/embed/XPackageStructureCreator.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef __COM_SUN_STAR_IO_XSEEKABLE_HPP_ #include <com/sun/star/io/XSeekable.hpp> -#endif //=============================================== // other includes @@ -79,7 +64,7 @@ #define PATH_SEPERATOR_ASCII "/" #define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') -#define PATH_SEPERATOR ::rtl::OUString::createFromAscii(PATH_SEPERATOR_ASCII) +#define PATH_SEPERATOR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII)) //=============================================== // namespace @@ -376,7 +361,7 @@ void StorageHolder::notifyPath(const ::rtl::OUString& sPath) { IStorageListener* pListener = *pIt2; if (pListener) - pListener->changesOccured(sNormedPath); + pListener->changesOccurred(sNormedPath); } aReadLock.unlock(); @@ -635,3 +620,5 @@ OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath) //=============================================== } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx index 5533b1f32a..f45417734d 100644 --- a/framework/source/application/framework.cxx +++ b/framework/source/application/framework.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,15 +33,12 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_HELPER_OINSTANCEPROVIDER_HXX_ #include <helper/oinstanceprovider.hxx> -#endif #include <classes/servicemanager.hxx> #include <macros/debug.hxx> +#include <osl/process.h> -#ifndef __FRAMEWORK_DEFINES_HXX_ #include <defines.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,13 +54,9 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XFrames.hpp> -#ifndef _COM_SUN_STAR_CONNECTION_XConnection_HPP_ #include <com/sun/star/connection/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_BRIDGE_XBridgeFactory_HPP_ #include <com/sun/star/bridge/XBridgeFactory.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes @@ -75,14 +69,12 @@ #include <svtools/unoiface.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vos/process.hxx> //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ using namespace ::rtl ; -using namespace ::vos ; using namespace ::comphelper ; using namespace ::framework ; using namespace ::com::sun::star::uno ; @@ -174,13 +166,12 @@ void FrameWork::impl_analyzeCommandArguments() 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(); + sal_uInt32 nCount = osl_getCommandArgCount(); for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument ) { // If extraction of current argument successfull ... - if ( aInfo.getCommandArg( nArgument, sArgument ) == osl_Process_E_None ) + if ( osl_getCommandArg( nArgument, &sArgument.pData ) == osl_Process_E_None ) { // ... search for matching with supported values. if ( sArgument == COMMANDARGUMENT_PLUGIN ) @@ -226,28 +217,6 @@ void FrameWork::Main() // c) Initialize connection to possible PlugIn dll. // OPipeConnection removed, connection to plugin now uses acceptor service -#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< XBridge > xBridge = xBridgeFactory->createBridge( NAME_PLUGINBRIDGE , - PROTOCOL_PLUGINBRIDGE , - xConnection , - new OInstanceProvider( xGlobalServiceManager ) ); - } - else - { - // Error handling ... !? - LOG_ASSERT( sal_False, "FrameWork::Main()\nNo connection to plugin. Initialization of bridge failed.\n" ) - } - } -#endif //--------------------------------------------------------------------------------------------------------- // d) Initialize new task with a HTML-URL in it. @@ -284,3 +253,5 @@ void FrameWork::Main() Execute(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx index a8b7df2d74..ebaae79821 100644 --- a/framework/source/application/login.cxx +++ b/framework/source/application/login.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_ #include <services/logindialog.hxx> -#endif #include <classes/servicemanager.hxx> #include <macros/generic.hxx> #include <macros/debug.hxx> @@ -52,7 +51,7 @@ //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/event.hxx> @@ -82,7 +81,6 @@ //_________________________________________________________________________________________________________________ using namespace ::rtl ; -using namespace ::vos ; using namespace ::comphelper ; using namespace ::framework ; using namespace ::com::sun::star::uno ; @@ -251,12 +249,10 @@ void LoginApplication::Main() //***************************************************************************************************************** void LoginApplication::impl_parseCommandline() { - // Use vos::OStartupInfo for access to command line. // Step over all arguments, search for supported ones and try to get his values. // Set it on our member. Caller of this method must control setted values. - OStartupInfo aInfo; - sal_uInt32 nCount = aInfo.getCommandArgCount() ; + sal_uInt32 nCount = osl_getCommandArgCount(); sal_uInt32 nArgument = 0 ; OUString sArgument ; OUString sValue ; @@ -273,7 +269,7 @@ void LoginApplication::impl_parseCommandline() { // .. but work with valid ones only! // Don't check values here. Caller of this method must decide between wrong and allowed values! - aInfo.getCommandArg( nArgument, sArgument ); + osl_getCommandArg( nArgument, &sArgument.pData ); //_____________________________________________________________________________________________________ // Look for "-f=<temp. file name>" @@ -296,3 +292,5 @@ void LoginApplication::impl_parseCommandline() // Warn programmer. LOG_ASSERT( !(m_nParentHandle==0), "Login.exe\nYou should give me a parent window handle!\n" ) } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index 1223b05ff5..e80b12df51 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -252,3 +253,4 @@ void DropTargetListener::implts_OpenFile( const String& rFilePath ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 3b48c71505..90be4cfab4 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,23 +33,17 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_FRAMECONTAINER_HXX_ #include <classes/framecontainer.hxx> -#endif #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> -#ifndef __FRAMEWORK_COMMANDS_HXX_ #include <commands.h> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -416,3 +411,5 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildren } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index d385344284..48c9158f27 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,12 +50,11 @@ #include <vcl/image.hxx> #include <vcl/msgbox.hxx> -const ::rtl::OUString SERVICENAME_WINPROVIDER - = ::rtl::OUString::createFromAscii("com.sun.star.awt.ContainerWindowProvider"); -const ::rtl::OUString EXTERNAL_EVENT = ::rtl::OUString::createFromAscii("external_event"); -const ::rtl::OUString BACK_METHOD = ::rtl::OUString::createFromAscii("back"); -const ::rtl::OUString INITIALIZE_METHOD = ::rtl::OUString::createFromAscii("initialize"); -const ::rtl::OUString OK_METHOD = ::rtl::OUString::createFromAscii("ok"); +const ::rtl::OUString SERVICENAME_WINPROVIDER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.ContainerWindowProvider")); +const ::rtl::OUString EXTERNAL_EVENT(RTL_CONSTASCII_USTRINGPARAM("external_event")); +const ::rtl::OUString BACK_METHOD(RTL_CONSTASCII_USTRINGPARAM("back")); +const ::rtl::OUString INITIALIZE_METHOD(RTL_CONSTASCII_USTRINGPARAM("initialize")); +const ::rtl::OUString OK_METHOD(RTL_CONSTASCII_USTRINGPARAM("ok")); using namespace ::com::sun::star; @@ -352,17 +352,17 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea beans::NamedValue aValue = rProperties[i]; ::rtl::OUString sName = aValue.Name; - if ( sName.equalsAscii("Title") ) + if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) ) aValue.Value >>= sTitle; - else if ( sName.equalsAscii("ToolTip") ) + else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ToolTip")) ) aValue.Value >>= sToolTip; - else if ( sName.equalsAscii("PageURL") ) + else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PageURL")) ) aValue.Value >>= sPageURL; - else if ( sName.equalsAscii("EventHdl") ) + else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EventHdl")) ) aValue.Value >>= xEventHdl; - else if ( sName.equalsAscii("Image") ) + else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Image")) ) aValue.Value >>= xImage; - else if ( sName.equalsAscii("Disabled") ) + else if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Disabled")) ) aValue.Value >>= bDisabled; } @@ -410,3 +410,4 @@ void FwkTabWindow::Resize() } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 0dbc626fad..99e6b6e8ff 100755..100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include "classes/fwlresid.hxx" #include <tools/string.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/strbuf.hxx> @@ -47,7 +48,7 @@ ResMgr* FwlResId::GetResManager() rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } @@ -63,3 +64,4 @@ FwlResId::FwlResId( USHORT nId ) : } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index e8c1abd303..59e9316901 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,14 +68,12 @@ #include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> @@ -84,7 +83,6 @@ //_________________________________________________________________________________________________________________ using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; @@ -121,18 +119,18 @@ namespace framework #define SFX_REFERER_USER "private:user" -const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" )); -const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" )); +#define aSlotNewDocDirect "slot:5537" +#define aSlotAutoPilot "slot:6381" -const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); -const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); -const ::rtl::OUString aSlotSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5510" )); -const ::rtl::OUString aSlotSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5610" )); -const ::rtl::OUString aSlotSpecialToolsMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:6677" )); +#define aSpecialFileMenu "file" +#define aSpecialWindowMenu "window" +#define aSlotSpecialFileMenu "slot:5510" +#define aSlotSpecialWindowMenu "slot:5610" +#define aSlotSpecialToolsMenu "slot:6677" // special uno commands for picklist and window list -const ::rtl::OUString aSpecialFileCommand( RTL_CONSTASCII_USTRINGPARAM( "PickList" )); -const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( "WindowList" )); +#define aSpecialFileCommand "PickList" +#define aSpecialWindowCommand "WindowList" const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); @@ -154,13 +152,10 @@ MenuManager::MenuManager( 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(); sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); -#if 0 - ::std::vector< USHORT > aQueryLabelItemIdVector; -#endif + USHORT nItemCount = pMenu->GetItemCount(); m_aMenuItemHandlerVector.reserve(nItemCount); @@ -184,14 +179,10 @@ MenuManager::MenuManager( { // #110897# // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren ); -#if 0 - if ( pMenu->GetItemText( nItemId ).Len() == 0 ) - aQueryLabelItemIdVector.push_back( nItemId ); -#endif // Create addon popup menu if there exist elements and this is the tools popup menu if (( nItemId == SID_ADDONLIST || - aItemCommand == aSlotSpecialToolsMenu ) && + aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) ) && AddonMenuManager::HasAddonMenuElements() ) { USHORT nCount = 0; @@ -215,14 +206,10 @@ MenuManager::MenuManager( // #110897# // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False ); AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False); -#if 0 - if ( pMenu->GetItemText( nItemId ).Len() == 0 ) - aQueryLabelItemIdVector.push_back( nItemId ); -#endif // Set image for the addon popup menu item if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage ); } @@ -235,7 +222,7 @@ MenuManager::MenuManager( else { if ( nItemId == SID_NEWDOCDIRECT || - aItemCommand == aSlotNewDocDirect ) + aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotNewDocDirect)) ) { // #110897# // Reference< ::com::sun::star::lang::XMultiServiceFactory > aMultiServiceFactory(::comphelper::getProcessServiceFactory()); @@ -254,13 +241,13 @@ MenuManager::MenuManager( if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } } else if ( nItemId == SID_AUTOPILOTMENU || - aItemCommand == aSlotAutoPilot ) + aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotAutoPilot)) ) { // #110897# // Reference< ::com::sun::star::lang::XMultiServiceFactory > aMultiServiceFactory(::comphelper::getProcessServiceFactory()); @@ -279,7 +266,7 @@ MenuManager::MenuManager( if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -300,14 +287,14 @@ MenuManager::MenuManager( if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 ) { // Retrieve image id from menu attributes - aImage = GetImageFromURL( rFrame, aImageId, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( rFrame, aImageId, FALSE ); } if ( !aImage ) { - aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !aImage ) - aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast ); + aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE ); } if ( !!aImage ) @@ -315,7 +302,7 @@ MenuManager::MenuManager( } else if ( !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -323,37 +310,13 @@ MenuManager::MenuManager( REFERENCE< XDISPATCH > aXDispatchRef; m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef )); -#if 0 - if ( pMenu->GetItemText( nItemId ).Len() == 0 ) - aQueryLabelItemIdVector.push_back( nItemId ); -#endif + } } } - // retrieve label information for all menu items without item text -#if 0 - if ( aQueryLabelItemIdVector.size() > 0 ) - { - Sequence< ::rtl::OUString > aURLSequence( aQueryLabelItemIdVector.size() ); - Sequence< ::rtl::OUString > aLabelSequence( aQueryLabelItemIdVector.size() ); - - sal_uInt32 nPos = 0; - ::std::vector< USHORT >::iterator p; - for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ ) - aURLSequence[nPos++] = pMenu->GetItemCommand( *p ); - Reference< XDispatchInformationProvider > xDIP( xFrame, UNO_QUERY ); - if ( xDIP.is() ) - { - nPos = 0; - xDIP->queryDispatchInformations( aURLSequence, aLabelSequence ); - for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ ) - pMenu->SetItemText( *p, aLabelSequence( nPos++ )); - } - } -#endif SetHdl(); } @@ -430,7 +393,7 @@ void MenuManager::SetHdl() MenuManager::~MenuManager() { std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; pItemHandler->xMenuItemDispatch.clear(); @@ -449,7 +412,7 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( USHORT nItemId ) ResetableGuard aGuard( m_aLock ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; if ( pItemHandler->nItemId == nItemId ) @@ -470,7 +433,7 @@ throw ( RuntimeException ) ResetableGuard aGuard( m_aLock ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler->aMenuItemURL == aFeatureURL ) @@ -483,7 +446,7 @@ throw ( RuntimeException ) if ( pStatusChangedMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { ResetableGuard aGuard( m_aLock ); @@ -537,7 +500,7 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly) // #110897# std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; if ( pItemHandler->xMenuItemDispatch.is() ) @@ -578,7 +541,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM ResetableGuard aGuard( m_aLock ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler->xMenuItemDispatch == Source.Source ) @@ -653,7 +616,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) static const ::rtl::OUString s_sDefault(RTL_CONSTASCII_USTRINGPARAM("_default")); // query for dispatcher std::vector< MenuItemHandler* >::iterator p; - for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); p++ ) + for ( p = aNewPickVector.begin(); p != aNewPickVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; @@ -914,24 +877,21 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) aCommand = aCommand.copy( UNO_COMMAND.getLength() ); } - if ( m_aMenuItemCommand == aSpecialFileMenu || - m_aMenuItemCommand == aSlotSpecialFileMenu || - aCommand == aSpecialFileCommand ) + if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialFileMenu)) || + m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialFileMenu)) || + aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialFileCommand)) ) UpdateSpecialFileMenu( pMenu ); - else if ( m_aMenuItemCommand == aSpecialWindowMenu || - m_aMenuItemCommand == aSlotSpecialWindowMenu || - aCommand == aSpecialWindowCommand ) + else if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) || + m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialWindowMenu)) || + aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) ) UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock ); // Check if some modes have changed so we have to update our menu images - sal_Bool bIsHiContrast = rSettings.GetHighContrastMode(); - - if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages ) + if ( bShowMenuImages != m_bShowMenuImages ) { // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; m_bShowMenuImages = bShowMenuImages; - FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); + FillMenuImages( m_xFrame, pMenu, bShowMenuImages ); } if ( m_bInitialized ) @@ -947,7 +907,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( xDispatchProvider.is() ) { std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler && @@ -1127,7 +1087,7 @@ USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu, } return nItemId; } -void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages) +void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bShowMenuImages) { AddonsOptions aAddonOptions; @@ -1155,7 +1115,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B if ( aImageId.getLength() > 0 ) { - Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast ); + Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE ); if ( !!aImage ) { bImageSet = sal_True; @@ -1166,7 +1126,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B if ( !bImageSet ) { rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId ); - Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast ); + Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE ); if ( !aImage ) aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast ); @@ -1179,3 +1139,5 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 702fb431f5..f45664481d 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -131,8 +131,6 @@ String STR_STATUSBAR_LOGOTEXT // License Dialog // *********************************************************************** #define LICENSE_DIALOG_WIDTH 260 -//#define LICENSE_DIALOG_HEIGTH 185 -//#define LICENSE_DIALOG_HEIGTH 190 #define LICENSE_RIGHT_BORDER 7 #define LICENSE_BOTTOM_BORDER 0 #define LICENSE_ROW_1 (7) @@ -297,7 +295,7 @@ String STR_FULL_DISC_MSG String STR_RESTORE_TOOLBARS { - Text [ en-US ] = "~Reset" ; + Text [ en-US ] = "~Reset" ; }; String STR_CORRUPT_UICFG_SHARE @@ -326,10 +324,17 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES Text [ en-US ] = "Multiple Languages" ; Text [ x-comment ] = " "; }; + 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 ] = " "; }; String STR_RESET_TO_DEFAULT_LANGUAGE { @@ -338,21 +343,24 @@ String STR_RESET_TO_DEFAULT_LANGUAGE }; 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/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index cdf19a25a8..b41f897381 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,9 +105,9 @@ TaskCreator::~TaskCreator() css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName , sal_Bool bVisible ) { - static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.Office.TabBrowse"); - static ::rtl::OUString RELPATH = ::rtl::OUString::createFromAscii("TaskCreatorService" ); - static ::rtl::OUString KEY = ::rtl::OUString::createFromAscii("ImplementationName" ); + static ::rtl::OUString PACKAGE(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.TabBrowse")); + static ::rtl::OUString RELPATH(RTL_CONSTASCII_USTRINGPARAM("TaskCreatorService")); + static ::rtl::OUString KEY(RTL_CONSTASCII_USTRINGPARAM("ImplementationName")); /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -169,3 +170,5 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl:: } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx index 75f77c6261..f2b0d7c80e 100644 --- a/framework/source/constant/containerquery.cxx +++ b/framework/source/constant/containerquery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_ #include <constant/containerquery.hxx> -#endif namespace framework{ namespace constant{ @@ -40,3 +39,5 @@ const sal_Unicode ContainerQuery::SEPERATOR_VALUE = (sal_Unicode)'='; } // namespace constant } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx index 22565cc652..e51033a80a 100644 --- a/framework/source/constant/contenthandler.cxx +++ b/framework/source/constant/contenthandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_ #include <constant/contenthandler.hxx> -#endif namespace framework{ namespace constant{ @@ -40,3 +39,5 @@ const ::rtl::OUString ContentHandler::PROP_TYPES = ::rtl::OUString(RTL_CONSTA } // namespace constant } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx index b42c1b082a..6be4411e00 100644 --- a/framework/source/constant/frameloader.cxx +++ b/framework/source/constant/frameloader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include <constant/frameloader.hxx> -#endif namespace framework{ namespace constant{ @@ -40,3 +39,5 @@ const ::rtl::OUString FrameLoader::PROP_TYPES = ::rtl::OUString(RTL_CONSTASCII_ } // namespace constant } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 69fff06f86..a5cbf9f76f 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -237,7 +238,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& sal_Bool bIsSynchron = sal_False; for (sal_Int32 nArgs=0; nArgs<lArguments.getLength(); nArgs++ ) { - if ( lArguments[nArgs].Name.equalsAscii("SynchronMode") ) + if ( lArguments[nArgs].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SynchronMode")) ) { lArguments[nArgs].Value >>= bIsSynchron; break; @@ -629,7 +630,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig // Attention ! Checking Window->GetParent() isnt the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( - ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( (pWindow ) && @@ -651,3 +652,5 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 5f7cd37076..ed995f9d70 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -172,7 +173,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide 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! + CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_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); @@ -188,3 +189,5 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index e97ada73c2..2b4a73da96 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -225,7 +226,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Disp ::sal_Bool lcl_isStartModuleDispatch (const css::util::URL& aURL) { - return (aURL.Complete.equals(CMD_UNO_SHOWSTARTMODULE)); + return (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_UNO_SHOWSTARTMODULE))); } //_________________________________________________________________________________________________________________ @@ -476,8 +477,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { // There exist a hard coded interception for special URLs. if ( - (aURL.Complete.equalsAscii(".uno:CloseDoc" )) || - (aURL.Complete.equalsAscii(".uno:CloseWin" )) + (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseDoc"))) || + (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseWin"))) ) { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); @@ -493,7 +494,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame else xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame ); } - else if (aURL.Complete.equalsAscii(".uno:CloseFrame")) + else if (aURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:CloseFrame"))) xDispatcher = implts_getOrCreateDispatchHelper( E_CLOSEDISPATCHER, xFrame ); if ( ! xDispatcher.is()) @@ -793,3 +794,5 @@ sal_Bool DispatchProvider::implts_isLoadableContent( const css::util::URL& aURL } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx index 3ae47562da..ceb29cce50 100644 --- a/framework/source/dispatch/helpagentdispatcher.cxx +++ b/framework/source/dispatch/helpagentdispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,7 +229,7 @@ void HelpAgentDispatcher::implts_acceptCurrentURL() // show the right help content // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; Help* pHelp = Application::GetHelp(); if (pHelp) pHelp->Start(sAcceptedURL, NULL); @@ -265,7 +266,7 @@ void HelpAgentDispatcher::implts_stopTimer() // 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. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; if (! m_aTimer.IsActive()) return; m_aTimer.Stop(); @@ -280,7 +281,7 @@ void HelpAgentDispatcher::implts_startTimer() // 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. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; if (m_aTimer.IsActive()) return; } @@ -301,7 +302,7 @@ void HelpAgentDispatcher::implts_startTimer() // 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. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; m_aTimer.SetTimeout(nTime*1000); // sec => ms ! m_aTimer.Start(); } @@ -410,7 +411,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent ::svt::HelpAgentWindow* pAgentWindow = 0; // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; // create the agent window Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); @@ -430,7 +431,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; // establish callback for our internal used timer. // Note: Its only active, if the timer will be started ... m_aTimer.SetTimeoutHdl(LINK(this, HelpAgentDispatcher, implts_timerExpired)); @@ -442,3 +443,4 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 2688aaf0ef..6688320446 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ //_______________________________________________ // my own includes -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> -#endif //_______________________________________________ // interface includes @@ -173,7 +172,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: else { aInfo.lURLPattern.realloc(1); - aInfo.lURLPattern[0] = ::rtl::OUString::createFromAscii("*"); + aInfo.lURLPattern[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); } // SAFE { @@ -340,3 +339,5 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 51787d1920..bc9ef64651 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,5 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 4064179e58..023b9c02dd 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -309,7 +310,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& @param xListener reference to a valid listener for state events @param aURL - URL about listener will be informed, if something occured + URL about listener will be informed, if something occurred @modified 30.04.2002 14:49, as96863 */ @@ -328,3 +329,5 @@ void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 50a9e4dbaf..0a4576211e 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ #include <vcl/svapp.hxx> #include <tools/resmgr.hxx> #include <tools/rcid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <rtl/logfile.hxx> @@ -83,10 +84,7 @@ 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 ::rtl::OUString; //_________________________________________________________________________________________________________________ // non exported const //_________________________________________________________________________________________________________________ @@ -210,7 +208,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro { uno::Reference< ::com::sun::star::awt::XWindow >xContainerWindow = xFrame->getContainerWindow(); - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -306,7 +304,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR Window* pWindow = NULL; // Use SolarMutex for threadsafe code too! - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; { pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -385,7 +383,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) return 0; css::util::URL aURL; - aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseWin"); + aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); css::uno::Reference< css::util::XURLTransformer > xTrans ( m_xFactory->createInstance( SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY ); if( xTrans.is() ) @@ -486,3 +484,5 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_removeStatusListener( const u #endif // #ifdef ENABLE_ASSERTIONS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 0a46de752a..45456d1e53 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,33 +32,19 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_DISPATCH_OXT_HANDLER_HXX_ #include <dispatch/oxt_handler.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ #include <threadhelp/transactionguard.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include <threadhelp/writeguard.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ #include <threadhelp/readguard.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include <macros/debug.hxx> -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include <services.h> -#endif -#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_ #include <comphelper/mediadescriptor.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -71,13 +58,9 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include <comphelper/sequenceashashmap.hxx> -#endif -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif //_________________________________________________________________________________________________________________ // namespace @@ -286,7 +269,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& // I think we can the following ones: // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) - sTypeName = ::rtl::OUString::createFromAscii("oxt_OpenOffice_Extension"); + sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxt_OpenOffice_Extension")); aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; aDescriptor >> lDescriptor; } @@ -296,3 +279,5 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index f28017116f..0a165a45dc 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +27,6 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -//#include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ // my own includes @@ -58,7 +58,7 @@ //_________________________________________________________________________________________________________________ #include <ucbhelper/content.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> @@ -79,7 +79,6 @@ using namespace ::com::sun::star::util ; using namespace ::cppu ; using namespace ::osl ; using namespace ::rtl ; -using namespace ::vos ; //_________________________________________________________________________________________________________________ // non exported const @@ -419,3 +418,5 @@ void PopupMenuDispatcher::impl_CreateUriRefFactory() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index e26ade6d70..60f796e54d 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -330,7 +331,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con @param xListener reference to a valid listener for state events @param aURL - URL about listener will be informed, if something occured + URL about listener will be informed, if something occurred @modified 30.04.2002 14:49, as96863 */ @@ -349,3 +350,5 @@ void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< c } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index ed36e354f7..cff5dacb31 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -239,3 +240,5 @@ void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Referenc } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index ce3288edf2..f6dbbaf24e 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,3 +233,5 @@ void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 3baeb1ab9c..f452041339 100755..100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/cmdevt.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <rtl/logfile.hxx> @@ -64,8 +65,8 @@ namespace css = ::com::sun::star; //_______________________________________________ // declarations -const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES = ::rtl::OUString::createFromAscii(".uno:OptionsTreeDialog"); -const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX = ::rtl::OUString::createFromAscii(".uno:About"); +const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES(RTL_CONSTASCII_USTRINGPARAM(".uno:OptionsTreeDialog")); +const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX(RTL_CONSTASCII_USTRINGPARAM(".uno:About")); //----------------------------------------------- WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , @@ -105,15 +106,15 @@ void WindowCommandDispatch::impl_startListening() return; // SYNCHRONIZED -> - ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - - Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - if ( ! pWindow) - return; + { + SolarMutexGuard aSolarLock; - pWindow->AddEventListener( LINK(this, WindowCommandDispatch, impl_notifyCommand) ); + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); + if ( ! pWindow) + return; - aSolarLock.clear(); + pWindow->AddEventListener( LINK(this, WindowCommandDispatch, impl_notifyCommand) ); + } // <- SYNCHRONIZED } @@ -189,3 +190,5 @@ void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 6152ab5f09..b4e054105e 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,4 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() thro } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index d921b07bc4..d25ef7ad61 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -478,3 +479,4 @@ throw( IllegalArgumentException ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index aea4934f20..c6c349cc82 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -347,3 +348,4 @@ throw( IllegalArgumentException ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 12fc1a6d75..eae17f4a6b 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -454,3 +455,4 @@ sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 86a31825d6..a0764f8f51 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -268,7 +269,7 @@ class AddonsOptions_Impl : public ConfigItem 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; + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const; @@ -291,13 +292,9 @@ class AddonsOptions_Impl : public ConfigItem { Image aImageSmall; Image aImageBig; - Image aImageSmallHC; - Image aImageBigHC; Image aImageSmallNoScale; Image aImageBigNoScale; - Image aImageSmallHCNoScale; - Image aImageBigHCNoScale; }; typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager; @@ -365,15 +362,15 @@ class AddonsOptions_Impl : public ConfigItem ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName ); sal_Int32 m_nRootAddonPopupMenuId; - ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX]; - ::rtl::OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES]; - ::rtl::OUString m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR]; - ::rtl::OUString m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR]; - ::rtl::OUString m_aEmpty; - ::rtl::OUString m_aPathDelimiter; - ::rtl::OUString m_aSeparator; - ::rtl::OUString m_aRootAddonPopupMenuURLPrexfix; - ::rtl::OUString m_aPrivateImageURL; + ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX]; + ::rtl::OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES]; + ::rtl::OUString m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR]; + ::rtl::OUString m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR]; + ::rtl::OUString m_aEmpty; + ::rtl::OUString m_aPathDelimiter; + ::rtl::OUString m_aSeparator; + ::rtl::OUString m_aRootAddonPopupMenuURLPrexfix; + ::rtl::OUString m_aPrivateImageURL; Sequence< Sequence< PropertyValue > > m_aCachedMenuProperties; Sequence< Sequence< PropertyValue > > m_aCachedMenuBarPartProperties; AddonToolBars m_aCachedToolBarPartProperties; @@ -606,27 +603,17 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions( //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const +Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { Image aImage; ImageManager::const_iterator pIter = m_aImageManager.find( aURL ); if ( pIter != m_aImageManager.end() ) { - if ( !bHiContrast ) - { - if ( bNoScale ) - aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale ); - if ( !aImage ) - aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall ); - } - else - { - if ( bNoScale ) - aImage = ( bBig ? pIter->second.aImageBigHCNoScale : pIter->second.aImageSmallHCNoScale ); - if ( !aImage ) - aImage = ( bBig ? pIter->second.aImageBigHC : pIter->second.aImageSmallHC ); - } + if ( bNoScale ) + aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale ); + if ( !aImage ) + aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall ); } return aImage; @@ -1405,8 +1392,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU //***************************************************************************************************************** void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId ) { - const int MAX_NUM_IMAGES = 4; - const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26", "_16h", "_26h" }; + const int MAX_NUM_IMAGES = 2; + const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26" }; const char* pBmpExt = ".bmp"; if ( aImageId.getLength() == 0 ) @@ -1441,14 +1428,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co aImageEntry.aImageBig = aImage; aImageEntry.aImageBigNoScale = aImageNoScale; break; - case 2: - aImageEntry.aImageSmallHC = aImage; - aImageEntry.aImageSmallHCNoScale = aImageNoScale; - break; - case 3: - aImageEntry.aImageBigHC = aImage; - aImageEntry.aImageBigHCNoScale = aImageNoScale; - break; } } } @@ -1481,8 +1460,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: if (( aPropertyData[i] >>= aImageDataSeq ) && aImageDataSeq.getLength() > 0 && ( CreateImageFromSequence( aImage, - (( i == OFFSET_IMAGES_BIG ) || - ( i == OFFSET_IMAGES_BIGHC )), + ( i == OFFSET_IMAGES_BIG ), aImageDataSeq )) ) { if ( !pEntry ) @@ -1492,10 +1470,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: pEntry->aImageSmall = aImage; else if ( i == OFFSET_IMAGES_BIG ) pEntry->aImageBig = aImage; - else if ( i == OFFSET_IMAGES_SMALLHC ) - pEntry->aImageSmallHC = aImage; - else - pEntry->aImageBigHC = aImage; } } else @@ -1522,21 +1496,11 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: pEntry->aImageSmall = aImage; pEntry->aImageSmallNoScale = aImageNoScale; } - else if ( i == OFFSET_IMAGES_BIG_URL && !pEntry->aImageBig ) + else if ( !pEntry->aImageBig ) { pEntry->aImageBig = aImage; pEntry->aImageBigNoScale = aImageNoScale; } - else if ( i == OFFSET_IMAGES_SMALLHC_URL && !pEntry->aImageSmallHC ) - { - pEntry->aImageSmallHC = aImage; - pEntry->aImageSmallHCNoScale = aImageNoScale; - } - else if ( !pEntry->aImageBigHC ) - { - pEntry->aImageBigHC = aImage; - pEntry->aImageBigHCNoScale = aImageNoScale; - } } } } @@ -1805,18 +1769,18 @@ bool AddonsOptions::GetMergeToolbarInstructions( //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const +Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->GetImageFromURL( aURL, bBig, bHiContrast, bNoScale ); + return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale ); } //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const +Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const { - return GetImageFromURL( aURL, bBig, bHiContrast, sal_False ); + return GetImageFromURL( aURL, bBig, sal_False ); } //***************************************************************************************************************** @@ -1856,3 +1820,4 @@ IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 307040b814..140756dc61 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,9 +47,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/DateTime.hpp> @@ -172,8 +171,6 @@ void BmkMenu::Initialize() ::rtl::OUString aTargetFrame; ::rtl::OUString aImageId; - BOOL bIsHiContrastMode = rSettings.GetHighContrastMode(); - UINT32 i, nCount = aDynamicMenuEntries.getLength(); for ( i = 0; i < nCount; ++i ) { @@ -193,7 +190,7 @@ void BmkMenu::Initialize() { if ( aImageId.getLength() > 0 ) { - Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrastMode ); + Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE ); if ( !!aImage ) { bImageSet = sal_True; @@ -203,7 +200,7 @@ void BmkMenu::Initialize() if ( !bImageSet ) { - Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE, bIsHiContrastMode ); + Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE ); if ( !aImage ) InsertItem( nId, aTitle ); else @@ -213,8 +210,6 @@ void BmkMenu::Initialize() else InsertItem( nId, aTitle ); - // Store values from configuration to the New and Wizard menu entries to enable - // sfx2 based code to support high contrast mode correctly! MenuConfiguration::Attributes* pUserAttributes = new MenuConfiguration::Attributes( aTargetFrame, aImageId ); SetUserValue( nId, (ULONG)pUserAttributes ); @@ -252,3 +247,4 @@ void GetMenuEntry } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 987cf376b0..fc10061afa 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -300,3 +301,5 @@ void FrameListAnalyzer::impl_analyze() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index 43e03b6759..6db48363ab 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include "classes/fwkresid.hxx" #include <tools/string.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/strbuf.hxx> @@ -47,7 +48,7 @@ ResMgr* FwkResId::GetResManager() rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } @@ -63,3 +64,4 @@ FwkResId::FwkResId( USHORT nId ) : } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index b348e0cb90..ce9a7fbcec 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,7 +70,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() // XBitmap com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); Size aBitmapSize( aBitmapEx.GetSizePixel() ); @@ -79,7 +80,7 @@ com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeExcept Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SvMemoryStream aMem; aMem << m_aImage.GetBitmapEx().GetBitmap(); @@ -88,7 +89,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); if ( aBmpEx.IsAlpha() ) @@ -118,3 +119,4 @@ sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIden } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx index 03a022945b..5abb009c40 100644 --- a/framework/source/fwe/classes/menuextensionsupplier.cxx +++ b/framework/source/fwe/classes/menuextensionsupplier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ MenuExtensionItem SAL_CALL GetMenuExtension() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 0975c08481..dfc39f1bca 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,7 +212,7 @@ throw ( RuntimeException ) { if ( m_pMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; return m_pMenu->GetItemCount(); } else @@ -247,7 +248,7 @@ throw (::com::sun::star::uno::RuntimeException) { if ( m_pMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; return ( m_pMenu->GetItemCount() > 0 ); } @@ -377,3 +378,4 @@ void RootActionTriggerContainer::setName( const ::rtl::OUString& ) throw ( Runti } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index b08947bc91..c2ee347daa 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,8 @@ #include <tools/diagnose_ex.h> +#include <tools/diagnose_ex.h> + static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL; static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL; static pfunc_getRefreshToolbars pRefreshToolbars = NULL; @@ -177,3 +180,19 @@ void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com:: } } + +void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ) +{ + pfunc_activateToolPanel pActivator = NULL; + { + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + pActivator = pActivateToolPanel; + } + + ENSURE_OR_RETURN_VOID( pActivator, "framework::ActivateToolPanel: no activator function!" ); + (*pActivator)( i_rFrame, i_rPanelURL ); +} + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx index edd9bbd374..ff98aec8ad 100644 --- a/framework/source/fwe/helper/acceleratorinfo.cxx +++ b/framework/source/fwe/helper/acceleratorinfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ KeyCode SAL_CALL GetKeyCodeFromCommandURL( ::com::sun::star::uno::Reference< ::c } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index bb698f2ca3..786c889008 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/stream.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> @@ -45,7 +46,6 @@ const USHORT START_ITEMID = 1000; using namespace rtl; -using namespace vos; using namespace com::sun::star::awt; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -115,9 +115,6 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta if ( xIndexAccess.is() ) { 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++ ) @@ -130,7 +127,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta if ( IsSeparator( xPropSet )) { // Separator - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pSubMenu->InsertSeparator(); } else @@ -146,7 +143,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta USHORT nNewItemId = nItemId++; GetMenuItemAttributes( xPropSet, aLabel, aCommandURL, aHelpURL, xBitmap, xSubContainer ); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; { // insert new menu item sal_Int32 nIndex = aCommandURL.indexOf( aSlotURL ); @@ -213,7 +210,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta } else aImage = Image( aBitmap ); - + if ( !!aImage ) pSubMenu->SetItemImage( nNewItemId, aImage ); } @@ -221,7 +218,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta else { // Support add-on images for context menu interceptors - Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, bHiContrast, sal_True ); + Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, sal_True ); if ( !!aImage ) pSubMenu->SetItemImage( nNewItemId, aImage ); } @@ -335,7 +332,7 @@ Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XInd void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexContainer >& rActionTriggerContainer ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { @@ -396,7 +393,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, @@ -406,3 +403,5 @@ Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFr } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index 818e149226..0db457de4c 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index 7c85ff5e50..5755717e61 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,10 +48,11 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ) { if ( _pGetImageFunc ) - return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast ); + return _pGetImageFunc( rFrame, aURL, bBig ); else return Image(); } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 4f8eec9c2f..d38aefcef8 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,6 @@ #define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" using namespace rtl; -using namespace vos; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::container; @@ -194,3 +194,5 @@ sal_Bool SAL_CALL PropertySetContainer::hasElements() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 7ad0b7dd09..d92730d00e 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,12 +57,6 @@ namespace framework{ namespace css = ::com::sun::star; -//_______________________________________________ -// definitions - -static const ::rtl::OUString ERRMSG_INVALID_COMPONENT_PARAM = ::rtl::OUString::createFromAscii("NULL as component reference not allowed."); -static const ::rtl::OUString ERRMSG_INVALID_NUMBER_PARAM = ::rtl::OUString::createFromAscii("Special valkud INVALID_NUMBER not allowed as input parameter."); - //----------------------------------------------- TitleHelper::TitleHelper(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ::cppu::BaseMutex () @@ -517,7 +512,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_appendProductName (sTitle); impl_appendModuleName (sTitle); impl_appendProductExtension (sTitle); - //impl_appendEvalVersion (sTitle); impl_appendDebugVersion (sTitle); // SYNCHRONIZED -> @@ -628,32 +622,6 @@ void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer&) } #endif -//***************************************************************************************************************** -void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& /*sTitle*/) -{ - // SYNCHRONIZED -> - // ::osl::ResettableMutexGuard aLock(m_aMutex); - // css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR ; - //aLock.clear (); - //// <- SYNCHRONIZED - - //css::uno::Reference< css::beans::XMaterialHolder > xHolder( - // xSMGR->createInstance(SERVICENAME_TABREG), - // css::uno::UNO_QUERY); - - // if ( ! xHolder.is()) - // return; - - // ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial()); - //const ::rtl::OUString sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString()); - - //if (sEvalTitle.getLength()) - //{ - // sTitle.appendAscii (" " ); - // sTitle.append (sEvalTitle); - //} -} - //----------------------------------------------- void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel) { @@ -758,3 +726,5 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx index b982c3ea59..47738d021e 100644 --- a/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/fwe/helper/uiconfigelementwrapperbase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -569,3 +570,5 @@ Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (Runti } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/uielementwrapperbase.cxx b/framework/source/fwe/helper/uielementwrapperbase.cxx index 4d4d2e4fdb..9977eceaf9 100644 --- a/framework/source/fwe/helper/uielementwrapperbase.cxx +++ b/framework/source/fwe/helper/uielementwrapperbase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,9 +137,9 @@ throw ( Exception, RuntimeException ) PropertyValue aPropValue; if ( aArguments[n] >>= aPropValue ) { - if ( aPropValue.Name.equalsAscii( "ResourceURL" )) + if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) )) aPropValue.Value >>= m_aResourceURL; - else if ( aPropValue.Name.equalsAscii( "Frame" )) + else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) { Reference< XFrame > xFrame; aPropValue.Value >>= xFrame; @@ -280,3 +281,5 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 01f38cce44..a07d892102 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,7 +57,7 @@ namespace css = ::com::sun::star; // exported const //_________________________________________________________________________________________________________________ -#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler") +#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler")) //_________________________________________________________________________________________________________________ // exported definitions @@ -292,3 +293,5 @@ sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type& } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx index 3c9b57ba50..9d6e45a533 100644 --- a/framework/source/fwe/xml/eventsconfiguration.cxx +++ b/framework/source/fwe/xml/eventsconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <xml/eventsdocumenthandler.hxx> #include <services.h> -#ifndef __FRAMEWORK_XML_SAXNAMESPACEFILTER_HXX_ #include <xml/saxnamespacefilter.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -47,9 +46,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> @@ -163,3 +160,4 @@ sal_Bool EventsConfiguration::StoreEventsConfig( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx index 32625b1bda..f143ae2271 100644 --- a/framework/source/fwe/xml/eventsdocumenthandler.cxx +++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,9 +44,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes @@ -551,3 +550,4 @@ void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName, } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/imagesconfiguration.cxx b/framework/source/fwe/xml/imagesconfiguration.cxx index 846cac222b..083c4e7a93 100644 --- a/framework/source/fwe/xml/imagesconfiguration.cxx +++ b/framework/source/fwe/xml/imagesconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <framework/imagesconfiguration.hxx> #include <services.h> -#ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_ #include <xml/imagesdocumenthandler.hxx> -#endif #include <xml/saxnamespacefilter.hxx> //_________________________________________________________________________________________________________________ @@ -47,9 +46,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> @@ -236,3 +233,4 @@ sal_Bool ImagesConfiguration::StoreImages( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/imagesdocumenthandler.cxx b/framework/source/fwe/xml/imagesdocumenthandler.cxx index e67ec74fa6..54c14ed2f2 100644 --- a/framework/source/fwe/xml/imagesdocumenthandler.cxx +++ b/framework/source/fwe/xml/imagesdocumenthandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,9 +43,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes @@ -849,3 +848,4 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index ea428f7096..eb743528ef 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -185,3 +186,4 @@ throw ( WrappedTargetException ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index e3a1508ff4..2922791b07 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,18 +30,12 @@ #include "precompiled_framework.hxx" #include <stdio.h> +#include <sal/macros.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ #include <xml/menudocumenthandler.hxx> #include <framework/menuconfiguration.hxx> #include <framework/addonmenu.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/ui/ItemType.hpp> @@ -48,16 +43,10 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <rtl/logfile.hxx> #include <comphelper/attributelist.hxx> -//_________________________________________________________________________________________________________________ -// defines -//_________________________________________________________________________________________________________________ #define XMLNS_MENU "http://openoffice.org/2001/menu" #define XMLNS_PREFIX "menu:" @@ -1020,3 +1009,4 @@ void OWriteMenuDocumentHandler::WriteMenuSeparator() } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index 2514e67b21..a44524eb74 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,4 @@ void SAL_CALL SaxNamespaceFilter::setDocumentLocator( } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 8f653f9f89..57c0500160 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,9 +46,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> @@ -164,3 +163,4 @@ sal_Bool StatusBarConfiguration::StoreStatusBar( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index d6f4caebf0..a8df628758 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,9 +43,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -696,3 +695,4 @@ throw ( SAXException, RuntimeException ) } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 26e4fbe118..871d377d64 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,9 +46,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> @@ -154,3 +153,4 @@ sal_Bool ToolBoxConfiguration::StoreToolBox( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index deea79beb2..afa802c69f 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,28 +31,18 @@ #include <stdio.h> -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - #include <threadhelp/resetableguard.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <macros/debug.hxx> #include <xml/toolboxconfigurationdefines.hxx> -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ - #include <sal/config.h> +#include <sal/macros.h> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <rtl/ustrbuf.hxx> @@ -899,3 +890,4 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index 924fdcfef8..e39eaebfd2 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,7 +116,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS if ( aName.getLength() > index+1 ) { ::rtl::OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) ); - aAttributeName += ::rtl::OUString::createFromAscii( "^" ); + aAttributeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^")); aAttributeName += aName.copy( index+1 ); return aAttributeName; } @@ -146,7 +147,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS if ( aNamespace.getLength() > 0 ) { aElementName = aNamespace; - aElementName += ::rtl::OUString::createFromAscii( "^" ); + aElementName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^")); } else return aName; @@ -189,3 +190,4 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx index 72fdb5d333..b1b64c5aac 100644 --- a/framework/source/fwi/classes/converter.cxx +++ b/framework/source/fwi/classes/converter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -314,3 +315,5 @@ DateTime Converter::convert_String2DateTime( /*IN*/ const ::rtl::OUString& sSour } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index 7f05c15c1d..20fc1b487b 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -448,3 +449,5 @@ sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const ::rtl::OUString& sN } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index c516c2ae8a..9c2d6a657e 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -359,3 +360,5 @@ void HandlerCFGAccess::Commit() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx index d1a74b16e8..24169dcd05 100644 --- a/framework/source/fwi/helper/networkdomain.cxx +++ b/framework/source/fwi/helper/networkdomain.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -293,3 +294,5 @@ rtl::OUString NetworkDomain::GetNTDomainName() #endif } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx index bdc5f131aa..42ffe201f1 100644 --- a/framework/source/fwi/helper/shareablemutex.cxx +++ b/framework/source/fwi/helper/shareablemutex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ void ShareableMutex::release() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 39ee0f9b66..99409263b4 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -240,3 +241,5 @@ const css::uno::Reference< css::uno::XInterface >& ConfigAccess::cfg() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx index 4b895c60ca..72127aa58d 100644 --- a/framework/source/fwi/jobs/jobconst.cxx +++ b/framework/source/fwi/jobs/jobconst.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,20 +56,22 @@ namespace framework{ const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB() { - static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("Deactivate"); + static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); return PROP; } const ::rtl::OUString JobConst::ANSWER_SAVE_ARGUMENTS() { - static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SaveArguments"); + static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments")); return PROP; } const ::rtl::OUString JobConst::ANSWER_SEND_DISPATCHRESULT() { - static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SendDispatchResult"); + static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult")); return PROP; } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index c69906dacc..c18e9d56b5 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,6 +37,7 @@ #include <macros/debug.hxx> #include <macros/generic.hxx> +#include "vcl/solarmutex.hxx" //_________________________________________________________________________________________________________________ // interface includes @@ -44,7 +46,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <vos/process.hxx> +#include <osl/process.h> //_________________________________________________________________________________________________________________ // namespace @@ -76,7 +78,7 @@ namespace framework{ @onerror - *//*-*************************************************************************************************************/ -LockHelper::LockHelper( ::vos::IMutex* pSolarMutex ) +LockHelper::LockHelper( ::osl::SolarMutex* pSolarMutex ) : m_pFairRWLock ( NULL ) , m_pOwnMutex ( NULL ) , m_pSolarMutex ( NULL ) @@ -92,17 +94,17 @@ LockHelper::LockHelper( ::vos::IMutex* pSolarMutex ) } break; case E_SOLARMUTEX : { - if( pSolarMutex == NULL ) - { - m_pSolarMutex = new ::vos::OMutex; - m_bDummySolarMutex = sal_True; - } - else - { - m_pSolarMutex = pSolarMutex; - } - } - break; + if( pSolarMutex == NULL ) + { + m_pSolarMutex = new ::vcl::SolarMutexObject; + m_bDummySolarMutex = sal_True; + } + else + { + m_pSolarMutex = pSolarMutex; + } + } + break; case E_FAIRRWLOCK : { m_pFairRWLock = new FairRWLock; } @@ -147,7 +149,7 @@ LockHelper::~LockHelper() { if (m_bDummySolarMutex) { - delete static_cast<vos::OMutex*>(m_pSolarMutex); + delete static_cast<vcl::SolarMutexObject*>(m_pSolarMutex); m_bDummySolarMutex = sal_False; } m_pSolarMutex = NULL; @@ -432,7 +434,7 @@ void LockHelper::downgradeWriteAccess() @onerror No error should occure. *//*-*************************************************************************************************************/ -LockHelper& LockHelper::getGlobalLock( ::vos::IMutex* pSolarMutex ) +LockHelper& LockHelper::getGlobalLock( ::osl::SolarMutex* pSolarMutex ) { // Initialize static "member" only for one time! // Algorithm: @@ -531,9 +533,9 @@ ELockType& LockHelper::implts_getLockType() { static ELockType eType = FALLBACK_LOCKTYPE; - ::vos::OStartupInfo aEnvironment; + ::rtl::OUString aEnvVar( ENVVAR_LOCKTYPE ); ::rtl::OUString sValue ; - if( aEnvironment.getEnvironment( ENVVAR_LOCKTYPE, sValue ) == ::vos::OStartupInfo::E_None ) + if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None ) { eType = (ELockType)(sValue.toInt32()); } @@ -547,3 +549,5 @@ ELockType& LockHelper::implts_getLockType() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index df0bdb3d5c..8d61b28b31 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -372,3 +373,5 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 979c6085bd..0b99dbd9f6 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,7 +220,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" )) + if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -256,7 +257,7 @@ void ConstItemContainer::copyItemContainer( const std::vector< Sequence< Propert Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" )) + if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -477,3 +478,4 @@ Reference < XPropertySetInfo > ConstItemContainer::createPropertySetInfo( } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index d1358e54a4..9b6c20c3e0 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,7 +82,7 @@ ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" )) + if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -117,7 +118,7 @@ void ItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValu Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" )) + if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -264,3 +265,4 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index eeeb621613..75a308b906 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,13 +33,9 @@ //_________________________________________________________________________________________________________________ #include <uielement/rootitemcontainer.hxx> -#ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HHX_ #include <uielement/itemcontainer.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HHX_ #include <uielement/constitemcontainer.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include <general.h> #include <properties.h> @@ -148,7 +145,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" )) + if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -185,7 +182,7 @@ void RootItemContainer::copyItemContainer( const std::vector< Sequence< Property Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAscii( "ItemDescriptorContainer" )) + if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -464,3 +461,4 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemC } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 06f5129545..a1e07773f7 100755 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,6 @@ using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::uno ; using namespace ::cppu ; using namespace ::osl ; -using namespace ::rtl ; //_________________________________________________________________________________________________________________ // non exported const @@ -185,3 +185,5 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 0089ee015c..d1e7933e9e 100755 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <helper/ocomponentaccess.hxx> #include <helper/ocomponentenumeration.hxx> -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -260,3 +259,5 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const #endif // #ifdef ENABLE_ASSERTIONS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 715a24f9a8..1d1fd29300 100755 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ //_________________________________________________________________________________________________________________ #include <helper/ocomponentenumeration.hxx> -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -235,3 +234,5 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj #endif // #ifdef ENABLE_ASSERTIONS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index a17d6d7ed7..fe38cfdd9f 100755 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ //_________________________________________________________________________________________________________________ #include <helper/oframes.hxx> -#ifndef _FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -60,9 +59,9 @@ 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 rtl::OUString; //_________________________________________________________________________________________________________________ // non exported const @@ -303,7 +302,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce sal_uInt32 nCount = m_pFrameContainer->getCount(); if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount )) - throw IndexOutOfBoundsException( OUString::createFromAscii( "OFrames::getByIndex - Index out of bounds" ), + throw IndexOutOfBoundsException( OUString(RTL_CONSTASCII_USTRINGPARAM("OFrames::getByIndex - Index out of bounds")), (OWeakObject *)this ); // Set default return value. @@ -522,3 +521,5 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) #endif // #ifdef ENABLE_ASSERTIONS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 23a638ea4e..86ff6383ea 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,9 +44,7 @@ //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/frame/XModuleManager.hpp> @@ -56,9 +55,7 @@ #include <vcl/window.hxx> #include <vcl/syswin.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -231,9 +228,9 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); + ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/")); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); - ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); + ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes")); try { @@ -261,9 +258,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); + ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/")); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); - ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); + ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes")); try { @@ -284,12 +281,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()); - + SolarMutexGuard aSolarGuard; + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if ( @@ -303,14 +300,12 @@ 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 , @@ -323,30 +318,30 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere return; // SOLAR SAFE -> ------------------------ - ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + SolarMutexGuard aSolarGuard; + 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 ------------------------ } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 9e2c1e7946..70ccbde379 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -150,3 +151,5 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index ecfe81a034..67a767bdcf 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,9 +45,7 @@ // interface includes #include <com/sun/star/awt/Rectangle.hpp> -#ifndef _COM_SUN_STAR_AWT_XCONTROLS_HPP_ #include <com/sun/star/awt/XControl.hpp> -#endif #include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/awt/PosSize.hpp> @@ -56,9 +55,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif //----------------------------------------------- // includes of other projects @@ -66,7 +63,7 @@ #include <comphelper/mediadescriptor.hxx> #include <comphelper/configurationhelper.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //----------------------------------------------- // namespace @@ -77,7 +74,7 @@ namespace framework{ // definitions sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling -static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar"); +static ::rtl::OUString PROGRESS_RESOURCE(RTL_CONSTASCII_USTRINGPARAM("private:resource/progressbar/progressbar")); //----------------------------------------------- DEFINE_XINTERFACE_5(StatusIndicatorFactory , @@ -431,7 +428,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() // is visible too. impl_showProgress(); - ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( pWindow ) { @@ -652,3 +649,5 @@ void StatusIndicatorFactory::impl_stopWakeUpThread() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index b59730fc66..50f7420740 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,9 +44,7 @@ //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/FrameAction.hpp> @@ -54,9 +53,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <vcl/svapp.hxx> @@ -137,21 +134,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()); - + SolarMutexGuard aSolarGuard; + 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,8 +156,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent pWindow->SetExtendedStyle(WB_EXT_DOCMODIFIED); else pWindow->SetExtendedStyle( ! WB_EXT_DOCMODIFIED); - - aSolarGuard.clear(); // <- SYNCHRONIZED } @@ -254,3 +249,5 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index e2250f3faa..6c69423be7 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,113 +29,65 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ #include <helper/titlebarupdate.hxx> -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_ #include <pattern/window.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include <threadhelp/writeguard.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ #include <threadhelp/readguard.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ #include <macros/generic.hxx> -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include <services.h> -#endif -#ifndef __FRAMEWORK_PROPETIES_H_ #include <properties.h> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include <com/sun/star/frame/XModuleManager.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XMATERIALHOLDER_HPP_ #include <com/sun/star/beans/XMaterialHolder.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_ #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_ #include <com/sun/star/beans/NamedValue.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX #include <comphelper/sequenceashashmap.hxx> -#endif -#ifndef _UTL_CONFIGMGR_HXX #include <unotools/configmgr.hxx> -#endif -#ifndef _UTL_BOOTSTRAP_HXX #include <unotools/bootstrap.hxx> -#endif -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _SV_SYSWIN_HXX #include <vcl/syswin.hxx> -#endif -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _SV_WRKWIN_HXX #include <vcl/wrkwin.hxx> -#endif //_________________________________________________________________________________________________________________ // namespace @@ -246,6 +199,89 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) // nothing todo here - because we hold the frame as weak reference only } +//http://live.gnome.org/GnomeShell/ApplicationBased +//See http://msdn.microsoft.com/en-us/library/dd378459(v=VS.85).aspx for future +//Windows 7 equivalent support +void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::frame::XFrame >& xFrame) +{ + css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow (); + if ( ! xWindow.is() ) + return; + + ::rtl::OUString sApplicationID; + try + { + ::rtl::OUString aProductName; + ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= aProductName; + + // SYNCHRONIZED -> + ReadGuard aReadLock(m_aLock); + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; + aReadLock.unlock(); + // <- SYNCHRONIZED + + 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); + + rtl::OUString aModuleId = xModuleManager->identify(xFrame); + rtl::OUString sDesktopName; + + if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer")); + else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc")); + else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationDocument")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress")); + else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocument")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw")); + else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.formula.FormulaProperties")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math")); + else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) || + aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base")); + else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.StartModule")) ) + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter")); + else + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter")); + sApplicationID = aProductName.toAsciiLowerCase(); + sApplicationID += ::rtl::OUString(sal_Unicode('-')); + sApplicationID += sDesktopName; + } + catch(const css::uno::Exception&) + { + } + + // VCL SYNCHRONIZED -> + SolarMutexGuard aSolarGuard; + + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); + if ( + ( pWindow ) && + ( pWindow->GetType() == WINDOW_WORKWINDOW ) + ) + { + WorkWindow* pWorkWindow = (WorkWindow*)pWindow; +#ifdef COPY_TO_TITLE_FOR_DEBUG + pWorkWindow->SetText( sApplicationID ); +#endif + pWorkWindow->SetApplicationID( sApplicationID ); + } + // <- VCL SYNCHRONIZED +} + + //***************************************************************************************************************** ::sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ) @@ -307,6 +343,9 @@ void TitleBarUpdate::impl_forceUpdate() impl_updateIcon (xFrame); impl_updateTitle (xFrame); +#if defined(UNX) && !defined(MACOSX) + impl_updateApplicationID (xFrame); +#endif } //***************************************************************************************************************** @@ -332,7 +371,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra { try { - xSet->getPropertyValue( CONTROLLER_PROPNAME_ICONID ) >>= nIcon; + xSet->getPropertyValue( DECLARE_ASCII("IconId") ) >>= nIcon; } catch(const css::uno::Exception&) {} @@ -355,10 +394,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() ); - + SolarMutexGuard aSolarGuard; + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); if ( ( pWindow ) && @@ -367,15 +406,13 @@ 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() ) aURL = xModel->getURL(); pWorkWindow->SetRepresentedURL( aURL ); } - - aSolarLock.clear(); // <- VCL SYNCHRONIZED } @@ -386,7 +423,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; @@ -394,8 +431,8 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr const ::rtl::OUString sTitle = xTitle->getTitle (); // VCL SYNCHRONIZED -> - ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() ); - + SolarMutexGuard aSolarGuard; + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); if ( ( pWindow ) && @@ -405,9 +442,9 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr WorkWindow* pWorkWindow = (WorkWindow*)pWindow; pWorkWindow->SetText( sTitle ); } - - aSolarLock.clear(); // <- VCL SYNCHRONIZED } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 40f278d148..fba62336c4 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,9 +41,7 @@ //----------------------------------------------- // includes of external modules -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/svapp.hxx> //----------------------------------------------- @@ -66,17 +65,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!"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant work without a parent window!")), static_cast< css::task::XStatusIndicator* >(this)); } - + //----------------------------------------------- -VCLStatusIndicator::~VCLStatusIndicator() +VCLStatusIndicator::~VCLStatusIndicator() { } @@ -90,28 +89,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(); + { + SolarMutexGuard aSolarGuard; + + 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(); + } // <- SOLAR SAFE ---------------------------- - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_sText = sText; @@ -120,22 +119,21 @@ void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText , aWriteLock.unlock(); // <- SAFE ---------------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::reset() throw(css::uno::RuntimeException) { // SOLAR SAFE -> ---------------------------- - ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; if (m_pStatusBar) { m_pStatusBar->SetProgressValue(0); m_pStatusBar->SetText(String()); } - aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException) @@ -147,21 +145,22 @@ 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; + SolarMutexGuard aSolarGuard; + 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,30 +170,31 @@ 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) - m_pStatusBar->SetText(sText); - aSolarLock.clear(); + { + SolarMutexGuard aSolarGuard; + if (m_pStatusBar) + m_pStatusBar->SetText(sText); + } // <- 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,15 +202,16 @@ 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) - m_pStatusBar->SetProgressValue(nPercent); - aSolarLock.clear(); + { + SolarMutexGuard aSolarGuard; + if (m_pStatusBar) + m_pStatusBar->SetProgressValue(nPercent); + } // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , Window* pParentWindow) @@ -220,12 +221,14 @@ void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , (!pParentWindow) ) return; - + Size aParentSize = pParentWindow->GetSizePixel(); pStatusBar->SetPosSizePixel(0, 0, aParentSize.Width(), aParentSize.Height()); } - + } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 8682dcd2ed..817b19593b 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ void SAL_CALL WakeUpThread::onTerminated() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 2462ce455f..286b74e8fc 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,9 +39,7 @@ //__________________________________________ // interface includes -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif //__________________________________________ // other includes @@ -185,3 +184,5 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 8fa0902b2d..3f45d1076d 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,13 +76,13 @@ 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"); +extern const ::rtl::OUString CFG_ENTRY_PRIMARY; +extern const ::rtl::OUString CFG_ENTRY_SECONDARY; -static const ::rtl::OUString CFG_ENTRY_GLOBAL = ::rtl::OUString::createFromAscii("Global"); -static const ::rtl::OUString CFG_ENTRY_MODULES = ::rtl::OUString::createFromAscii("Modules"); +extern const ::rtl::OUString CFG_ENTRY_GLOBAL; +extern const ::rtl::OUString CFG_ENTRY_MODULES; -static const ::rtl::OUString CFG_PROP_COMMAND = ::rtl::OUString::createFromAscii("Command"); +extern const ::rtl::OUString CFG_PROP_COMMAND; /** "global" type to make accelerator presets unique, so they can be used in combination with the salhelper::SingletonRef mechanism! */ @@ -219,7 +220,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase throw(css::uno::RuntimeException); // IStorageListener - virtual void changesOccured(const ::rtl::OUString& sPath); + virtual void changesOccurred(const ::rtl::OUString& sPath); //______________________________________ // helper for derived classes @@ -474,3 +475,5 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx index 3fe8022154..ff36543a1c 100644 --- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index 05515770ae..e83eaeeaf9 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,18 +35,14 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> -#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ -#include <macros/interface.hxx> -#endif +#include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> //__________________________________________ // interface includes -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif //__________________________________________ // other includes @@ -107,3 +104,5 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index c11076efcd..5b86638cd3 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,9 +57,11 @@ class IStorageListener //-------------------------------------- /** @short TODO */ - virtual void changesOccured(const ::rtl::OUString& sPath) = 0; + virtual void changesOccurred(const ::rtl::OUString& sPath) = 0; }; } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 2a58e7fa61..42148068b1 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -160,3 +161,5 @@ class KeyMapping } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index de1a652c69..5f073f8e36 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> -#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ -#include <macros/interface.hxx> -#endif +#include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> @@ -113,3 +112,5 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 7131011827..2786b7a1ce 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,13 +40,9 @@ //__________________________________________ // interface includes -#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //__________________________________________ // other includes @@ -533,3 +530,5 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index b604d880d6..c85f915b98 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,13 +40,9 @@ //=============================================== // interface includes -#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //=============================================== // other includes @@ -259,3 +256,5 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas } // namespace framework #endif // __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx index c2307d5877..fd433dc57a 100644 --- a/framework/source/inc/constant/containerquery.hxx +++ b/framework/source/inc/constant/containerquery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ struct ContainerQuery } // namespace framework #endif // #ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx index ed6c92854c..786ab2d8b7 100644 --- a/framework/source/inc/constant/contenthandler.hxx +++ b/framework/source/inc/constant/contenthandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ struct ContentHandler } // namespace framework #endif // #ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx index 85beec93e3..c8f1a3587c 100644 --- a/framework/source/inc/constant/frameloader.hxx +++ b/framework/source/inc/constant/frameloader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ class FrameLoader } // namespace framework #endif // #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index b0619fb114..b9e297d950 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -159,3 +160,5 @@ class LoadDispatcher : private ThreadHelpBase } // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx index 18ddb050ec..73d854f807 100644 --- a/framework/source/inc/dispatch/uieventloghelper.hxx +++ b/framework/source/inc/dispatch/uieventloghelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace framework } #endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 2479e4f19a..bd308fb618 100755..100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,7 +97,7 @@ 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 + /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; //___________________________________________ @@ -172,3 +173,5 @@ class WindowCommandDispatch : private ThreadHelpBase } // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_MACDISPATCH_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index ff41f0f584..c491ab54a6 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,3 +208,5 @@ class ActionLockGuard : private ThreadHelpBase } // namespace framework #endif // __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 60c3c317e0..c673bb646b 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,13 +45,9 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URL.hpp> -#ifndef _COM_SUN_STAR_LANG_IllegalArgumentException_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_IOException_HPP_ #include <com/sun/star/io/IOException.hpp> -#endif //_______________________________________________ // includes of an other project @@ -702,3 +699,5 @@ class LoadEnv : private ThreadHelpBase } // namespace framework #endif // __FRAMEWORK_LOADENV_LOADENV_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index 8af58d4c89..ee666d0d02 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,7 +58,7 @@ namespace css = ::com::sun::star; load environment only. @descr Of course outside code must wrapp it, to transport - the occured information to its caller. + the occurred information to its caller. @author as96863 */ @@ -132,7 +133,7 @@ class LoadEnvException /** @short An ID, which make this exception unique among others. */ sal_Int32 m_nID; - /** @short Contains the original exception, if any occured. */ + /** @short Contains the original exception, if any occurred. */ css::uno::Any m_exOriginal; /** TODO @@ -195,3 +196,5 @@ class LoadEnvException } // namespace framework #endif // __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 7fb01a7fd0..cb8d45413d 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ class TargetHelper } // namespace framework #endif // #ifndef __FRAMEWORK_TARGETHELPER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index b2de45fef2..3b1d4d2b75 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,9 +40,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -120,8 +119,6 @@ class ConfigurationHelper const ::rtl::OUString& sRelPath , sal_Int32 nOpenFlags) { - static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/"); - css::uno::Reference< css::uno::XInterface > xCFG; try @@ -131,7 +128,7 @@ class ConfigurationHelper ::rtl::OUStringBuffer sPath(1024); sPath.append(sPackage ); - sPath.append(PATH_SEPERATOR); + sPath.append(static_cast<sal_Unicode>('/')); sPath.append(sRelPath ); sal_Bool bReadOnly = ((nOpenFlags & ConfigurationHelper::E_READONLY ) == ConfigurationHelper::E_READONLY ); @@ -144,13 +141,13 @@ class ConfigurationHelper css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString::createFromAscii("nodepath"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; if (bAllLocales) { - aParam.Name = ::rtl::OUString::createFromAscii("*"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); aParam.Value <<= sal_True; lParams[1] <<= aParam; } @@ -174,3 +171,5 @@ class ConfigurationHelper } // namespace framework #endif // __FRAMEWORK_PATTERN_CONFIGURATION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 1cced6e7b4..2f1d7da860 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso } // namespace framework #endif // __FRAMEWORK_PATTERN_FRAME_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx index d654bb3572..68bf9daf60 100644 --- a/framework/source/inc/pattern/storages.hxx +++ b/framework/source/inc/pattern/storages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const } // namespace framework #endif // __FRAMEWORK_PATTERN_STORAGES_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 49d6ddbb5e..d2e277909d 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,14 +42,12 @@ //_______________________________________________ // other includes -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ustring.hxx> //_______________________________________________ @@ -73,20 +72,20 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind if (!xWindow.is()) return ::rtl::OUString(); - // 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! - if (pWindow!=NULL && pWindow->IsSystemWindow()) + // SOLAR SAFE -> ---------------------------- { - ULONG nMask = WINDOWSTATE_MASK_ALL; - nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); - sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask); + SolarMutexGuard aSolarGuard; + + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); + // check for system window is neccessary to guarantee correct pointer cast! + if (pWindow!=NULL && pWindow->IsSystemWindow()) + { + ULONG nMask = WINDOWSTATE_MASK_ALL; + nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); + sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask); + } } - - aSolarGuard.clear(); // <- SOLAR SAFE ---------------------------- return B2U_ENC(sWindowState,RTL_TEXTENCODING_UTF8); @@ -103,8 +102,8 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind return; // SOLAR SAFE -> ---------------------------- - ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + SolarMutexGuard aSolarGuard; + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if ( @@ -116,11 +115,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 ---------------------------- } @@ -136,7 +134,7 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW // Attention ! Checking Window->GetParent() isnt the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( - ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( (pWindow ) && @@ -153,3 +151,5 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW } // namespace framework #endif // __FRAMEWORK_PATTERN_WINDOW_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 14357a8d13..c7f12beaf3 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,9 +50,7 @@ #include <com/sun/star/document/FilterOptionsRequest.hpp> #include <com/sun/star/task/ErrorCodeRequest.hpp> -#ifndef _COM_SUN_STAR_DOCUMENT_LOCKEDDOCUMENTREQUEST_HPP_ #include <com/sun/star/document/LockedDocumentRequest.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes @@ -204,3 +203,5 @@ sal_Bool QuietInteraction::wasUsed() const } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index af4675ed35..1c257eba74 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,26 +60,26 @@ namespace framework{ // definitions // path to module config -static ::rtl::OUString CFG_PACKAGE_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories"); -static ::rtl::OUString CFG_PACKAGE_SETUP = ::rtl::OUString::createFromAscii("/org.openoffice.Setup" ); -static ::rtl::OUString CFG_PACKAGE_COMMON = ::rtl::OUString::createFromAscii("/org.openoffice.Office.Common" ); -static ::rtl::OUString CFG_PATH_L10N = ::rtl::OUString::createFromAscii("L10N" ); -static ::rtl::OUString CFG_PATH_HELP = ::rtl::OUString::createFromAscii("Help" ); -static ::rtl::OUString CFG_KEY_LOCALE = ::rtl::OUString::createFromAscii("ooLocale" ); -static ::rtl::OUString CFG_KEY_HELPSYSTEM = ::rtl::OUString::createFromAscii("System" ); +static ::rtl::OUString CFG_PACKAGE_MODULES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); +static ::rtl::OUString CFG_PACKAGE_SETUP (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); +static ::rtl::OUString CFG_PACKAGE_COMMON (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common")); +static ::rtl::OUString CFG_PATH_L10N (RTL_CONSTASCII_USTRINGPARAM("L10N")); +static ::rtl::OUString CFG_PATH_HELP (RTL_CONSTASCII_USTRINGPARAM("Help")); +static ::rtl::OUString CFG_KEY_LOCALE (RTL_CONSTASCII_USTRINGPARAM("ooLocale")); +static ::rtl::OUString CFG_KEY_HELPSYSTEM (RTL_CONSTASCII_USTRINGPARAM("System")); // props of job environment -static ::rtl::OUString PROP_ENVIRONMENT = ::rtl::OUString::createFromAscii("Environment" ); -static ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig" ); -static ::rtl::OUString PROP_ENVTYPE = ::rtl::OUString::createFromAscii("EnvType" ); -static ::rtl::OUString PROP_MODEL = ::rtl::OUString::createFromAscii("Model" ); +static ::rtl::OUString PROP_ENVIRONMENT (RTL_CONSTASCII_USTRINGPARAM("Environment")); +static ::rtl::OUString PROP_JOBCONFIG (RTL_CONSTASCII_USTRINGPARAM("JobConfig")); +static ::rtl::OUString PROP_ENVTYPE (RTL_CONSTASCII_USTRINGPARAM("EnvType")); +static ::rtl::OUString PROP_MODEL (RTL_CONSTASCII_USTRINGPARAM("Model")); // props of module config -static ::rtl::OUString PROP_HELP_BASEURL = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpBaseURL" ); -static ::rtl::OUString PROP_AUTOMATIC_HELP = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpOnOpen" ); +static ::rtl::OUString PROP_HELP_BASEURL (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpBaseURL")); +static ::rtl::OUString PROP_AUTOMATIC_HELP (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpOnOpen")); // special value of job environment -static ::rtl::OUString ENVTYPE_DOCUMENTEVENT = ::rtl::OUString::createFromAscii("DOCUMENTEVENT" ); +static ::rtl::OUString ENVTYPE_DOCUMENTEVENT (RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT")); //----------------------------------------------- @@ -421,3 +422,5 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index e8961b0f97..27279512e8 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -942,3 +943,5 @@ void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css:: } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 001f53ff04..5eeda31632 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -183,8 +183,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias ) // try to open the configuration set of this job directly and get a property access to it // We open it readonly here - ::rtl::OUString sKey; - sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT); + ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT)); sKey += ::utl::wrapConfigurationElementName(m_sAlias); ConfigAccess aConfig(m_xSMGR, sKey); @@ -318,8 +317,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& // It doesn't matter if this config object was already opened before. // It doesn nothing here then ... or it change the mode automaticly, if // it was opened using another one before. - ::rtl::OUString sKey; - sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT); + ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT)); sKey += ::utl::wrapConfigurationElementName(m_sAlias); ConfigAccess aConfig(m_xSMGR, sKey); @@ -428,15 +426,15 @@ JobData::EEnvironment JobData::getEnvironment() const switch(m_eEnvironment) { case E_EXECUTION : - sDescriptor = ::rtl::OUString::createFromAscii("EXECUTOR"); + sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTOR")); break; case E_DISPATCH : - sDescriptor = ::rtl::OUString::createFromAscii("DISPATCH"); + sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISPATCH")); break; case E_DOCUMENTEVENT : - sDescriptor = ::rtl::OUString::createFromAscii("DOCUMENTEVENT"); + sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT")); break; default: break; @@ -586,7 +584,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime , we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated to "~" ... */ - static ::rtl::OUString PATTERN_ISO8601 = ::rtl::OUString::createFromAscii("\?\?\?\?-\?\?-\?\?*\0"); + static ::rtl::OUString PATTERN_ISO8601(RTL_CONSTASCII_USTRINGPARAM("\?\?\?\?-\?\?-\?\?*\0")); WildCard aISOPattern(PATTERN_ISO8601); sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime); @@ -748,3 +746,5 @@ void JobData::impl_reset() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 5543373537..9522482dfb 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -492,3 +493,5 @@ void SAL_CALL JobDispatch::removeStatusListener( /*IN*/ const css::uno::Referenc } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 7a07689b05..bb78d10532 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,15 +35,15 @@ #include <jobs/job.hxx> #include <jobs/joburl.hxx> -#ifndef __FRAMEWORK_CLASS_CONVERTER_HXX_ #include <classes/converter.hxx> -#endif #include <threadhelp/transactionguard.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <general.h> #include <services.h> +#include "helper/mischelper.hxx" + //________________________________ // interface includes #include <com/sun/star/beans/XPropertySet.hpp> @@ -124,8 +125,8 @@ DEFINE_INIT_SERVICE( JobExecutor, css::uno::Reference< css::container::XContainer > xNotifier(m_aConfig.cfg(), css::uno::UNO_QUERY); if (xNotifier.is()) { - css::uno::Reference< css::container::XContainerListener > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); - xNotifier->addContainerListener(xThis); + m_xConfigListener = new WeakContainerListener(this); + xNotifier->addContainerListener(m_xConfigListener); } // don't close cfg here! @@ -156,6 +157,9 @@ JobExecutor::JobExecutor( /*IN*/ const css::uno::Reference< css::lang::XMultiSer JobExecutor::~JobExecutor() { + css::uno::Reference< css::container::XContainer > xNotifier(m_aConfig.cfg(), css::uno::UNO_QUERY); + if (xNotifier.is()) + xNotifier->removeContainerListener(m_xConfigListener); LOG_ASSERT(m_aConfig.getMode() == ConfigAccess::E_CLOSED, "JobExecutor::~JobExecutor()\nConfiguration don't send dispoing() message!\n") } @@ -380,3 +384,5 @@ void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent ) thr } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 98b657794f..2229356d5c 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -259,3 +260,5 @@ css::frame::DispatchResultEvent JobResult::getDispatchResult() const } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 085fc7d466..2c5bbe864c 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -325,7 +326,7 @@ void JobURL::impldbg_checkIt() JobURL::impldbg_checkURL("vnd.sun.star.job:service=;" , E_UNKNOWN, "" , "" , "" , NULL, NULL, NULL); // check combinations - // Note: No additional spaces or tabs are allowed after a seperator occured. + // Note: No additional spaces or tabs are allowed after a seperator occurred. // Tab and spaces before a seperator will be used as value! JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service" , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL); JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias" , E_ALIAS | E_SERVICE , "" , "myAlias", "css.Service" , NULL, NULL, NULL); @@ -655,3 +656,5 @@ sal_Bool JobURL::getAliasArgs( /*OUT*/ ::rtl::OUString& sAliasArgs ) const #endif // ENABLE_COMPONENT_SELF_CHECK } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index e6905f77ed..09b97e0b2a 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,19 +62,19 @@ namespace framework{ // definitions /** adress job configuration inside argument set provided on method execute(). */ -static const ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig"); +static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig")); /** adress job configuration property "Command". */ -static const ::rtl::OUString PROP_COMMAND = ::rtl::OUString::createFromAscii("Command"); +static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command")); /** adress job configuration property "Arguments". */ -static const ::rtl::OUString PROP_ARGUMENTS = ::rtl::OUString::createFromAscii("Arguments"); +static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments")); /** adress job configuration property "DeactivateJobIfDone". */ -static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE = ::rtl::OUString::createFromAscii("DeactivateJobIfDone"); +static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone")); /** adress job configuration property "CheckExitCode". */ -static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAscii("CheckExitCode"); +static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode")); //----------------------------------------------- @@ -212,3 +213,5 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index ee903138f0..a49ff3c39f 100755 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: layoutmanager.cxx,v $ - * $Revision: 1.72 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -583,22 +581,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName, if ( aWindowState[n].Value >>= bValue ) rElementData.m_aDockedData.m_bLocked = bValue; } - else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXT )) + else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXT))) { if ( aWindowState[n].Value >>= bValue ) rElementData.m_bContextSensitive = bValue; } - else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_NOCLOSE )) + else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_NOCLOSE))) { if ( aWindowState[n].Value >>= bValue ) rElementData.m_bNoClose = bValue; } - else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_CONTEXTACTIVE )) + else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_CONTEXTACTIVE))) { if ( aWindowState[n].Value >>= bValue ) rElementData.m_bContextActive = bValue; } - else if ( aWindowState[n].Name.equalsAscii( WINDOWSTATE_PROPERTY_SOFTCLOSE )) + else if ( aWindowState[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(WINDOWSTATE_PROPERTY_SOFTCLOSE))) { if ( aWindowState[n].Value >>= bValue ) rElementData.m_bSoftClose = bValue; @@ -1149,6 +1147,14 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState ) implts_doLayout_notify( sal_False ); return sal_True; } + else if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolpanel" )) + { + ReadGuard aReadGuard( m_aLock ); + css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame ); + aReadGuard.unlock(); + + ActivateToolPanel( m_xFrame, aName ); + } } return sal_False; diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 96c6bfe7f2..2e5434135f 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,22 +32,15 @@ // includes of own project #include <loadenv/loadenv.hxx> -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> #endif #include <framework/framelistanalyzer.hxx> -#ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include <constant/frameloader.hxx> -#endif -#ifndef __FRAMEWORK_CONSTANT_CONTENTHANDLER_HXX_ #include <constant/contenthandler.hxx> -#endif -#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_HXX_ #include <constant/containerquery.hxx> -#endif #include <interaction/quietinteraction.hxx> #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> @@ -96,7 +90,6 @@ #include <vcl/wrkwin.hxx> #include <vcl/syswin.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif #include <unotools/moduleoptions.hxx> @@ -214,13 +207,13 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const { case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR: throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Optional list of arguments seem to be corrupted."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Optional list of arguments seem to be corrupted.")), xLoader, 4); case LoadEnvException::ID_UNSUPPORTED_CONTENT: throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("URL seems to be an unsupported one."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL seems to be an unsupported one.")), xLoader, 1); @@ -826,8 +819,8 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& void LoadEnv::impl_detectTypeAndFilter() throw(LoadEnvException, css::uno::RuntimeException) { - static ::rtl::OUString TYPEPROP_PREFERREDFILTER = ::rtl::OUString::createFromAscii("PreferredFilter"); - static ::rtl::OUString FILTERPROP_FLAGS = ::rtl::OUString::createFromAscii("Flags" ); + static ::rtl::OUString TYPEPROP_PREFERREDFILTER(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")); + static ::rtl::OUString FILTERPROP_FLAGS (RTL_CONSTASCII_USTRINGPARAM("Flags")); static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16; // SAFE -> @@ -1011,9 +1004,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() { css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"), - ::rtl::OUString::createFromAscii("Misc"), - ::rtl::OUString::createFromAscii("MaxOpenDocuments"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")), ::comphelper::ConfigurationHelper::E_READONLY); // NIL means: count of allowed documents = infinite ! @@ -1306,7 +1299,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x // <- SAFE css::util::URL aCmd; - aCmd.Complete = ::rtl::OUString::createFromAscii(".uno:JumpToMark"); + aCmd.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:JumpToMark")); css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW); xParser->parseStrict(aCmd); @@ -1316,7 +1309,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x return; ::comphelper::SequenceAsHashMap lArgs; - lArgs[::rtl::OUString::createFromAscii("Bookmark")] <<= aURL.Mark; + lArgs[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"))] <<= aURL.Mark; xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList()); } @@ -1641,7 +1634,7 @@ void LoadEnv::impl_reactForLoadingState() if (bMinimized) { - ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if (pWindow && pWindow->IsSystemWindow()) @@ -1752,7 +1745,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X aReadLock.unlock(); // <- SAFE ---------------------------------- - ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if ( pWindow ) { @@ -1804,7 +1797,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X -----------------------------------------------*/ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { - static ::rtl::OUString PACKAGE_SETUP_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories"); + static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); // no window -> action not possible if (!xWindow.is()) @@ -1820,9 +1813,12 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw return; // SOLAR SAFE -> - ::vos::OClearableGuard aSolarLock1(Application::GetSolarMutex()); + SolarMutexClearableGuard aSolarGuard1; Window* pWindow = VCLUnoHelper::GetWindow(xWindow); + if (!pWindow) + return; + sal_Bool bSystemWindow = pWindow->IsSystemWindow(); sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); @@ -1834,7 +1830,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw if (pWorkWindow->IsMinimized()) return; - aSolarLock1.clear(); + aSolarGuard1.clear(); // <- SOLAR SAFE // SAFE -> @@ -1876,7 +1872,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw if (sWindowState.getLength()) { // SOLAR SAFE -> - ::vos::OClearableGuard aSolarLock2(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; // We have to retrieve the window pointer again. Because nobody can guarantee // that the XWindow was not disposed inbetween .-) @@ -1889,8 +1885,6 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw SystemWindow* pSystemWindow = (SystemWindow*)pWindowCheck; pSystemWindow->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8)); - - aSolarLock2.clear(); // <- SOLAR SAFE } } @@ -1902,3 +1896,4 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 271532f7b0..86c466423d 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> -#endif //_______________________________________________ // namespace @@ -107,3 +106,5 @@ sal_Bool TargetHelper::isValidNameForFrame(const ::rtl::OUString& sName) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 11b1532981..cc0fddbcb2 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,7 +132,7 @@ DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::lang::XMulti : ThreadHelpBase ( &Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) , m_xSMGR ( xSMGR ) - , m_xConverter( m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), css::uno::UNO_QUERY ) + , m_xConverter( m_xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), css::uno::UNO_QUERY ) { } @@ -201,7 +202,7 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException aScriptBuffer.appendAscii("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n"); std::vector< com::sun::star::frame::DispatchStatement>::iterator p; - for ( p = m_aStatements.begin(); p != m_aStatements.end(); p++ ) + for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p ) implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer ); ::rtl::OUString sScript = aScriptBuffer.makeStringAndClear(); return sScript; @@ -344,7 +345,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL, ::rtl::OUStringBuffer aArgumentBuffer(1000); ::rtl::OUString sArrayName; // this value is used to name the arrays of aArgumentBuffer - sArrayName = ::rtl::OUString::createFromAscii("args"); + sArrayName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("args")); sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID); aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n"); @@ -491,3 +492,5 @@ void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::st } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index beaaa2eb4b..386a604d97 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -219,3 +220,5 @@ void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL& } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index 3ddbad0da3..a5a15b7227 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else IFFACTORY( ::framework::SystemExec ) else IFFACTORY( ::framework::ShellJob ) ) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 01dd6f806c..2ee525093e 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,11 +55,11 @@ ) =================================================================================================================*/ -#ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_ #include <services/logindialog.hxx> -#endif COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) ) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index af0ec0900c..6250b71c1b 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -//_________________________________________________________________________________________________________________ -// includes of my own project -//_________________________________________________________________________________________________________________ + #include <macros/registration.hxx> /*================================================================================================================= @@ -57,26 +56,14 @@ #include <services/tabwindowservice.hxx> #include <services/frame.hxx> #include <services/modulemanager.hxx> -//#include <dispatch/oxt_handler.hxx> #include <jobs/jobexecutor.hxx> -//#include <recording/dispatchrecordersupplier.hxx> -//#include <recording/dispatchrecorder.hxx> -//#include <dispatch/mailtodispatcher.hxx> -//#include <dispatch/servicehandler.hxx> #include <jobs/jobdispatch.hxx> #include <services/backingcomp.hxx> -//#include <services/dispatchhelper.hxx> #include <services/layoutmanager.hxx> -//#include <services/license.hxx> #include <uifactory/uielementfactorymanager.hxx> #include <uifactory/popupmenucontrollerfactory.hxx> -//#include <uielement/fontmenucontroller.hxx> -//#include <uielement/fontsizemenucontroller.hxx> #include <uielement/objectmenucontroller.hxx> -//#include <uielement/headermenucontroller.hxx> -//#include <uielement/footermenucontroller.hxx> #include <uielement/controlmenucontroller.hxx> -//#include <uielement/macrosmenucontroller.hxx> #include <uielement/uicommanddescription.hxx> #include <uiconfiguration/uiconfigurationmanager.hxx> #include <uiconfiguration/moduleuicfgsupplier.hxx> @@ -88,7 +75,6 @@ #include <uifactory/toolboxfactory.hxx> #include <uifactory/addonstoolboxfactory.hxx> #include "uiconfiguration/windowstateconfiguration.hxx" -//#include <uielement/toolbarsmenucontroller.hxx> #include "uifactory/toolbarcontrollerfactory.hxx" #include "uifactory/statusbarcontrollerfactory.hxx" #include <services/autorecovery.hxx> @@ -97,15 +83,9 @@ #include <uifactory/statusbarfactory.hxx> #include <uiconfiguration/uicategorydescription.hxx> #include <services/sessionlistener.hxx> -//#include <uielement/logoimagestatusbarcontroller.hxx> -//#include <uielement/logotextstatusbarcontroller.hxx> -//#include <uielement/newmenucontroller.hxx> #include <services/taskcreatorsrv.hxx> -//#include <uielement/simpletextstatusbarcontroller.hxx> -//#include <services/uriabbreviation.hxx> #include <uielement/langselectionstatusbarcontroller.hxx> -//#include <uielement/langselectionmenucontroller.hxx> #include <uiconfiguration/imagemanager.hxx> #include <uifactory/windowcontentfactorymanager.hxx> #include <services/substitutepathvars.hxx> @@ -116,26 +96,14 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else - //IFFACTORY( ::framework::Oxt_Handler ) else IFFACTORY( ::framework::JobExecutor ) else - //IFFACTORY( ::framework::DispatchRecorderSupplier ) else - //IFFACTORY( ::framework::DispatchRecorder ) else - //IFFACTORY( ::framework::MailToDispatcher ) else - //IFFACTORY( ::framework::ServiceHandler ) else IFFACTORY( ::framework::JobDispatch ) else IFFACTORY( ::framework::BackingComp ) else - //IFFACTORY( ::framework::DispatchHelper ) else IFFACTORY( ::framework::LayoutManager ) else - //IFFACTORY( ::framework::License ) else IFFACTORY( ::framework::UIElementFactoryManager ) else IFFACTORY( ::framework::PopupMenuControllerFactory ) else - //IFFACTORY( ::framework::FontMenuController ) else - //IFFACTORY( ::framework::FontSizeMenuController ) else IFFACTORY( ::framework::ObjectMenuController ) else - //IFFACTORY( ::framework::HeaderMenuController ) else - //IFFACTORY( ::framework::FooterMenuController ) else IFFACTORY( ::framework::ControlMenuController ) else - //IFFACTORY( ::framework::MacrosMenuController ) else IFFACTORY( ::framework::UICommandDescription ) else IFFACTORY( ::framework::ModuleManager ) else IFFACTORY( ::framework::UIConfigurationManager ) else @@ -149,7 +117,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::AddonsToolBoxFactory ) else IFFACTORY( ::framework::WindowStateConfiguration ) else IFFACTORY( ::framework::ToolbarControllerFactory ) else - //IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::AutoRecovery ) else IFFACTORY( ::framework::StatusIndicatorFactory ) else IFFACTORY( ::framework::RecentFilesMenuController ) else @@ -158,19 +125,13 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) 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::NewMenuController ) else - //IFFACTORY( ::framework::SimpleTextStatusbarController ) else - //IFFACTORY( ::framework::UriAbbreviation ) else - //IFFACTORY( ::framework::PopupMenuDispatcher ) else IFFACTORY( ::framework::ImageManager ) else IFFACTORY( ::framework::LangSelectionStatusbarController ) else - //IFFACTORY( ::framework::LanguageSelectionMenuController ) else IFFACTORY( ::framework::WindowContentFactoryManager ) else IFFACTORY( ::framework::TabWindowService ) else IFFACTORY( ::framework::SubstitutePathVariables ) else IFFACTORY( ::framework::PathSettings ) ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 3f0bebac0d..0947b9c0a1 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::Oxt_Handler ) else IFFACTORY( ::framework::PopupMenuController ) ) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index df9ab9ac1a..7dc1ba0b13 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,6 +45,8 @@ #include <properties.h> #include <services.h> +#include "helper/mischelper.hxx" + //_______________________________________________ // interface includes #include <com/sun/star/ucb/NameClash.hpp> @@ -253,103 +256,6 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in #endif //----------------------------------------------- -// TODO debug - remove it! -class DbgListener : private ThreadHelpBase - , public ::cppu::OWeakObject - , public css::frame::XStatusListener -{ - public: - - FWK_DECLARE_XINTERFACE - - DbgListener() - { - WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::ctor()\n\n") - } - - virtual ~DbgListener() - { - WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::dtor()\n\n") - } - - void startListening(const css::uno::Reference< css::frame::XDispatch >& xBroadcaster) - { - ::rtl::OUStringBuffer sMsg1(256); - sMsg1.appendAscii("//**********************************************************************************\n"); - sMsg1.appendAscii("start listening\n{\n"); - WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg1.makeStringAndClear())) - - ++m_refCount; - - css::util::URL aURL; - aURL.Complete = ::rtl::OUString(); - xBroadcaster->addStatusListener(static_cast< css::frame::XStatusListener* >(this), aURL); - - --m_refCount; - - ::rtl::OUStringBuffer sMsg2(256); - sMsg2.appendAscii("}\nstart listening\n"); - sMsg2.appendAscii("//**********************************************************************************\n"); - WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg2.makeStringAndClear())) - } - - virtual void SAL_CALL disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) - { - WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::dtor()\n\n") - } - - virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) - throw(css::uno::RuntimeException) - { - ::rtl::OUStringBuffer sMsg(256); - - sMsg.appendAscii("//**********************************************************************************\n"); - - sMsg.appendAscii("FeatureURL = \""); - sMsg.append (aEvent.FeatureURL.Complete); - sMsg.appendAscii("\"\n"); - - sMsg.appendAscii("State = ["); - sal_Int32 nState = -1; - aEvent.State >>= nState; - if (nState==-1) - { - sMsg.appendAscii("?-"); - sMsg.append (::rtl::OUString::valueOf(nState)); - sMsg.appendAscii("-? "); - } - if (nState==0) - sMsg.appendAscii("UNKNOWN "); - if ((nState & 1)==1) - sMsg.appendAscii("MODIFIED "); - if ((nState & 2)==2) - sMsg.appendAscii("TRYIT "); - if ((nState & 4)==4) - sMsg.appendAscii("HANDLED "); - if ((nState & 8)==8) - sMsg.appendAscii("POSTPONED "); - if ((nState & 16)==16) - sMsg.appendAscii("INCOMPLETE "); - if ((nState & 32)==32) - sMsg.appendAscii("DAMAGED "); - sMsg.appendAscii("]\n"); -/* - sMsg.appendAscii("IsEnabled = \""); - sMsg.append (::rtl::OUString::valueOf(aEvent.IsEnabled)); - sMsg.appendAscii("\"\n"); - - sMsg.appendAscii("Requery = \""); - sMsg.append (::rtl::OUString::valueOf(aEvent.Requery)); - sMsg.appendAscii("\"\n"); -*/ - sMsg.appendAscii("\n"); - - WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg.makeStringAndClear())) - } -}; - -//----------------------------------------------- class CacheLockGuard { private: @@ -426,7 +332,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems) { OSL_ENSURE(sal_False, "Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."); throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Re-entrance problem detected. Using of an stl structure in combination with iteration, adding, removing of elements etcpp.")), m_xOwner); } @@ -453,7 +359,7 @@ void CacheLockGuard::unlock() { OSL_ENSURE(sal_False, "Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"); throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")), m_xOwner); } aWriteLock.unlock(); @@ -509,11 +415,6 @@ void DispatchParams::forget() }; //----------------------------------------------- -DEFINE_XINTERFACE_1(DbgListener , - OWeakObject , - DIRECT_INTERFACE(css::frame::XStatusListener)) - -//----------------------------------------------- DEFINE_XINTERFACE_10(AutoRecovery , OWeakObject , DIRECT_INTERFACE (css::lang::XTypeProvider ), @@ -560,10 +461,6 @@ DEFINE_INIT_SERVICE( // establish callback for our internal used timer. // Note: Its only active, if the timer will be started ... m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired)); -/* - DbgListener* pListener = new DbgListener(); - pListener->startListening(this); -*/ } ) @@ -816,7 +713,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(::rtl::OUString::createFromAscii("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.addInterface(aURL.Complete, xListener); @@ -851,7 +748,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: throw(css::uno::RuntimeException) { if (!xListener.is()) - throw css::uno::RuntimeException(::rtl::OUString::createFromAscii("Invalid listener reference."), static_cast< css::frame::XDispatch* >(this)); + throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid listener reference.")), static_cast< css::frame::XDispatch* >(this)); // container is threadsafe by using a shared mutex! m_lListener.removeInterface(aURL.Complete, xListener); } @@ -1215,7 +1112,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume if (!rInfo.AppModule.getLength()) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Cant find out the default filter and its extension, if no application module is known!"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find out the default filter and its extension, if no application module is known!")), static_cast< css::frame::XDispatch* >(this)); } @@ -1257,11 +1154,11 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume css::uno::Sequence< ::rtl::OUString > lExtensions = lTypeProps.getUnpackedValueOrDefault(TYPE_PROP_EXTENSIONS, css::uno::Sequence< ::rtl::OUString >()); if (lExtensions.getLength()) { - rInfo.Extension = ::rtl::OUString::createFromAscii("."); + rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); rInfo.Extension += lExtensions[0]; } else - rInfo.Extension = ::rtl::OUString::createFromAscii(".unknown"); + rInfo.Extension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".unknown")); } catch(const css::uno::Exception&) { @@ -1472,7 +1369,8 @@ void AutoRecovery::implts_startListening() (! m_bListenForConfigChanges) ) { - xCFG->addChangesListener(static_cast< css::util::XChangesListener* >(this)); + m_xRecoveryCFGListener = new WeakChangesListener(this); + xCFG->addChangesListener(m_xRecoveryCFGListener); m_bListenForConfigChanges = sal_True; } @@ -1491,7 +1389,8 @@ void AutoRecovery::implts_startListening() (! bListenForDocEvents) ) { - xBroadcaster->addEventListener(static_cast< css::document::XEventListener* >(this)); + m_xNewDocBroadcasterListener = new WeakDocumentEventListener(this); + xBroadcaster->addEventListener(m_xNewDocBroadcasterListener); // SAFE -> WriteGuard aWriteLock(m_aLock); m_bListenForDocEvents = sal_True; @@ -1518,7 +1417,7 @@ void AutoRecovery::implts_stopListening() (m_bListenForDocEvents ) ) { - xGlobalEventBroadcaster->removeEventListener(static_cast< css::document::XEventListener* >(this)); + xGlobalEventBroadcaster->removeEventListener(m_xNewDocBroadcasterListener); m_bListenForDocEvents = sal_False; } @@ -1527,7 +1426,7 @@ void AutoRecovery::implts_stopListening() (m_bListenForConfigChanges) ) { - xCFG->removeChangesListener(static_cast< css::util::XChangesListener* >(this)); + xCFG->removeChangesListener(m_xRecoveryCFGListener); m_bListenForConfigChanges = sal_False; } } @@ -3701,10 +3600,9 @@ void AutoRecovery::impl_flushALLConfigChanges() ::comphelper::ConfigurationHelper::flush(xRecoveryCfg); // SOLAR SAFE -> - ::vos::OGuard aGuard( Application::GetSolarMutex() ); - ::utl::ConfigManager* pCfgMgr = ::utl::ConfigManager::GetConfigManager(); - if (pCfgMgr) - pCfgMgr->StoreConfigItems(); + SolarMutexGuard aGuard; + ::utl::ConfigManager& rCfgMgr = ::utl::ConfigManager::GetConfigManager(); + rCfgMgr.StoreConfigItems(); } catch(const css::uno::Exception&) {} @@ -3719,7 +3617,7 @@ void AutoRecovery::st_impl_removeFile(const ::rtl::OUString& sURL) try { ::ucbhelper::Content aContent = ::ucbhelper::Content(sURL, css::uno::Reference< css::ucb::XCommandEnvironment >()); - aContent.executeCommand(::rtl::OUString::createFromAscii("delete"), css::uno::makeAny(sal_True)); + aContent.executeCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), css::uno::makeAny(sal_True)); } catch(const css::uno::Exception&) {} @@ -3745,3 +3643,5 @@ void AutoRecovery::st_impl_removeLockFile() } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 1206b156e5..251ba1ec38 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,9 +43,7 @@ #include <properties.h> #include <services.h> -#ifndef _FRAMEWORK_HELPID_HRC #include <helpid.hrc> -#endif //_______________________________________________ // interface includes @@ -77,9 +76,7 @@ #include <osl/file.hxx> #include <unotools/configmgr.hxx> -#ifndef _UTL_BOOTSTRAP_HXX_ #include <unotools/bootstrap.hxx> -#endif namespace framework { @@ -467,17 +464,17 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // check some required states if (m_xFrame.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("already attached"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already attached")), static_cast< ::cppu::OWeakObject* >(this)); if (!xFrame.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("invalid frame reference"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid frame reference")), static_cast< ::cppu::OWeakObject* >(this)); if (!m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("instance seams to be not or wrong initialized"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("instance seams to be not or wrong initialized")), static_cast< ::cppu::OWeakObject* >(this)); // safe the frame reference @@ -504,7 +501,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); // disable full screen mode of the frame! - if (pParent->IsFullScreenMode()) + if (pParent && pParent->IsFullScreenMode()) { pParent->ShowFullScreenMode(FALSE); pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL); @@ -527,8 +524,11 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f xLayoutManager->unlock(); } - // set help ID for our canvas - pWindow->SetHelpId(HID_BACKINGWINDOW); + if (pWindow) + { + // set help ID for our canvas + pWindow->SetHelpId(HID_BACKINGWINDOW); + } // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); @@ -666,7 +666,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("unexpected source or called twice"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected source or called twice")), static_cast< ::cppu::OWeakObject* >(this)); m_xWindow = css::uno::Reference< css::awt::XWindow >(); @@ -760,7 +760,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c throw(css::uno::RuntimeException) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("not supported"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not supported")), static_cast< ::cppu::OWeakObject* >(this)); } @@ -807,7 +807,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (m_xWindow.is()) throw css::uno::Exception( - ::rtl::OUString::createFromAscii("already initialized"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already initialized")), static_cast< ::cppu::OWeakObject* >(this)); css::uno::Reference< css::awt::XWindow > xParentWindow; @@ -818,7 +818,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno ) { throw css::uno::Exception( - ::rtl::OUString::createFromAscii("wrong or corrupt argument list"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong or corrupt argument list")), static_cast< ::cppu::OWeakObject* >(this)); } @@ -829,7 +829,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (!m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("couldn't create component window"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create component window")), static_cast< ::cppu::OWeakObject* >(this)); // start listening for window disposing @@ -872,3 +872,5 @@ void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& ) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 274e9f01fc..91bf93eef9 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,6 +35,8 @@ #include "classes/fwkresid.hxx" #include <services.h> +#include <sal/macros.h> + #include "vcl/metric.hxx" #include "vcl/mnemonic.hxx" #include "vcl/menu.hxx" @@ -45,6 +48,7 @@ #include "unotools/historyoptions.hxx" #include "svtools/imagemgr.hxx" #include "svtools/svtools.hrc" +#include "svtools/langhelp.hxx" #include "comphelper/processfactory.hxx" #include "comphelper/sequenceashashmap.hxx" @@ -413,14 +417,16 @@ void BackingWindow::initBackground() Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE ); // select image set - ImageContainerRes aRes( FwkResId( bDark ? RES_BACKING_IMAGES_HC : RES_BACKING_IMAGES ) ); + ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) ); // scale middle segment Size aMiddleSize; if( !! maBackgroundMiddle ) aMiddleSize = maBackgroundMiddle.GetSizePixel(); // load middle segment - maBackgroundMiddle = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_MIDDLE ) ); + + Application::LoadBrandBitmap ("shell/backing_space", maBackgroundMiddle); + // and scale it to previous size if( aMiddleSize.Width() && aMiddleSize.Height() ) maBackgroundMiddle.Scale( aMiddleSize ); @@ -428,13 +434,13 @@ void BackingWindow::initBackground() if( GetSettings().GetLayoutRTL() ) { // replace images by RTL versions - maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_RIGHT ) ); - maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_LEFT) ); + Application::LoadBrandBitmap ("shell/backing_rtl_right", maBackgroundLeft); + Application::LoadBrandBitmap ("shell/backing_rtl_left", maBackgroundRight); } else { - maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_LEFT ) ); - maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) ); + Application::LoadBrandBitmap ("shell/backing_left", maBackgroundLeft); + Application::LoadBrandBitmap ("shell/backing_right", maBackgroundRight); } maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) ); maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) ); @@ -675,7 +681,7 @@ void BackingWindow::layoutButton( const String& i_rStr ) { - rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) ); + rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() ); // setup button i_rBtn.SetPaintTransparent( TRUE ); i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) ); @@ -955,41 +961,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 ); - - rtl::OUString sParam = aURLObj.GetParam(); - rtl::OUStringBuffer aURLBuf( sParam ); - if ( sParam.getLength() > 0 ) - aURLBuf.appendAscii( "&" ); - aURLBuf.appendAscii( "lang=" ); - - // read locale from configuration - ::rtl::OUString sLocale; - ::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(), - sPackage, - sRelPath, - sKey, - ::comphelper::ConfigurationHelper::E_READONLY) >>= sLocale; - } - catch(const com::sun::star::uno::RuntimeException& exRun) - { throw exRun; } - catch(const com::sun::star::uno::Exception&) - { sLocale = ::rtl::OUString::createFromAscii("en-US"); } - - aURLBuf.append(sLocale); - - sParam = aURLBuf.makeStringAndClear(); - - aURLObj.SetParam( sParam ); - sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); + localizeWebserviceURI(sURL); Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( comphelper::getProcessServiceFactory()->createInstance( @@ -1029,8 +1001,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString::createFromAscii("Referer"); - pArg[0].Value <<= rtl::OUString::createFromAscii("private:user"); + pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user")); dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(OPEN_URL) ), rtl::OUString(), xFrame, aArgs ); } @@ -1040,8 +1012,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString::createFromAscii("Referer"); - pArg[0].Value <<= rtl::OUString::createFromAscii("private:user"); + pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user")); dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(TEMPLATE_URL) ), rtl::OUString(), xFrame, aArgs ); } @@ -1120,7 +1092,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, aDispatchURL.Complete = i_rURL; Reference < com::sun::star::util::XURLTransformer > xURLTransformer( - comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ), + comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), com::sun::star::uno::UNO_QUERY ); if ( xURLTransformer.is() ) { @@ -1151,3 +1123,4 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index c81c975a33..f3a67213b0 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ namespace framework #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index f3f5331c09..088e5356a9 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,19 +34,13 @@ //_________________________________________________________________________________________________________________ #include <loadenv/loadenv.hxx> -#ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> -#endif -#ifndef __FRAMEWORK_DESKTOP_HXX_ #include <services/desktop.hxx> -#endif #include <helper/ocomponentaccess.hxx> #include <dispatch/dispatchprovider.hxx> -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> -#endif #include <classes/taskcreator.hxx> #include <threadhelp/transactionguard.hxx> #include <threadhelp/writeguard.hxx> @@ -2036,3 +2031,5 @@ sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::la #endif // #ifdef ENABLE_ASSERTIONS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index d6c7fe6288..f372875e60 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,7 +148,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments ); sal_Int32 nLength = lArguments.getLength(); aArguments.realloc( nLength + 1 ); - aArguments[ nLength ].Name = ::rtl::OUString::createFromAscii("SynchronMode"); + aArguments[ nLength ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode")); aArguments[ nLength ].Value <<= (sal_Bool) sal_True; css::uno::Any aResult; @@ -225,3 +226,5 @@ void SAL_CALL DispatchHelper::disposing( const css::lang::EventObject& ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 59826803eb..d66fbf6038 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <services/frame.hxx> #include <dispatch/dispatchprovider.hxx> -#ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> -#endif #include <dispatch/closedispatcher.hxx> #include <dispatch/windowcommanddispatch.hxx> #include <loadenv/loadenv.hxx> @@ -80,9 +79,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGEBROADCASTER_HPP_ #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -97,9 +94,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> #include <unotools/moduleoptions.hxx> @@ -562,7 +557,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ if (!xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Frame::initialize() called without a valid container window reference."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialize() called without a valid container window reference.")), static_cast< css::frame::XFrame* >(this)); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -570,7 +565,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& if ( m_xContainerWindow.is() ) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialized() is called more then once, which isnt usefull nor allowed.")), static_cast< css::frame::XFrame* >(this)); // Look for rejected calls first! @@ -2309,7 +2304,7 @@ aEvent // Deactivation is always done implicitely by activation of another frame. // Only if no activation is done, deactivations have to be processed if the activated window // is a parent window of the last active Window! - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aSolarGuard; // CheckMenuCloser_Impl(); Window* pFocusWindow = Application::GetFocusWindow(); if ( @@ -2619,7 +2614,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, const css::uno::Any& aValue ) { - static ::rtl::OUString MATERIALPROP_TITLE = ::rtl::OUString::createFromAscii("title"); + static ::rtl::OUString MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title")); /* There is no need to lock any mutex here. Because we share the solar mutex with our base class. And we said to our base class: "dont release it on calling us" .-) @@ -2915,17 +2910,18 @@ void Frame::implts_setIconOnWindow() // Don't forget SolarMutex! We use vcl directly :-( // Check window pointer for right WorkWindow class too!!! /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); - Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow )); - if( - ( pWindow != NULL ) && - ( pWindow->GetType() == WINDOW_WORKWINDOW ) - ) { - WorkWindow* pWorkWindow = (WorkWindow*)pWindow; - pWorkWindow->SetIcon( (sal_uInt16)nIcon ); + SolarMutexGuard aSolarGuard; + Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow )); + if( + ( pWindow != NULL ) && + ( pWindow->GetType() == WINDOW_WORKWINDOW ) + ) + { + WorkWindow* pWorkWindow = (WorkWindow*)pWindow; + pWorkWindow->SetIcon( (sal_uInt16)nIcon ); + } } - aSolarGuard.clear(); /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ } } @@ -3309,3 +3305,5 @@ sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent ) #endif // #ifdef ENABLE_ASSERTIONS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index ea22db175e..cf45af64fa 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -141,29 +141,33 @@ Resource RES_BACKING_IMAGES { File = "templates_32.png"; }; -}; - -Resource RES_BACKING_IMAGES_HC -{ - Bitmap BMP_BACKING_BACKGROUND_LEFT + Bitmap BMP_BACKING_CALC { - File = "backing_hc.png"; + File = "ods_32.png"; }; - Bitmap BMP_BACKING_BACKGROUND_MIDDLE + Bitmap BMP_BACKING_IMPRESS { - File = "backing_space_hc.png"; + File = "odp_32.png"; }; - Bitmap BMP_BACKING_BACKGROUND_RIGHT + Bitmap BMP_BACKING_DRAW { - File = "backing_right_hc.png"; + File = "odg_32.png"; }; - Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT + Bitmap BMP_BACKING_DATABASE { - File = "backing_rtl_left_hc.png"; + File = "odb_32.png"; }; - Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT + Bitmap BMP_BACKING_FORMULA { - File = "backing_rtl_right_hc.png"; + File = "odf_32.png"; + }; + Bitmap BMP_BACKING_OPENFILE + { + File = "folder_32.png"; + }; + Bitmap BMP_BACKING_OPENTEMPLATE + { + File = "templates_32.png"; }; Bitmap BMP_BACKING_EXT { diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 064c3b0ac8..03bc99b014 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,22 +165,6 @@ DEFINE_INIT_SERVICE ( License, ) -#if 0 -IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG ) -{ - /* - Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< XDesktop > xDesktop(xFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY); - if (xDesktop.is()) - xDesktop->terminate(); - */ - /* - _exit(0); - */ - return 0; -} -#endif static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime) { @@ -226,10 +211,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi sal_Int32 nDateLength = 10; sal_Int32 nTimeLength = 8; - ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T"); - ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-"); - ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":"); - ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z"); + ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T")); + ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-")); + ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":")); + ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z")); ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength); ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); @@ -291,11 +276,11 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aLangString = aLocale.Language; if ( aLocale.Country.getLength() != 0 ) { - aLangString += ::rtl::OUString::createFromAscii("-"); + aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); aLangString += aLocale.Country; if ( aLocale.Variant.getLength() != 0 ) { - aLangString += ::rtl::OUString::createFromAscii("-"); + aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); aLangString += aLocale.Variant; } } @@ -303,21 +288,21 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na ::rtl::OUString aLicensePath = aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) + ::rtl::OUString::createFromAscii(szWNTLicenseName) - + ::rtl::OUString::createFromAscii("_") + + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLangString + ::rtl::OUString::createFromAscii(szWNTLicenseExt); #else ::rtl::OUString aLicensePath = aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) + ::rtl::OUString::createFromAscii(szUNXLicenseName) - + ::rtl::OUString::createFromAscii("_") + + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLangString + ::rtl::OUString::createFromAscii(szUNXLicenseExt); #endif // check if we need to show the license at all // open org.openoffice.Setup/Office/ooLicenseAcceptDate ::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER; - ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"); + ::rtl::OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")); ::rtl::OUString sReadSrvc = SERVICENAME_CFGREADACCESS; // get configuration provider @@ -325,15 +310,15 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na m_xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); NamedValue v; - v.Name = ::rtl::OUString::createFromAscii("NodePath"); - v.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office"); + v.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")); + v.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); // if we find a date there, compare it to baseinstall license date ::rtl::OUString aAcceptDate; - if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate) + if (pset->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate"))) >>= aAcceptDate) { // get LicenseFileDate from base install ::rtl::OUString aLicenseURL = aLicensePath; @@ -371,7 +356,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // write org.openoffice.Setup/ooLicenseAcceptDate aAcceptDate = _getCurrentDateString(); - pset->setPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"), makeAny(aAcceptDate)); + pset->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate")), makeAny(aAcceptDate)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); // enable quickstarter @@ -382,7 +367,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aSeq[1] <<= bAutostart; Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY ); if ( xQuickstart.is() ) xQuickstart->initialize( aSeq ); @@ -466,7 +451,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM // load license text File aLicenseFile(aLicensePath); - if ( aLicenseFile.open(OpenFlag_Read) == FileBase::E_None) + if ( aLicenseFile.open(osl_File_OpenFlag_Read) == FileBase::E_None) { DirectoryItem d; DirectoryItem::get(aLicensePath, d); @@ -629,3 +614,4 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index f1934193c4..e9dd2b7423 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,4 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings( } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index c6320a91c8..f3d1c23753 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,8 +56,8 @@ namespace framework { -static const ::rtl::OUString CFGPATH_FACTORIES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories"); -static const ::rtl::OUString MODULEPROP_IDENTIFIER = ::rtl::OUString::createFromAscii("ooSetupFactoryModuleIdentifier" ); +static const ::rtl::OUString CFGPATH_FACTORIES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); +static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier")); /*----------------------------------------------- 04.12.2003 09:32 @@ -145,7 +146,7 @@ ModuleManager::~ModuleManager() ) { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Given module is not a frame nor a window, controller or model."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Given module is not a frame nor a window, controller or model.")), static_cast< ::cppu::OWeakObject* >(this), 1); } @@ -175,7 +176,7 @@ ModuleManager::~ModuleManager() if (sModule.getLength() < 1) throw css::frame::UnknownModuleException( - ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find suitable module for the given component.")), static_cast< ::cppu::OWeakObject* >(this)); return sModule; @@ -195,7 +196,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , if (lProps.empty() ) { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("No properties given to replace part of module."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No properties given to replace part of module.")), static_cast< css::container::XNameAccess* >(this), 2); } @@ -209,7 +210,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , // get access to the element // Note: Dont use impl_getConfig() method here. Because it creates a readonly access only, further // it cache it as a member of this module manager instance. If we change some props there ... but dont - // flush changes (because an error occured) we will read them later. If we use a different config access + // flush changes (because an error occurred) we will read them later. If we use a different config access // we can close it without a flush ... and our read data wont be affected .-) css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig( xSMGR, @@ -222,7 +223,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , if (!xModule.is()) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")), static_cast< css::container::XNameAccess* >(this)); } @@ -257,7 +258,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName) if (!xModule.is()) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")), static_cast< css::container::XNameAccess* >(this)); } @@ -423,3 +424,5 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index b187d45962..29620b6844 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,6 +40,8 @@ #include <threadhelp/writeguard.hxx> #include <services.h> +#include "helper/mischelper.hxx" + // ______________________________________________ // interface includes #include <com/sun/star/beans/Property.hpp> @@ -64,10 +67,8 @@ #define CFG_READONLY_DEFAULT sal_False -const ::rtl::OUString CFGPROP_INTERNALPATHES = ::rtl::OUString::createFromAscii("InternalPaths"); -const ::rtl::OUString CFGPROP_USERPATHES = ::rtl::OUString::createFromAscii("UserPaths" ); -const ::rtl::OUString CFGPROP_WRITEPATH = ::rtl::OUString::createFromAscii("WritePath" ); -const ::rtl::OUString CFGPROP_ISSINGLEPATH = ::rtl::OUString::createFromAscii("IsSinglePath" ); +const ::rtl::OUString CFGPROP_USERPATHES(RTL_CONSTASCII_USTRINGPARAM("UserPaths")); +const ::rtl::OUString CFGPROP_WRITEPATH(RTL_CONSTASCII_USTRINGPARAM("WritePath")); /* 0 : old style "Template" string using ";" as seperator @@ -76,9 +77,9 @@ const ::rtl::OUString CFGPROP_ISSINGLEPATH = ::rtl::OUString::createFromAscii( 3 : write path "Template_write" string */ -const ::rtl::OUString POSTFIX_INTERNAL_PATHES = ::rtl::OUString::createFromAscii("_internal"); -const ::rtl::OUString POSTFIX_USER_PATHES = ::rtl::OUString::createFromAscii("_user" ); -const ::rtl::OUString POSTFIX_WRITE_PATH = ::rtl::OUString::createFromAscii("_writable"); +const ::rtl::OUString POSTFIX_INTERNAL_PATHES(RTL_CONSTASCII_USTRINGPARAM("_internal")); +const ::rtl::OUString POSTFIX_USER_PATHES(RTL_CONSTASCII_USTRINGPARAM("_user")); +const ::rtl::OUString POSTFIX_WRITE_PATH(RTL_CONSTASCII_USTRINGPARAM("_writable")); const sal_Int32 IDGROUP_OLDSTYLE = 0; const sal_Int32 IDGROUP_INTERNAL_PATHES = 1; @@ -162,6 +163,9 @@ PathSettings::PathSettings( const css::uno::Reference< css::lang::XMultiServiceF //----------------------------------------------------------------------------- PathSettings::~PathSettings() { + css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfgNew, css::uno::UNO_QUERY); + if (xBroadcaster.is()) + xBroadcaster->removeChangesListener(m_xCfgNewListener); if (m_pPropHelp) delete m_pPropHelp; } @@ -208,14 +212,12 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::disposing" ); - // SAFE -> WriteGuard aWriteLock(m_aLock); if (aSource.Source == m_xCfgNew) m_xCfgNew.clear(); aWriteLock.unlock(); - // <- SAFE } //----------------------------------------------------------------------------- @@ -224,17 +226,21 @@ void PathSettings::impl_readAll() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readAll" ); RTL_LOGFILE_CONTEXT(aLog, "framework (as96863) ::PathSettings::load config (all)"); - // TODO think about me - css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); - css::uno::Sequence< ::rtl::OUString > lPaths = xCfg->getElementNames(); - - sal_Int32 c = lPaths.getLength(); - sal_Int32 i = 0; + try + { + // TODO think about me + css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); + css::uno::Sequence< ::rtl::OUString > lPaths = xCfg->getElementNames(); - for (i=0; i<c; ++i) + sal_Int32 c = lPaths.getLength(); + for (sal_Int32 i = 0; i < c; ++i) + { + const ::rtl::OUString& sPath = lPaths[i]; + impl_updatePath(sPath, sal_False); + } + } + catch(const css::uno::RuntimeException& ) { - const ::rtl::OUString& sPath = lPaths[i]; - impl_updatePath(sPath, sal_False); } impl_rebuildPropertyDescriptor(); @@ -272,6 +278,9 @@ OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) // NO substitution here ! It's done outside ... PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& sPath) { + const static ::rtl::OUString CFGPROP_INTERNALPATHES(RTL_CONSTASCII_USTRINGPARAM("InternalPaths")); + const static ::rtl::OUString CFGPROP_ISSINGLEPATH(RTL_CONSTASCII_USTRINGPARAM("IsSinglePath")); + css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); // get access to the "queried" path @@ -1124,7 +1133,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti //----------------------------------------------------------------------------- css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() { - const static ::rtl::OUString CFG_NODE_OLD = ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/Path/Current"); + const static ::rtl::OUString CFG_NODE_OLD(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Path/Current")); // SAFE -> ReadGuard aReadLock(m_aLock); @@ -1154,7 +1163,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() //----------------------------------------------------------------------------- css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() { - const static ::rtl::OUString CFG_NODE_NEW = ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths/Paths"); + const static ::rtl::OUString CFG_NODE_NEW(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths/Paths")); // SAFE -> ReadGuard aReadLock(m_aLock); @@ -1175,13 +1184,16 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() // SAFE -> WriteGuard aWriteLock(m_aLock); m_xCfgNew = xCfg; + m_xCfgNewListener = new WeakChangesListener(this); aWriteLock.unlock(); css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(xCfg, css::uno::UNO_QUERY_THROW); - xBroadcaster->addChangesListener(static_cast< css::util::XChangesListener* >(this)); + xBroadcaster->addChangesListener(m_xCfgNewListener); } return xCfg; } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 82e89010f6..c978eeed39 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ //_______________________________________________ // my own includes -#ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_ #include <services/sessionlistener.hxx> -#endif #include <threadhelp/readguard.hxx> #include <threadhelp/resetableguard.hxx> #include <protocols.h> @@ -217,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) throw (RuntimeException) { - OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient"); + OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient")); if (args.getLength() > 0) { NamedValue v; @@ -225,9 +224,9 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) { if (args[i] >>= v) { - if (v.Name.equalsAscii("SessionManagerName")) + if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName"))) v.Value >>= aSMgr; - else if (v.Name.equalsAscii("SessionManager")) + else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager"))) v.Value >>= m_rSessionManager; else if (v.Name.equalsAscii("AllowUserInteractionOnQuit")) v.Value >>= m_bAllowUserInteractionOnQuit; @@ -247,14 +246,14 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event) throw (css::uno::RuntimeException) { - if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionRestore")) + if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore"))) { if (event.FeatureDescriptor.compareToAscii("update")==0) m_bRestored = sal_True; // a document was restored // if (event.FeatureDescriptor.compareToAscii("stop")==0) } - else if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionSave")) + else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave"))) { if (event.FeatureDescriptor.compareToAscii("stop")==0) { @@ -274,7 +273,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW); URL aURL; - aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore"); + aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")); css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW); xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args; @@ -366,3 +365,5 @@ void SessionListener::doQuit() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4e38983ba7..9eb411236f 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,14 +49,12 @@ #include <unotools/localfilehelper.hxx> #include <unotools/configmgr.hxx> -#ifndef _UTL_BOOTSTRAP_HXX_ #include <unotools/bootstrap.hxx> -#endif #include <osl/mutex.hxx> #include <osl/file.hxx> #include <osl/security.hxx> #include <osl/socket.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <i18npool/mslangid.hxx> #include <tools/urlobj.hxx> #include <tools/resmgr.hxx> @@ -102,10 +101,9 @@ #define REPLACELENGTH_LANGID 9 #define REPLACELENGTH_VLANG 8 #define REPLACELENGTH_WORKDIRURL 13 -// --> PB 2004-10-27 #i32656# - new variable of hierachy service +// New variable of hierachy service (#i32656#) #define REPLACELENGTH_BASEINSTURL 14 #define REPLACELENGTH_USERDATAURL 14 -// <-- // Name of the pre defined path variables #define VARIABLE_INST "$(inst)" @@ -125,10 +123,9 @@ #define VARIABLE_PROGURL "$(progurl)" #define VARIABLE_USERURL "$(userurl)" #define VARIABLE_WORKDIRURL "$(workdirurl)" -// --> PB 2004-10-27 #i32656# - new variable of hierachy service +// New variable of hierachy service (#i32656#) #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" -// <-- using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -215,10 +212,9 @@ static FixedVariable aFixedVarTable[] = { 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 + // New variable of hierachy service (#i32656#) { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL }, { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL }, - // <-- { "$(brandbaseurl)", PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH("$(brandbaseurl)") } }; @@ -287,7 +283,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu while ( nSharePoints < aSharePointNames.getLength() ) { rtl::OUString aSharePointNodeName( m_aSharePointsNodeName ); - aSharePointNodeName += rtl::OUString::createFromAscii( "/" ); + aSharePointNodeName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aSharePointNodeName += aSharePointNames[ nSharePoints ]; SubstituteRuleVector aRuleSet; @@ -643,7 +639,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService // Sort user variables to path length SubstituteVariables::const_iterator pIter; - for ( pIter = m_aSubstVarMap.begin(); pIter != m_aSubstVarMap.end(); pIter++ ) + for ( pIter = m_aSubstVarMap.begin(); pIter != m_aSubstVarMap.end(); ++pIter ) { ReSubstUserVarOrder aUserOrderVar; rtl::OUStringBuffer aStrBuffer( pIter->second.aSubstVariable.getLength() ); @@ -719,12 +715,24 @@ rtl::OUString SubstitutePathVariables::GetWorkPath() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkPath" ); rtl::OUString aWorkPath; - ::comphelper::ConfigurationHelper::readDirectKey( + + try + { + ::comphelper::ConfigurationHelper::readDirectKey( m_xServiceManager, - ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths"), - ::rtl::OUString::createFromAscii("Paths/Work"), - ::rtl::OUString::createFromAscii("WritePath"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Paths/Work")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; + } + catch(RuntimeException &) + { + } + + // fallback in case config layer does not return an useable work dir value. + if (aWorkPath.getLength() < 1) + aWorkPath = GetWorkVariableValue(); + return aWorkPath; } @@ -732,12 +740,19 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkVariableValue" ); ::rtl::OUString aWorkPath; - ::comphelper::ConfigurationHelper::readDirectKey( + + try + { + ::comphelper::ConfigurationHelper::readDirectKey( m_xServiceManager, - ::rtl::OUString::createFromAscii("org.openoffice.Office.Paths"), - ::rtl::OUString::createFromAscii("Variables"), - ::rtl::OUString::createFromAscii("Work"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Variables")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Work")), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; + } + catch(RuntimeException &) + { + } // fallback to $HOME in case platform dependend config layer does not return // an usuable work dir value. @@ -1026,7 +1041,7 @@ throw ( RuntimeException ) while ( !bResubstitutionCompleted ) { ReSubstFixedVarOrderVector::const_iterator pIterFixed; - for ( pIterFixed = m_aReSubstFixedVarOrder.begin(); pIterFixed != m_aReSubstFixedVarOrder.end(); pIterFixed++ ) + for ( pIterFixed = m_aReSubstFixedVarOrder.begin(); pIterFixed != m_aReSubstFixedVarOrder.end(); ++pIterFixed ) { rtl::OUString aValue = m_aPreDefVars.m_FixedVar[ (sal_Int32)pIterFixed->eVariable ]; sal_Int32 nPos = aURL.indexOf( aValue ); @@ -1066,7 +1081,7 @@ throw ( RuntimeException ) // This part can be iteratered more than one time as variables can contain variables again! ReSubstUserVarOrderVector::const_iterator pIterUser; - for ( pIterUser = m_aReSubstUserVarOrder.begin(); pIterUser != m_aReSubstUserVarOrder.end(); pIterUser++ ) + for ( pIterUser = m_aReSubstUserVarOrder.begin(); pIterUser != m_aReSubstUserVarOrder.end(); ++pIterUser ) { rtl::OUString aVarValue = pIterUser->aVarName; sal_Int32 nPos = aURL.indexOf( aVarValue ); @@ -1180,16 +1195,14 @@ 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 ]; - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // New variable of hierachy service (#i32656#) 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 ]; - // --> PB 2004-11-11 #i32656# - new variable of hierachy service + // New variable of hierachy service (#i32656#) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; - // <-- // Detect the program directory // Set $(prog), $(progpath), $(progurl) @@ -1207,7 +1220,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Detect the language type of the current office aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US; rtl::OUString aLocaleStr; - if ( utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr ) + if ( utl::ConfigManager::GetConfigManager().GetDirectConfigProperty( utl::ConfigManager::LOCALE ) >>= aLocaleStr ) aPreDefPathVariables.m_eLanguageType = MsLangId::convertIsoStringToLanguage( aLocaleStr ); else { @@ -1247,3 +1260,5 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6775e6d478..e5ca800054 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -322,7 +323,7 @@ void TabWindowService::impl_initializePropInfo() impl_addPropertyInfo( css::beans::Property( - TABWINDOWSERVICE_PROPNAME_WINDOW, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Window")), TABWINDOWSERVICE_PROPHANDLE_WINDOW, ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), css::beans::PropertyAttribute::TRANSIENT)); @@ -440,7 +441,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) ) { throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString::createFromAscii("Tab index out of bounds."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")), css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY )); } } @@ -454,7 +455,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID); if (pIt == m_lTabPageInfos.end ()) throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString::createFromAscii("Tab index out of bounds."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")), css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY )); return pIt; } @@ -483,3 +484,5 @@ FwkTabWindow* TabWindowService::mem_TabWin () } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 869a65dc42..f8b62da849 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,9 +56,7 @@ #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> //_______________________________________________ @@ -67,14 +66,14 @@ namespace framework { //----------------------------------------------- -const ::rtl::OUString TaskCreatorService::ARGUMENT_PARENTFRAME = ::rtl::OUString::createFromAscii("ParentFrame" ); // XFrame -const ::rtl::OUString TaskCreatorService::ARGUMENT_FRAMENAME = ::rtl::OUString::createFromAscii("FrameName" ); // OUString -const ::rtl::OUString TaskCreatorService::ARGUMENT_MAKEVISIBLE = ::rtl::OUString::createFromAscii("MakeVisible" ); // sal_Bool -const ::rtl::OUString TaskCreatorService::ARGUMENT_CREATETOPWINDOW = ::rtl::OUString::createFromAscii("CreateTopWindow" ); // sal_Bool -const ::rtl::OUString TaskCreatorService::ARGUMENT_POSSIZE = ::rtl::OUString::createFromAscii("PosSize" ); // Rectangle -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 +const ::rtl::OUString TaskCreatorService::ARGUMENT_PARENTFRAME(RTL_CONSTASCII_USTRINGPARAM("ParentFrame")); // XFrame +const ::rtl::OUString TaskCreatorService::ARGUMENT_FRAMENAME(RTL_CONSTASCII_USTRINGPARAM("FrameName")); // OUString +const ::rtl::OUString TaskCreatorService::ARGUMENT_MAKEVISIBLE(RTL_CONSTASCII_USTRINGPARAM("MakeVisible")); // sal_Bool +const ::rtl::OUString TaskCreatorService::ARGUMENT_CREATETOPWINDOW(RTL_CONSTASCII_USTRINGPARAM("CreateTopWindow")); // sal_Bool +const ::rtl::OUString TaskCreatorService::ARGUMENT_POSSIZE(RTL_CONSTASCII_USTRINGPARAM("PosSize")); // Rectangle +const ::rtl::OUString TaskCreatorService::ARGUMENT_CONTAINERWINDOW(RTL_CONSTASCII_USTRINGPARAM("ContainerWindow")); // XWindow +const ::rtl::OUString TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE(RTL_CONSTASCII_USTRINGPARAM("SupportPersistentWindowState")); // sal_Bool +const ::rtl::OUString TaskCreatorService::ARGUMENT_ENABLE_TITLEBARUPDATE(RTL_CONSTASCII_USTRINGPARAM("EnableTitleBarUpdate")); // sal_Bool //----------------------------------------------- DEFINE_XINTERFACE_3(TaskCreatorService , @@ -228,11 +227,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const { // SYNCHRONIZED -> - ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Window* pVCLWindow = VCLUnoHelper::GetWindow(xWindow); if (pVCLWindow) pVCLWindow->SetExtendedStyle(WB_EXT_DOCUMENT); - aSolarGuard.clear(); // <- SYNCHRONIZED } @@ -265,7 +263,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai if (bTopWindow) { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = DECLARE_ASCII("window") ; + aDescriptor.WindowServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window")); aDescriptor.ParentIndex = -1 ; aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; aDescriptor.Bounds = aPosSize ; @@ -278,7 +276,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai else { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = DECLARE_ASCII("dockingwindow") ; + aDescriptor.WindowServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dockingwindow")); aDescriptor.ParentIndex = 1 ; aDescriptor.Parent = xParentWindowPeer ; aDescriptor.Bounds = aPosSize ; @@ -289,7 +287,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai css::uno::Reference< css::awt::XWindowPeer > xPeer = xToolkit->createWindow( aDescriptor ); css::uno::Reference< css::awt::XWindow > xWindow ( xPeer, css::uno::UNO_QUERY ); if ( ! xWindow.is()) - throw css::uno::Exception(::rtl::OUString::createFromAscii("TaskCreator service was not able to create suitable frame window."), + throw css::uno::Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TaskCreator service was not able to create suitable frame window.")), static_cast< ::cppu::OWeakObject* >(this)); if (bTopWindow) xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); @@ -402,3 +400,5 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index c88cdf9e21..b5d589a420 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 8ee168bda7..74da8f02ef 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -349,7 +350,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException if ( !bWithPassword && aTestURL.Password.getLength() > 0 ) { // Exchange password text with other placeholder string - aTestURL.Password = ::rtl::OUString::createFromAscii( "<******>" ); + aTestURL.Password = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<******>")); assemble( aTestURL ); } @@ -370,3 +371,4 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index a9fdf6f8de..409d482419 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,9 +52,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/sequenceashashmap.hxx> //_________________________________________________________________________________________________________________ @@ -421,7 +420,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() ); + SolarMutexGuard aGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) pWindow->Show( TRUE ); @@ -974,3 +973,5 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index e9a7e65cb5..c6c98e6349 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -174,3 +175,5 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 6dcb3604c1..b4701f447a 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -354,3 +355,5 @@ sal_Bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eSt } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index 7f41169a74..b0a5966051 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ throw( uno::RuntimeException ) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index c4d2b07276..a29e80c800 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -252,3 +253,5 @@ sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::Runti } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index bad5e8bb56..0098db3c0c 100755..100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,6 +63,8 @@ #include <rtl/logfile.hxx> #include "svtools/miscopt.hxx" +#include "vcl/imagerepository.hxx" + //_________________________________________________________________________________________________________________ // namespaces //_________________________________________________________________________________________________________________ @@ -87,8 +90,7 @@ using namespace ::cppu; // Image sizes for our toolbars/menus const sal_Int32 IMAGE_SIZE_NORMAL = 16; const sal_Int32 IMAGE_SIZE_LARGE = 26; -const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST| - ::com::sun::star::ui::ImageType::SIZE_LARGE; +const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::SIZE_LARGE; static const char IMAGE_FOLDER[] = "images"; static const char BITMAPS_FOLDER[] = "Bitmaps"; @@ -97,17 +99,13 @@ static const char IMAGE_EXTENSION[] = ".png"; static const char* IMAGELIST_XML_FILE[] = { "sc_imagelist.xml", - "lc_imagelist.xml", - "sch_imagelist.xml", - "lch_imagelist.xml" + "lc_imagelist.xml" }; static const char* BITMAP_FILE_NAMES[] = { "sc_userimages.png", - "lc_userimages.png", - "sch_userimages.png", - "lch_userimages.png" + "lc_userimages.png" }; namespace framework @@ -118,9 +116,7 @@ namespace framework static const char* ImageType_Prefixes[ImageType_COUNT] = { "res/commandimagelist/sc_", - "res/commandimagelist/lc_", - "res/commandimagelist/sch_", - "res/commandimagelist/lch_" + "res/commandimagelist/lc_" }; typedef GraphicNameAccess CmdToXGraphicNameAccess; @@ -367,7 +363,15 @@ GlobalImageList::~GlobalImageList() Image GlobalImageList::getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) { osl::MutexGuard guard( getGlobalImageListMutex() ); - return CmdImageList::getImageFromCommandURL( nImageType, rCommandURL ); + Image aImage = CmdImageList::getImageFromCommandURL( nImageType, rCommandURL ); + if (!aImage) + { + BitmapEx rBitmap; + bool res = ::vcl::ImageRepository::loadDefaultImage(rBitmap); + if (res) + aImage = Image(rBitmap); + } + return aImage; } bool GlobalImageList::hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ) @@ -426,8 +430,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra Size aSize = aImage.GetSizePixel(); bool bMustScale( false ); - if (( nImageType == ImageType_Color_Large ) || - ( nImageType == ImageType_HC_Large )) + if ( nImageType == ImageType_Color_Large ) bMustScale = ( aSize != aLargeSize ); else bMustScale = ( aSize != aNormSize ); @@ -449,8 +452,6 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType ) sal_Int16 nIndex( 0 ); if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE ) nIndex += 1; - if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST ) - nIndex += 2; return nIndex; } @@ -472,11 +473,11 @@ void ImageManagerImpl::implts_initialize() try { - m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), + m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )), nModes ); if ( m_xUserImageStorage.is() ) { - m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ), + m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )), nModes ); } } @@ -751,6 +752,8 @@ void ImageManagerImpl::dispose() } delete m_pDefaultImageList; m_pDefaultImageList = 0; + + m_xOwner.clear(); } } @@ -785,15 +788,15 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments ) PropertyValue aPropValue; if ( aArguments[n] >>= aPropValue ) { - if ( aPropValue.Name.equalsAscii( "UserConfigStorage" )) + if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserConfigStorage")) ) { aPropValue.Value >>= m_xUserConfigStorage; } - else if ( aPropValue.Name.equalsAscii( "ModuleIdentifier" )) + else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ModuleIdentifier")) ) { aPropValue.Value >>= m_aModuleIdentifier; } - else if ( aPropValue.Name.equalsAscii( "UserRootCommit" )) + else if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UserRootCommit")) ) { aPropValue.Value >>= m_xUserRootCommit; } @@ -887,7 +890,7 @@ throw (::com::sun::star::uno::RuntimeException) Sequence< OUString > aImageNameSeq( aImageCmdNameMap.size() ); ImageNameMap::const_iterator pIter; i = 0; - for ( pIter = aImageCmdNameMap.begin(); pIter != aImageCmdNameMap.end(); pIter++ ) + for ( pIter = aImageCmdNameMap.begin(); pIter != aImageCmdNameMap.end(); ++pIter ) aImageNameSeq[i++] = pIter->first; return aImageNameSeq; @@ -1366,11 +1369,11 @@ 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(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )), nModes ); if ( xUserImageStorage.is() ) { - uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ), + uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )), nModes ); for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ ) { @@ -1454,6 +1457,10 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& void ImageManagerImpl::clear() { ResetableGuard aGuard( m_aLock ); + + if (!m_pUserImageList) + return; + for ( sal_Int32 n = 0; n < ImageType_COUNT; n++ ) { delete m_pUserImageList[n]; @@ -1461,3 +1468,5 @@ void ImageManagerImpl::clear() } } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 5e213f8a59..768f32a4fe 100755..100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -220,3 +221,5 @@ namespace framework } #endif // __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 0818c90d27..1483a231f2 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -224,3 +225,5 @@ sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno: } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 24c0f152e5..1043a26510 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,100 +112,6 @@ DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ModuleUIConfigurationManagerSupplier DEFINE_INIT_SERVICE ( ModuleUIConfigurationManagerSupplier, {} ) -/*TODO_AS -void ModuleUIConfigurationManagerSupplier::impl_initStorages() -{ -RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleUIConfigurationManagerSupplier::impl_initStorages" ); - if ( !m_bInit ) - { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ModuleUIConfigurationManagerSupplier::impl_initStorages" ); - - rtl::OUString aFinalSlash( RTL_CONSTASCII_USTRINGPARAM( "/" )); - rtl::OUString aConfigRootFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/modules" )); - rtl::OUString aConfigSubFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/modules/soffice.cfg" )); - rtl::OUString aConfigRootFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg" )); - rtl::OUString aConfigSubFolder( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/soffice.cfg" )); - rtl::OUString aConfigFileName( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/uiconfig.zip" )); - - Reference< XPropertySet > xPathSettings( m_xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" ))), - UNO_QUERY_THROW ); - - Any a = xPathSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIConfig" ))); - a >>= m_aDefaultConfigURL; - a = xPathSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfig" ))); - a >>= m_aUserConfigURL; - - // Use only the first entry from "UIConfig" - sal_Int32 nIndex = m_aDefaultConfigURL.indexOf( ';' ); - if ( nIndex > 0 ) - m_aDefaultConfigURL = m_aDefaultConfigURL.copy( 0, nIndex ); - - rtl::OUString aDefaultConfigFolderURL( m_aDefaultConfigURL ); - - nIndex = m_aDefaultConfigURL.lastIndexOf( '/' ); - if (( nIndex > 0 ) && ( nIndex != ( m_aDefaultConfigURL.getLength()-1 ))) - { - m_aDefaultConfigURL += aFinalSlash; - aDefaultConfigFolderURL += aFinalSlash; - } - - nIndex = m_aUserConfigURL.lastIndexOf( '/' ); - if (( nIndex > 0 ) && ( nIndex != ( m_aUserConfigURL.getLength()-1 ))) - m_aUserConfigURL += aFinalSlash; - -// aDefaultConfigFolderURL += aConfigRootFolder; - - // Create root storages for user interface configuration data (default and customizable) - Reference< XSingleServiceFactory > xStorageFactory( m_xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" ))), - UNO_QUERY_THROW ); - - Sequence< Any > aArgs( 2 ); - - // Default root storage (READ-ACCESS) - aArgs[0] <<= m_aDefaultConfigURL + aConfigFileName; //aConfigSubFolder; - aArgs[1] <<= ElementModes::READ; - m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW ); - - Reference < XOutputStream > xTempOut( m_xServiceManager->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), - UNO_QUERY ); - - Reference< XPackageStructureCreator > xPackageStructCreator( m_xServiceManager->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.PackageStructureCreator" ))), - UNO_QUERY_THROW ); - - RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ convertToPackage" ); - xPackageStructCreator->convertToPackage( aDefaultConfigFolderURL, xTempOut ); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "} convertToPackage" ); - - xTempOut->closeOutput(); - Reference< XInputStream > xTempIn( xTempOut, UNO_QUERY ); - Reference< XSeekable > xTempSeek( xTempOut, UNO_QUERY ); - - // Default root storage (READ-ACCESS) - xTempSeek->seek( 0 ); - - aArgs[0] <<= xTempIn; - aArgs[1] <<= ElementModes::READ; - m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW ); - - // Customizable root storage (READWRITE-ACCESS) - aArgs[0] <<= m_aUserConfigURL + aConfigSubFolder; - aArgs[1] <<= ElementModes::READWRITE; - m_xUserCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY ); - - // Create wrapper object for module user interface configuration managers, so they are able to call commit/revert on - // root storage and nothing more (saftey)! - RootStorageWrapper* pUserRootStorageWrapper = new RootStorageWrapper( Reference< XTransactedObject >( m_xUserCfgRootStorage, UNO_QUERY )); - m_xUserRootCommit = Reference< XTransactedObject>( static_cast< OWeakObject *>( pUserRootStorageWrapper ), UNO_QUERY ); - } - - m_bInit = true; -} -*/ - ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( const Reference< XMultiServiceFactory >& xServiceManager ) : ThreadHelpBase( &Application::GetSolarMutex() ) @@ -236,20 +143,6 @@ ModuleUIConfigurationManagerSupplier::~ModuleUIConfigurationManagerSupplier() xComponent->dispose(); ++pIter; } -/*TODO_AS - // Dispose our root configuration storages - if ( m_xDefaultCfgRootStorage.is() ) - { - Reference< XComponent > xComponent( m_xDefaultCfgRootStorage, UNO_QUERY ); - xComponent->dispose(); - } - - if ( m_xUserCfgRootStorage.is() ) - { - Reference< XComponent > xComponent( m_xUserCfgRootStorage, UNO_QUERY ); - xComponent->dispose(); - } -*/ } // XComponent @@ -310,53 +203,6 @@ throw ( NoSuchElementException, RuntimeException) // Create instance on demand if ( !pIter->second.is() ) { - /*TODO_AS - Reference< XStorage > xDefaultConfigModuleStorage; - Reference< XStorage > xUserConfigModuleStorage; - - try - { - xDefaultConfigModuleStorage = Reference< XStorage >( m_xDefaultCfgRootStorage->openStorageElement( - sShort, ElementModes::READ ), UNO_QUERY_THROW ); - - if ( m_xUserCfgRootStorage.is() ) - { - try - { - xUserConfigModuleStorage = Reference< XStorage >( m_xUserCfgRootStorage->openStorageElement( - sShort, ElementModes::READWRITE ), UNO_QUERY ); - } - catch( ::com::sun::star::io::IOException& ) - { - try - { - xUserConfigModuleStorage = Reference< XStorage >( m_xUserCfgRootStorage->openStorageElement( - sShort, ElementModes::READ ), UNO_QUERY ); - } - catch( com::sun::star::uno::Exception& ) - { - } - } - } - } - catch ( com::sun::star::uno::Exception& ) - { - } - PropertyValue aArg; - Sequence< Any > aArgs( 5 ); - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" )); - aArg.Value <<= ModuleIdentifier; - aArgs[0] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultConfigStorage" )); - aArg.Value <<= xDefaultConfigModuleStorage; - aArgs[1] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); - aArg.Value <<= xUserConfigModuleStorage; - aArgs[2] <<= aArg; - aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" )); - aArg.Value <<= m_xUserRootCommit; - aArgs[3] <<= aArg; - */ ::rtl::OUString sShort; try { @@ -365,7 +211,7 @@ throw ( NoSuchElementException, RuntimeException) xCont->getByName(ModuleIdentifier) >>= lProps; for (sal_Int32 i=0; i<lProps.getLength(); ++i) { - if (lProps[i].Name.equalsAscii("ooSetupFactoryShortName")) + if (lProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryShortName"))) { lProps[i].Value >>= sShort; break; @@ -396,3 +242,4 @@ throw ( NoSuchElementException, RuntimeException) } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 74ee45e5d9..d0d72c3be7 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -830,8 +831,8 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); - m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); - m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString()); + m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString()); + m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString()); for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) { @@ -909,8 +910,6 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno if ( m_bDisposed ) throw DisposedException(); - bool bResetStorage( false ); - if ( !isReadOnly() ) { // Remove all elements from our user-defined storage! @@ -942,8 +941,6 @@ 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; @@ -1621,3 +1618,5 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const Configu } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index a3510df765..1bc66fc77d 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,14 +33,14 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UICONFIGURATION_UICATEGORYDESCRPTION_HXX_ #include "uiconfiguration/uicategorydescription.hxx" -#endif #include <threadhelp/resetableguard.hxx> #include "services.h" #include "properties.h" +#include "helper/mischelper.hxx" + //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ @@ -57,9 +58,7 @@ #include <unotools/configmgr.hxx> #include <tools/string.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <comphelper/sequence.hxx> #include <rtl/logfile.hxx> @@ -151,6 +150,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali Reference< XMultiServiceFactory > m_xServiceManager; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; + Reference< XContainerListener > m_xConfigListener; sal_Bool m_bConfigAccessInitialized; sal_Bool m_bCacheFilled; IdToInfoCache m_aIdCache; @@ -183,7 +183,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() ResetableGuard aLock( m_aLock ); Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->removeContainerListener( this ); + xContainer->removeContainerListener(m_xConfigListener); } // XNameAccess @@ -390,7 +390,10 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() // Add as container listener Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->addContainerListener( this ); + { + m_xConfigListener = new WeakContainerListener(this); + xContainer->addContainerListener(m_xConfigListener); + } } return sal_True; @@ -455,7 +458,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact // insert generic categories mappings m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type( - rtl::OUString::createFromAscii( GENERIC_MODULE_NAME ), aGenericCategories )); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories )); UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories ); if ( pCatIter != m_aUICommandsHashMap.end() ) @@ -474,3 +477,4 @@ Reference< XNameAccess > UICategoryDescription::impl_createConfigAccess(const :: } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 2c52286a85..849738816d 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -698,7 +699,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt if ( isReadOnly() ) return; - bool bResetStorage( false ); if ( m_xDocConfigStorage.is() ) { try @@ -738,7 +738,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt if ( xTransactedObject.is() ) xTransactedObject->commit(); } - bResetStorage = true; // remove settings from user defined layer and notify listener about removed settings data! // Try to access our module sub folder @@ -1108,7 +1107,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW); PropertyValue aProp; - aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot"); + aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")); aProp.Value <<= xDocumentRoot; Sequence< Any > lArgs(1); @@ -1353,3 +1352,5 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index 9ff45d885b..bdfa722107 100755..100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -804,8 +805,8 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); - m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); - m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString()); + m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString()); + m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString()); for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) { @@ -882,8 +883,6 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx if ( m_bDisposed ) throw DisposedException(); - bool bResetStorage( false ); - if ( !isReadOnly() ) { // Remove all elements from our user-defined storage! @@ -915,8 +914,6 @@ 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; @@ -1387,7 +1384,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw ( } // if ( m_bUseDefault ) else { - aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot"); + aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")); aProp.Value <<= xDocumentRoot; } lArgs[0] <<= aProp; @@ -1708,3 +1705,5 @@ void UIConfigurationManagerImpl::implts_notifyContainerListener( const Configura } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx index c5854daae9..d7673e02cb 100755..100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -216,3 +217,5 @@ namespace framework } #endif // __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGERIMPL_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 421676db83..a851658700 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,6 +36,8 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" +#include "helper/mischelper.hxx" + //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ @@ -263,6 +266,7 @@ class ConfigurationAccess_WindowState : // interfaces Reference< XMultiServiceFactory > m_xServiceManager; Reference< XMultiServiceFactory > m_xConfigProvider; Reference< XNameAccess > m_xConfigAccess; + Reference< XContainerListener > m_xConfigListener; ResourceURLToInfoCache m_aResourceURLToInfoCache; sal_Bool m_bConfigAccessInitialized : 1, m_bModified : 1; @@ -320,7 +324,7 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState() ResetableGuard aLock( m_aLock ); Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->removeContainerListener( this ); + xContainer->removeContainerListener(m_xConfigListener); } // XNameAccess @@ -1226,7 +1230,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window sal_Int32 i( 0 ); sal_Int32 nCount( m_aPropArray.size() ); Sequence< PropertyValue > aPropSeq; - ::rtl::OUString aDelim( ::rtl::OUString::createFromAscii( "," )); + ::rtl::OUString aDelim( RTL_CONSTASCII_USTRINGPARAM(",") ); for ( i = 0; i < nCount; i++ ) { @@ -1326,7 +1330,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() // Add as container listener Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->addContainerListener( this ); + { + m_xConfigListener = new WeakContainerListener(this); + xContainer->addContainerListener(m_xConfigListener); + } } return sal_True; @@ -1376,7 +1383,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi UNO_QUERY ); Reference< XNameAccess > xEmptyNameAccess; Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW ); - Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames(); + Sequence< rtl::OUString > aElementNames; + try + { + aElementNames = xNameAccess->getElementNames(); + } + catch (::com::sun::star::uno::RuntimeException &) + { + } Sequence< PropertyValue > aSeq; ::rtl::OUString aModuleIdentifier; @@ -1388,7 +1402,7 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi ::rtl::OUString aWindowStateFileStr; for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ ) { - if ( aSeq[y].Name.equalsAscii("ooSetupFactoryWindowStateConfigRef") ) + if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryWindowStateConfigRef")) ) { aSeq[y].Value >>= aWindowStateFileStr; break; @@ -1491,3 +1505,4 @@ throw (::com::sun::star::uno::RuntimeException) } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 4bb12988c3..86302acea0 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,30 +36,20 @@ //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX #include <uielement/toolbar.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include <uielement/generictoolbarcontroller.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include "services.h" #include <framework/imageproducer.hxx> #include <framework/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include <classes/resource.hrc> #endif #include <framework/addonsoptions.hxx> #ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include <uielement/comboboxtoolbarcontroller.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #include <uielement/imagebuttontoolbarcontroller.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #include <uielement/togglebuttontoolbarcontroller.hxx> -#endif #include <uielement/buttontoolbarcontroller.hxx> #include <uielement/spinfieldtoolbarcontroller.hxx> #include <uielement/edittoolbarcontroller.hxx> @@ -71,14 +62,10 @@ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#ifndef _COM_SUN_STAR_BEANS_XLAYOUTMANAGER_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_ #include <com/sun/star/ui/DockingArea.hpp> -#endif #include <com/sun/star/lang/XMultiComponentFactory.hpp> //_________________________________________________________________________________________________________________ @@ -86,9 +73,7 @@ //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> @@ -159,25 +144,25 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& aImageId, const rtl::OUString& aURL, - BOOL bBigImage, - BOOL bHiContrast ) + BOOL bBigImage +) { Image aImage; if ( aImageId.getLength() > 0 ) { - aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage, bHiContrast ); + aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage ); if ( !!aImage ) return aImage; else - aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast ); + aImage = GetImageFromURL( rFrame, aImageId, bBigImage ); if ( !!aImage ) return aImage; } - aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast ); + aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage ); if ( !aImage ) - aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast ); + aImage = GetImageFromURL( rFrame, aImageId, bBigImage ); return aImage; } @@ -232,11 +217,10 @@ void AddonsToolBarManager::RefreshImages() if ( pRuntimeItemData ) aImageId = pRuntimeItemData->aImageId; - m_pToolBar->SetItemImage( nId, RetrieveImage( m_xFrame, - aImageId, - aCommandURL, - bBigImages, - m_bIsHiContrast )); + m_pToolBar->SetItemImage( + nId, + RetrieveImage( m_xFrame, aImageId, aCommandURL, bBigImages ) + ); } } } @@ -315,7 +299,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue m_pToolBar->InsertItem( nId, aTitle ); - Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols, m_bIsHiContrast ); + Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols ); if ( !!aImage ) m_pToolBar->SetItemImage( nId, aImage ); @@ -525,7 +509,6 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT { if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND ) { - // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); } return 1; @@ -537,7 +520,6 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { - // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); } @@ -557,3 +539,4 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index f86e931473..c41987feac 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,9 +41,7 @@ #include <uielement/rootitemcontainer.hxx> #include <uielement/addonstoolbarmanager.hxx> -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include <uielement/toolbar.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -60,9 +59,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> @@ -127,7 +124,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument PropertyValue aPropValue; if ( aArguments[n] >>= aPropValue ) { - if ( aPropValue.Name.equalsAscii( "ConfigurationData" )) + if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) )) aPropValue.Value >>= m_aConfigData; } } @@ -139,7 +136,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument ToolBar* pToolBar = 0; AddonsToolBarManager* pToolBarManager = 0; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { @@ -194,3 +191,4 @@ Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index d98caee191..c2b8e48228 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX #include "uielement/buttontoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,7 +53,7 @@ //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> @@ -137,7 +134,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException bool bInitialized( true ); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -147,7 +144,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException if ( !bInitialized ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_bInitialized = sal_True; PropertyValue aPropValue; @@ -155,11 +152,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { if ( aArguments[i] >>= aPropValue ) { - if ( aPropValue.Name.equalsAscii( "Frame" )) + if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) m_xFrame.set(aPropValue.Value,UNO_QUERY); - else if ( aPropValue.Name.equalsAscii( "CommandURL" )) + else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) )) aPropValue.Value >>= m_aCommandURL; - else if ( aPropValue.Name.equalsAscii( "ServiceManager" )) + else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ServiceManager" ) )) m_xServiceManager.set(aPropValue.Value,UNO_QUERY); } } @@ -172,7 +169,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -202,7 +199,7 @@ throw (::com::sun::star::uno::RuntimeException) void SAL_CALL ButtonToolbarController::update() throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); } @@ -214,7 +211,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) { uno::Reference< uno::XInterface > xSource( Source.Source ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; @@ -243,7 +240,7 @@ throw (::com::sun::star::uno::RuntimeException) ::com::sun::star::util::URL aTargetURL; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -285,7 +282,7 @@ throw (::com::sun::star::uno::RuntimeException) aArgs[0].Value <<= KeyModifier; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); } catch ( DisposedException& ) @@ -297,7 +294,7 @@ throw (::com::sun::star::uno::RuntimeException) void SAL_CALL ButtonToolbarController::click() throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -335,3 +332,4 @@ throw (::com::sun::star::uno::RuntimeException) } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index c9f93e6290..32a95e1a6e 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include "uielement/comboboxtoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,11 +53,9 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <vcl/toolbox.hxx> #include <vcl/combobox.hxx> #include <tools/urlobj.hxx> @@ -199,7 +194,7 @@ ComboboxToolbarController::~ComboboxToolbarController() void SAL_CALL ComboboxToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pComboBox; @@ -447,3 +442,4 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 328d68fd80..a55a2d6cb5 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX #include "uielement/complextoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,11 +53,9 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #include <dispatch/uieventloghelper.hxx> @@ -105,7 +100,7 @@ ComplexToolbarController::~ComplexToolbarController() void SAL_CALL ComplexToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); svt::ToolboxController::dispose(); @@ -136,7 +131,7 @@ throw ( RuntimeException ) Sequence<PropertyValue> aArgs; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -162,7 +157,7 @@ throw ( RuntimeException ) pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ComplexToolbarController")).log( + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, @@ -176,7 +171,7 @@ throw ( RuntimeException ) void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; @@ -388,3 +383,4 @@ void ComplexToolbarController::notifyTextChanged( const ::rtl::OUString& aText ) } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 546d141e0f..983808b555 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" +#include <sal/macros.h> #include <uielement/controlmenucontroller.hxx> //_________________________________________________________________________________________________________________ @@ -67,7 +69,6 @@ // Function-Id's #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) #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) @@ -192,7 +193,7 @@ const char* aCommands[] = //_________________________________________________________________________________________________________________ // Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -218,7 +219,6 @@ ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Refer m_pResPopupMenu( 0 ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); } @@ -231,15 +231,15 @@ 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 ); + ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); - + if ( pResMgr->IsAvailable( aResId )) { ImageList aImageList( aResId ); - for ( sal_uInt32 i=0; i < sizeof(nConvertSlots)/sizeof(nConvertSlots[0]); ++i ) + for ( sal_uInt32 i=0; i < SAL_N_ELEMENTS(nConvertSlots); ++i ) { // das entsprechende Image dran if ( m_bShowMenuImages ) @@ -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() ); - + + SolarMutexGuard aSolarMutexGuard; + 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(); @@ -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() ); - + + SolarMutexGuard aSolarMutexGuard; + 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 - + 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 )); @@ -344,7 +344,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat 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); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))).log(m_xServiceManager, m_xFrame, aURL, aArgs); if ( xDispatch.is() ) xDispatch->dispatch( aURL, aArgs ); } @@ -356,18 +356,15 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro if ( m_xPopupMenu.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + SolarMutexGuard aSolarMutexGuard; + // 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(); sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); - sal_Bool bUpdateImages = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages )); + sal_Bool bUpdateImages = (bShowMenuImages != m_bShowMenuImages); if ( bUpdateImages ) { - // The mode has changed or the complete menu so we have to retrieve all images again - m_bWasHiContrast = bIsHiContrast; m_bShowMenuImages = bShowMenuImages; VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu ); @@ -402,7 +399,7 @@ void ControlMenuController::impl_setPopupMenu() } } // if ( m_pResPopupMenu == 0 ) } - + void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -415,12 +412,12 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: 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) + + for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i) { aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] ); m_xURLTransformer->parseStrict( aTargetURL ); - + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) { @@ -441,3 +438,5 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 0325817d8e..438532ed4a 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX #include "uielement/dropdownboxtoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -55,11 +52,9 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> using namespace ::com::sun::star; @@ -182,7 +177,7 @@ DropdownToolbarController::~DropdownToolbarController() void SAL_CALL DropdownToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pListBoxControl; @@ -351,3 +346,4 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 23e5eea145..2f4366bdd9 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX #include "uielement/edittoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -55,11 +52,9 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> using namespace ::com::sun::star; @@ -179,7 +174,7 @@ EditToolbarController::~EditToolbarController() void SAL_CALL EditToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pEditControl; @@ -266,3 +261,4 @@ void EditToolbarController::executeControlCommand( const ::com::sun::star::frame } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 6a885e972d..efd28d3f17 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,16 +49,12 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> @@ -107,7 +104,7 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -181,7 +178,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co { Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log( + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, @@ -260,3 +257,4 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 05cf6ac3e7..1a0e3074e7 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,21 +49,15 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> #endif #include <tools/mapunit.hxx> #ifndef _VCL_SVAPP_HXX_ #include <vcl/svapp.hxx> -#endif #include <vcl/i18nhelp.hxx> -#ifndef _VCL_OUTPUTDEVICE_HXX_ #include <vcl/outdev.hxx> -#endif #include <vcl/print.hxx> -#ifndef _SVTOOLS_CTRLTOOL_HXX_ #include <svtools/ctrltool.hxx> -#endif #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> @@ -118,7 +113,7 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno:: Sequence< PropertyValue > aPrinterSeq = xPrintable->getPrinter(); for ( int i = 0; i < aPrinterSeq.getLength(); i++ ) { - if ( aPrinterSeq[i].Name.equalsAscii( "Name" )) + if ( aPrinterSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) )) { aPrinterSeq[i].Value >>= aPrinterName; break; @@ -173,7 +168,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r Printer* pInfoPrinter = 0; rtl::OUString aPrinterName; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // try to retrieve printer name of document aPrinterName = retrievePrinterName( m_xFrame ); @@ -312,7 +307,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev if ( m_xPopupMenu.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; setCurHeight( long( m_aFontHeight.Height * 10), m_xPopupMenu ); } } @@ -361,3 +356,5 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star svt::PopupMenuControllerBase::updatePopupMenu(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index fb74197e8e..e447ba0e2c 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ @@ -55,9 +54,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> @@ -95,3 +92,5 @@ FooterMenuController::~FooterMenuController() { } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 16f1286820..25c3c3f7d5 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,17 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include "uielement/generictoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -55,11 +52,9 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #include <classes/resource.hrc> #include <classes/fwkresid.hxx> @@ -150,7 +145,7 @@ GenericToolbarController::~GenericToolbarController() void SAL_CALL GenericToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::ToolboxController::dispose(); @@ -166,7 +161,7 @@ throw ( RuntimeException ) ::rtl::OUString aCommandURL; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); @@ -205,7 +200,7 @@ throw ( RuntimeException ) pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("GenericToolbarController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs); Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } @@ -213,7 +208,7 @@ throw ( RuntimeException ) void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; @@ -391,3 +386,4 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime } } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f10507f734..2ef71b8cfe 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ @@ -55,14 +54,11 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -//#include <tools/solar.hrc> #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> @@ -112,7 +108,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -274,3 +270,5 @@ void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::u } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index c22a064b76..74ba672a28 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #include "uielement/imagebuttontoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes @@ -38,7 +37,6 @@ #include <framework/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,7 +54,7 @@ //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> @@ -93,7 +91,7 @@ uno::Reference< util::XMacroExpander > GetMacroExpander() uno::Reference< util::XMacroExpander > xMacroExpander( m_xMacroExpander ); if ( !xMacroExpander.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( !xMacroExpander.is() ) { @@ -139,9 +137,8 @@ ImageButtonToolbarController::ImageButtonToolbarController( ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) { sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); - sal_Bool bHiContrast( pToolbar->GetSettings().GetStyleSettings().GetHighContrastMode() ); - Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, bHiContrast, sal_True ); + Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, sal_True ); // Height will be controlled by scaling according to button height m_pToolbar->SetItemImage( m_nID, aImage ); @@ -158,7 +155,7 @@ ImageButtonToolbarController::~ImageButtonToolbarController() void SAL_CALL ImageButtonToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); } @@ -166,7 +163,7 @@ throw ( RuntimeException ) void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // i73486 to be downward compatible use old and "wrong" also! if (( rControlCommand.Command.equalsAsciiL( "SetImag", 7 )) || ( rControlCommand.Command.equalsAsciiL( "SetImage", 8 )) ) @@ -233,3 +230,4 @@ sal_Bool ImageButtonToolbarController::ReadImageFromURL( sal_Bool bBigImage, con } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 22154db372..83566458c6 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,16 +49,12 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <com/sun/star/awt/XMenuExtended.hpp> #include <comphelper/processfactory.hxx> @@ -71,9 +68,7 @@ #include <svtools/langtab.hxx> #include <classes/fwlresid.hxx> -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" @@ -136,7 +131,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t // XStatusListener void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if (rBHelper.bDisposed || rBHelper.bInDispose) return; @@ -232,7 +227,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if (!m_bShowMenu) @@ -340,15 +335,15 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com:: // TODO: Fill menu with the information retrieved by the status update - if( m_aCommandURL.equalsAscii( ".uno:SetLanguageSelectionMenu" )) + if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageSelectionMenu" ) )) { fillPopupMenu(m_xPopupMenu, MODE_SetLanguageSelectionMenu ); } - else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageParagraphMenu" )) + else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageParagraphMenu" ) )) { fillPopupMenu(m_xPopupMenu, MODE_SetLanguageParagraphMenu ); } - else if( m_aCommandURL.equalsAscii( ".uno:SetLanguageAllTextMenu" )) + else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageAllTextMenu" ) )) { fillPopupMenu(m_xPopupMenu, MODE_SetLanguageAllTextMenu ); } @@ -376,3 +371,4 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any > } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index cc408eb6f2..2a53808141 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,13 +33,11 @@ #include <classes/fwkresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> #include <com/sun/star/frame/XPopupMenuController.hpp> @@ -55,9 +54,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -129,7 +126,7 @@ void SAL_CALL LangSelectionStatusbarController::initialize( const ::com::sun::st throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::initialize" ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; svt::StatusbarController::initialize( aArguments ); @@ -393,7 +390,7 @@ throw ( RuntimeException ) // m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedText RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "LangSelectionStatusbarController::statusChanged" ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) return; @@ -438,3 +435,4 @@ throw ( RuntimeException ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index 602d2dc6dd..008e1f1acf 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,11 @@ #include <classes/fwlresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; @@ -85,12 +84,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() ); - + SolarMutexGuard aSolarMutexGuard; + svt::StatusbarController::initialize( aArguments ); } @@ -100,14 +99,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 ) @@ -153,7 +152,7 @@ void SAL_CALL LogoImageStatusbarController::paint( ::sal_Int32 /*nStyle*/ ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( xGraphics );; if ( pOutDev ) @@ -175,3 +174,5 @@ void SAL_CALL LogoImageStatusbarController::doubleClick() throw (::com::sun::sta } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 925127fc03..6241acbc4b 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,11 @@ #include <classes/fwlresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; @@ -85,12 +84,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() ); - + SolarMutexGuard aSolarMutexGuard; + svt::StatusbarController::initialize( aArguments ); if ( m_xParentWindow.is() && m_nID > 0 ) @@ -110,14 +109,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 ) @@ -178,3 +177,5 @@ void SAL_CALL LogoTextStatusbarController::doubleClick() throw (::com::sun::star } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 9b7aa88636..a9b4116bdb 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,7 +89,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pVCLPopupMenu ) @@ -150,7 +151,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc pExecuteInfo->aTargetURL = aTargetURL; //pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); // xDispatch->dispatch( aTargetURL, aArgs ); Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); } @@ -186,10 +187,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt { const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" ); const String ellipsis = String::CreateFromAscii( "..." ); - 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" ); + const ::rtl::OUString providerKey(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.ScriptProviderFor")); + const ::rtl::OUString languageProviderName(RTL_CONSTASCII_USTRINGPARAM("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 ); @@ -230,3 +229,5 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 85aadec3aa..1839e4861d 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,9 +63,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> -#ifndef _COM_SUN_STAR_LANG_XSYSTEMDEPENDENT_HPP_ #include <com/sun/star/lang/SystemDependent.hpp> -#endif #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -84,13 +83,11 @@ #include <unotools/pathoptions.hxx> #include <unotools/cmdoptions.hxx> #include <unotools/localfilehelper.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <osl/file.hxx> #include <cppuhelper/implbase1.hxx> @@ -116,7 +113,6 @@ struct SystemMenuData //_________________________________________________________________________________________________________________ using namespace ::cppu; -using namespace ::vos; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -175,30 +171,23 @@ namespace framework #define SFX_REFERER_USER "private:user" -const ::rtl::OUString aCmdHelpIndex( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpIndex" )); -const ::rtl::OUString aCmdToolsMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolsMenu" )); -const ::rtl::OUString aCmdHelpMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpMenu" )); -const ::rtl::OUString aSlotHelpMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5410" )); - -const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); -const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); -const ::rtl::OUString aSlotSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5510" )); -const ::rtl::OUString aSlotSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:5610" )); -const ::rtl::OUString aSlotSpecialToolsMenu( RTL_CONSTASCII_USTRINGPARAM( "slot:6677" )); +#define aCmdHelpIndex ".uno:HelpIndex" +#define aCmdToolsMenu ".uno:ToolsMenu" +#define aCmdHelpMenu ".uno:HelpMenu" +#define aSlotHelpMenu "slot:5410" -// special uno commands for picklist and window list -const ::rtl::OUString aSpecialFileCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:PickList" )); -const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:WindowList" )); +#define aSpecialWindowMenu "window" +#define aSlotSpecialWindowMenu "slot:5610" +#define aSlotSpecialToolsMenu "slot:6677" -const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); +// special uno commands for window list +#define aSpecialWindowCommand ".uno:WindowList" -static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast ) +static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) n |= ::com::sun::star::ui::ImageType::SIZE_LARGE; - if ( bHighContrast ) - n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST; return n; } @@ -315,7 +304,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces if ( m_pVCLMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; SystemMenuData aSystemMenuData; aSystemMenuData.nSize = sizeof( SystemMenuData ); @@ -352,7 +341,7 @@ MenuBarManager::~MenuBarManager() void MenuBarManager::Destroy() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Destroy" ); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_bDisposed ) { @@ -363,7 +352,7 @@ void MenuBarManager::Destroy() RemoveListener(); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; pItemHandler->xMenuItemDispatch.clear(); @@ -462,7 +451,7 @@ throw (RuntimeException) return; sal_Int16 nImageType = sal_Int16(); - sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast ); + sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False ); if (( Event.aInfo >>= nImageType ) && ( nImageType == nCurrentImageType )) RequestImages(); @@ -495,7 +484,7 @@ throw ( RuntimeException ) if ( Action.Action == FrameAction_CONTEXT_CHANGED ) { std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { // Clear dispatch reference as we will requery it later o MenuItemHandler* pItemHandler = *p; @@ -511,7 +500,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() ); + SolarMutexGuard aSolarGuard; { ResetableGuard aGuard( m_aLock ); @@ -520,7 +509,7 @@ throw ( RuntimeException ) // We have to check all menu entries as there can be identical entries in a popup menu. std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler->aMenuItemURL == aFeatureURL ) @@ -611,7 +600,7 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( USHORT nIte ResetableGuard aGuard( m_aLock ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; if ( pItemHandler->nItemId == nItemId ) @@ -654,7 +643,7 @@ void MenuBarManager::RemoveListener() if ( xServiceManager.is() ) { std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; if ( pItemHandler->xMenuItemDispatch.is() ) @@ -672,7 +661,7 @@ void MenuBarManager::RemoveListener() { { // Remove popup menu from menu structure - OGuard aGuard2( Application::GetSolarMutex() ); + SolarMutexGuard aGuard2; m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); } @@ -733,7 +722,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run ResetableGuard aGuard( m_aLock ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler->xMenuItemDispatch.is() && @@ -770,7 +759,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() ); + SolarMutexGuard aGuard2; m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 ); } @@ -859,7 +848,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES; else nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES; - pMenu->SetMenuFlags( nFlag ); + pMenu->SetMenuFlags( nFlag | MENU_FLAG_SHOWCHECKIMAGES ); if ( m_bActive ) return 0; @@ -867,26 +856,22 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) m_bActive = TRUE; ::rtl::OUString aMenuCommand( m_aMenuItemCommand ); - if ( m_aMenuItemCommand == aSpecialWindowMenu || - m_aMenuItemCommand == aSlotSpecialWindowMenu || - aMenuCommand == aSpecialWindowCommand ) + if ( m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowMenu)) || + m_aMenuItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialWindowMenu)) || + aMenuCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) ) MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock ); // Check if some modes have changed so we have to update our menu images - sal_Bool bIsHiContrast = rSettings.GetHighContrastMode(); sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle(); if ( m_bRetrieveImages || - m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages || 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; - MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); + MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages ); } // Try to map commands to labels @@ -906,13 +891,13 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) { RetrieveShortcuts( m_aMenuItemHandlerVector ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; // Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex // Only non-popup menu items can have a short-cut - if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex ) + if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) ) { KeyCode aKeyCode( KEY_F1 ); pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode ); @@ -936,7 +921,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) KeyCode aEmptyKeyCode; SvtCommandOptions aCmdOptions; std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler ) @@ -1064,7 +1049,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY_THROW ); @@ -1149,7 +1134,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) { const sal_uInt32 nRef = Application::ReleaseSolarMutex(); if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("MenuBarManager")).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuBarManager"))).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); Application::AcquireSolarMutex( nRef ); } @@ -1270,7 +1255,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF m_xDispatchProvider = rDispatchProvider; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); m_bRetrieveImages = sal_False; @@ -1288,7 +1272,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF USHORT nItemId = pMenu->GetItemId( nPos ); ::rtl::OUString aCommand = pMenu->GetItemCommand( nItemId ); if ( nItemId == SID_MDIWINDOWLIST || - aCommand == aSpecialWindowCommand ) + aCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSpecialWindowCommand)) ) { // Retrieve addon popup menus and add them to our menu bar Reference< com::sun::star::frame::XModel > xModel; @@ -1387,12 +1371,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF xPopupMenuDispatchProvider = pAttributes->xDispatchProvider; // Check if this is the help menu. Add menu item if needed - if ( nItemId == SID_HELPMENU || aItemCommand == aSlotHelpMenu || aItemCommand == aCmdHelpMenu ) + if ( nItemId == SID_HELPMENU || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotHelpMenu)) || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpMenu)) ) { // Check if this is the help menu. Add menu item if needed CheckAndAddMenuExtension( pPopup ); } - else if (( nItemId == SID_ADDONLIST || aItemCommand == aSlotSpecialToolsMenu || aItemCommand == aCmdToolsMenu ) && + else if (( nItemId == SID_ADDONLIST || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotSpecialToolsMenu)) || aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdToolsMenu)) ) && AddonMenuManager::HasAddonMenuElements() ) { // Create addon popup menu if there exist elements and this is the tools popup menu @@ -1433,7 +1417,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST )) { Reference< XFrame > xTemp( rFrame ); - Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE ); if ( !!aImage ) pPopup->SetItemImage( ITEMID_ADDONLIST, aImage ); } @@ -1463,14 +1447,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 ) { // Retrieve image id from menu attributes - aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( m_xFrame, aImageId, FALSE ); } if ( !aImage ) { - aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE ); if ( !aImage ) - aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast ); + aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE ); } if ( !!aImage ) @@ -1511,13 +1495,13 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { RetrieveShortcuts( m_aMenuItemHandlerVector ); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pMenuItemHandler = *p; // Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex // Only non-popup menu items can have a short-cut - if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex ) + if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) ) { KeyCode aKeyCode( KEY_F1 ); pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode ); @@ -1926,7 +1910,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon // Clear MenuBarManager structures { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; // Check active state as we cannot change our VCL menu during activation by the user if ( m_bActive ) @@ -1937,7 +1921,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon RemoveListener(); std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; pItemHandler->xMenuItemDispatch.clear(); @@ -1968,10 +1952,10 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetPopupController" ); String aPopupScheme = String::CreateFromAscii( "vnd.sun.star.popup:" ); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; std::vector< MenuItemHandler* >::iterator p; - for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ ) + for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p ) { MenuItemHandler* pItemHandler = *p; if ( pItemHandler->xPopupMenuController.is() ) @@ -2065,9 +2049,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))), UNO_QUERY ); - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); - Reference< XStatusListener > xStatusListener; Reference< XDispatch > xDispatch; USHORT nItemCount = pAddonMenu->GetItemCount(); @@ -2146,3 +2127,5 @@ void MenuBarManager::SetHdl() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 6315c1013c..05acedc387 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,6 +102,14 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( { sal_uInt32 i( 0 ); const sal_uInt32 nCount( rReferencePath.size() ); + + ReferencePathInfo aResult; + if ( !nCount ) + { + aResult.eResult = RP_MENUITEM_NOT_FOUND; + return aResult; + } + Menu* pCurrMenu( pMenu ); RPResultInfo eResult( RP_OK ); @@ -142,7 +151,6 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( } while (( pCurrMenu != 0 ) && ( i < nCount ) && ( eResult == RP_OK )); - ReferencePathInfo aResult; aResult.pPopupMenu = pCurrMenu; aResult.nPos = nPos; aResult.nLevel = nLevel; @@ -439,3 +447,5 @@ void MenuBarMerger::GetSubMenu( } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index b919a58ae9..8c1d5e404c 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,7 +155,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th MenuBar* pVCLMenuBar = 0; VCLXMenuBar* pAwtMenuBar = 0; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; pVCLMenuBar = new MenuBar(); } @@ -195,7 +196,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th PropertyValue aPropValue; if ( aArguments[n] >>= aPropValue ) { - if ( aPropValue.Name.equalsAscii( "MenuOnly" )) + if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) ) aPropValue.Value >>= bMenuOnly; } } @@ -377,3 +378,4 @@ Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( Runt } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 79627c0cfd..6a0a3df794 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwkresid.hxx> #include <framework/bmkmenu.hxx> #include <framework/imageproducer.hxx> @@ -95,7 +94,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( NewMenuController DEFINE_INIT_SERVICE ( NewMenuController, {} ) -void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast ) +void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages ) { USHORT nItemCount = pPopupMenu->GetItemCount(); Image aImage; @@ -117,7 +116,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage if ( aImageId.getLength() > 0 ) { - aImage = GetImageFromURL( xFrame, aImageId, FALSE, bHiContrast ); + aImage = GetImageFromURL( xFrame, aImageId, FALSE ); if ( !!aImage ) { bImageSet = sal_True; @@ -329,7 +328,6 @@ void NewMenuController::retrieveShortcutsFromConfiguration( NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) : svt::PopupMenuControllerBase( xServiceManager ), m_bShowImages( sal_True ), - m_bHiContrast( sal_False ), m_bNewMenu( sal_False ), m_bModuleIdentified( sal_False ), m_bAcceleratorCfg( sal_False ), @@ -347,7 +345,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -440,7 +438,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr if ( pPopupMenu ) { { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); aTargetURL.Complete = pVCLPopupMenu->GetItemCommand( rEvent.MenuId ); } @@ -448,7 +446,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr xURLTransformer->parseStrict( aTargetURL ); aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); - aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER )); + aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ))); rtl::OUString aTargetFrame( m_aTargetFrame ); AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId ); @@ -469,14 +467,14 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr pNewDocument->aTargetURL = aTargetURL; pNewDocument->aArgSeq = aArgsList; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("NewMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument ); } } void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if ( m_xFrame.is() && m_xPopupMenu.is() ) { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu ); @@ -484,7 +482,6 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bShowImages( rSettings.GetUseImagesInMenus() ); - sal_Bool bHiContrast( rSettings.GetHighContrastMode() ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); @@ -492,9 +489,7 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R ( m_bHiContrast != bHiContrast )) { m_bShowImages = bShowImages; - m_bHiContrast = bHiContrast; - - setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast ); + setMenuImages( pVCLPopupMenu, m_bShowImages ); } setAccelerators( pVCLPopupMenu ); @@ -527,7 +522,7 @@ void NewMenuController::impl_setPopupMenu() { for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ ) { - if ( aSeq[y].Name.equalsAscii("ooSetupFactoryEmptyDocumentURL") ) + if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) ) { aSeq[y].Value >>= m_aEmptyDocURL; break; @@ -561,9 +556,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowImages = rSettings.GetUseImagesInMenus(); - m_bHiContrast = rSettings.GetHighContrastMode(); - - m_bNewMenu = m_aCommandURL.equalsAscii( ".uno:AddDirect" ); + m_bNewMenu = m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:AddDirect" ) ); } } } @@ -594,3 +587,5 @@ IMPL_STATIC_LINK_NOINSTANCE( NewMenuController, ExecuteHdl_Impl, NewDocument*, p } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 5c06d1b7a1..47618f39d8 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,17 +44,13 @@ #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#ifndef _COM_SUN_STAR_EMBED_VERBDATTRIBUTES_HPP_ #include <com/sun/star/embed/VerbAttributes.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> @@ -99,7 +96,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -164,3 +161,5 @@ void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch, } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 5693bd6346..849cfabb96 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_ #include <uielement/progressbarwrapper.hxx> -#endif //_________________________________________________________________________________________________________________ // my own includes @@ -140,7 +139,7 @@ throw (uno::RuntimeException) if ( xWindow.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -178,7 +177,7 @@ throw (uno::RuntimeException) if ( xWindow.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -208,7 +207,7 @@ throw (uno::RuntimeException) if ( xWindow.is() ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -261,7 +260,7 @@ throw (uno::RuntimeException) if ( xWindow.is() && bSetValue ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ) { @@ -363,3 +362,5 @@ throw (uno::RuntimeException) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 56a220be98..42c9d5d78b 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwkresid.hxx> //_________________________________________________________________________________________________________________ @@ -51,9 +50,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> @@ -61,7 +58,11 @@ #include <unotools/historyoptions.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> -//#include <tools/solar.hrc> +#ifdef WNT +#include <tools/prewin.h> +#include <tools/postwin.h> +#include <odma_lib.hxx> +#endif #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> @@ -120,7 +121,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -210,6 +211,41 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > else aMenuTitle = aSystemPath; } +#ifdef WNT + else if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_ODMA && ::odma::DMSsAvailable ()) + { + String aShortTitle = m_aRecentFilesItems.at( i ).aTitle; + + // This is against all rules for using + // proper abstraction layers and whatnot. + // But figuring out how to do it "right" + // would have taken the whole week. + // So just call the odma_lib functions... + // (odma_lib is a thin layer on + // top of the ODMA32 DLL) + + static ODMHANDLE handle = NULL; + static sal_Bool beenhere = sal_False; + ODMSTATUS status; + + if ( ! beenhere ) + { + status = NODMRegisterApp( &handle, ODM_API_VERSION, "sodma", NULL, NULL ); + beenhere = sal_True; + } + + if ( handle != NULL ) + { + rtl::OUString s = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_MS_1252 ); + s = s.copy( strlen ( "vnd.sun.star.odma:/" ) ); + char title[47]; + status = NODMGetDocInfo( handle, rtl::OUStringToOString( s, RTL_TEXTENCODING_MS_1252 ).pData->buffer, ODM_NAME, title, sizeof ( title ) ); + aShortTitle = String::CreateFromAscii( title ); + } + aMenuTitle += aShortTitle; + aTipHelpText = aURLString; + } +#endif else { // Use INetURLObject to abbreviate all other URLs @@ -264,7 +300,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) aArgsList.realloc( NUM_OF_PICKLIST_ARGS ); aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); - aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER )); + aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ))); // documents in the picklist will never be opened as templates aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" )); @@ -289,7 +325,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter; - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0 ); } if ( xDispatch.is() ) @@ -302,7 +338,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) pLoadRecentFile->aTargetURL = aTargetURL; pLoadRecentFile->aArgSeq = aArgsList; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("RecentFilesMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); } } @@ -478,3 +514,5 @@ IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRec } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index e5fae0992f..85aeccaf72 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,11 @@ #include <classes/fwkresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; @@ -84,19 +83,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() ); - + + SolarMutexGuard aSolarMutexGuard; + 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 +105,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 +125,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 ) @@ -194,3 +193,5 @@ void SAL_CALL SimpleTextStatusbarController::doubleClick() throw (::com::sun::st } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index d5d64a32c9..b5eed582ed 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,17 +32,13 @@ #include <stdio.h> #include <wchar.h> -#ifndef __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX #include "uielement/spinfieldtoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -58,11 +55,9 @@ // other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <tools/urlobj.hxx> #ifdef WINNT #include <systools/win32/snprintf.h> @@ -240,7 +235,7 @@ SpinfieldToolbarController::~SpinfieldToolbarController() void SAL_CALL SpinfieldToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pToolbar->SetItemWindow( m_nID, 0 ); delete m_pSpinfieldControl; @@ -575,3 +570,4 @@ rtl::OUString SpinfieldToolbarController::impl_formatOutputString( double fValue } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 502253255c..66090061df 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,7 +61,7 @@ FrameworkStatusBar::~FrameworkStatusBar() void FrameworkStatusBar::SetStatusBarManager( StatusBarManager* pStatusBarManager ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; m_pMgr = pStatusBarManager; } @@ -111,3 +112,5 @@ void FrameworkStatusBar::MouseButtonUp( const MouseEvent& rMEvt ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 54d9b4ad9f..067437cdc8 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,9 +63,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <svtools/statusbarcontroller.hxx> #include <vcl/status.hxx> @@ -80,7 +79,7 @@ using namespace ::com::sun::star; #endif const sal_Int32 HELPID_PREFIX_LENGTH = 7; -static const char* HELPID_PREFIX = "helpid:"; +static const char HELPID_PREFIX[] = "helpid:"; // Property names of a menu/menu item ItemDescriptor static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; @@ -710,3 +709,5 @@ IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 61c1e00f57..39ed879c81 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,9 +56,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <tools/solar.h> #include <vcl/svapp.hxx> @@ -127,7 +126,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) StatusBar* pStatusBar( 0 ); StatusBarManager* pStatusBarManager( 0 ); { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { @@ -203,3 +202,4 @@ Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( Ru } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 5f9d979e36..aca204ff22 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,7 @@ //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace cppu; using namespace com::sun::star::uno; @@ -128,3 +129,4 @@ throw( ::com::sun::star::uno::RuntimeException ) } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index fb9aeafa6e..f4347a356e 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #include "uielement/togglebuttontoolbarcontroller.hxx" -#endif //_________________________________________________________________________________________________________________ // my own includes @@ -38,7 +37,6 @@ #include <framework/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -56,7 +54,7 @@ //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> @@ -108,7 +106,7 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController() void SAL_CALL ToggleButtonToolbarController::dispose() throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); } @@ -132,7 +130,7 @@ throw (::com::sun::star::uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if (( m_eStyle == STYLE_DROPDOWNBUTTON ) || ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) { @@ -162,7 +160,7 @@ throw (::com::sun::star::uno::RuntimeException) void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; if (( m_eStyle == STYLE_DROPDOWNBUTTON ) || ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) @@ -306,7 +304,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_uInt16 nItemId = pMenu->GetCurItemId(); if ( nItemId > 0 && nItemId <= m_aDropdownMenuList.size() ) @@ -320,3 +318,4 @@ IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu ) } // namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx index b99fed9e5f..2136c8ff84 100644 --- a/framework/source/uielement/toolbar.cxx +++ b/framework/source/uielement/toolbar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ void ToolBar::DataChanged( const DataChangedEvent& rDCEvt ) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 400327deed..11d829917a 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,12 +35,8 @@ //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UIELEMENT_TOOLBAR_HXX #include <uielement/toolbar.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX #include <uielement/generictoolbarcontroller.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include "services.h" #include "general.h" @@ -47,7 +44,6 @@ #include <framework/imageproducer.hxx> #include <framework/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> -#ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include <classes/resource.hrc> #endif #include <framework/addonsoptions.hxx> @@ -62,9 +58,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#ifndef _COM_SUN_STAR_UI_XDOCKINGAREA_HPP_ #include <com/sun/star/ui/DockingArea.hpp> -#endif #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> @@ -86,7 +80,6 @@ #include <unotools/cmdoptions.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/mediadescriptor.hxx> #include <svtools/miscopt.hxx> #include <svl/imageitm.hxx> @@ -144,7 +137,6 @@ static const sal_Int32 ITEM_DESCRIPTOR_STYLE_LEN = 5; static const char HELPID_PREFIX[] = "helpid:"; static const char HELPID_PREFIX_TESTTOOL[] = ".HelpId:"; -//static sal_Int32 HELPID_PREFIX_LENGTH = 7; static const USHORT STARTID_CUSTOMIZE_POPUPMENU = 1000; #define MENUPREFIX "private:resource/menubar/" @@ -185,13 +177,11 @@ throw ( RuntimeException ) //***************************************************************************************************************** -static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast ) +static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) n |= ::com::sun::star::ui::ImageType::SIZE_LARGE; - if ( bHighContrast ) - n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST; return n; } @@ -248,7 +238,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(), m_bDisposed( sal_False ), - m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ), m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ), m_bModuleIdentified( sal_False ), m_bAddedToTaskPaneList( sal_True ), @@ -256,7 +245,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic m_bUpdateControllers( sal_False ), m_bImageOrientationRegistered( sal_False ), m_bImageMirrored( sal_False ), - m_bCanBeCustomized( sal_True ), + m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ), m_lImageRotation( 0 ), m_pToolBar( pToolBar ), m_aResourceName( rResourceName ), @@ -297,7 +286,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // enables a menu for clipped items and customization SvtCommandOptions aCmdOptions; USHORT nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS; - if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString::createFromAscii( "CreateDialog" ))) + if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog")))) nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE; //added for issue33668 by shizhoubo m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) ); @@ -378,21 +367,6 @@ void ToolBarManager::CheckAndUpdateImages() ResetableGuard aGuard( m_aLock ); sal_Bool bRefreshImages = sal_False; - // Check if high contrast/normal mode have changed - if ( m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - if ( !m_bIsHiContrast ) - { - bRefreshImages = TRUE; - m_bIsHiContrast = sal_True; - } - } - else if ( m_bIsHiContrast ) - { - bRefreshImages = sal_True; - m_bIsHiContrast = sal_False; - } - SvtMiscOptions aMiscOptions; bool bCurrentSymbolsSmall = !aMiscOptions.AreCurrentSymbolsLarge(); if ( m_bSmallSymbols != bCurrentSymbolsSmall ) @@ -425,11 +399,11 @@ void ToolBarManager::RefreshImages() if ( nId > 0 ) { ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); - Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast ); + Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages ); // Try also to query for add-on images before giving up and use an // empty image. if ( !aImage ) - aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast ); + aImage = QueryAddonsImage( aCommandURL, bBigImages ); m_pToolBar->SetItemImage( nId, aImage ); } } @@ -496,6 +470,24 @@ void ToolBarManager::UpdateControllers() { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" ); + if( !m_bCanBeCustomized ) + { + Any a; + Reference< XLayoutManager > xLayoutManager; + Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY ); + if ( xFramePropSet.is() ) + a = xFramePropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))); + a >>= xLayoutManager; + Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY ); + if ( xLayoutManager.is() && xDockable.is() ) + { + ::com::sun::star::awt::Point aPoint; + aPoint.X = aPoint.Y = SAL_MAX_INT32; + xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint ); + xLayoutManager->lockWindow( m_aResourceName ); + } + } + if ( !m_bUpdateControllers ) { m_bUpdateControllers = sal_True; @@ -573,7 +565,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) if ( m_bDisposed ) return; - if ( Event.FeatureURL.Complete.equalsAscii( ".uno:ImageOrientation" )) + if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) ) { SfxImageItem aItem( 1, 0 ); aItem.PutValue( Event.State ); @@ -755,8 +747,8 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u Reference< XNameAccess > xNameAccess; sal_Int16 nImageType = sal_Int16(); sal_Int16 nCurrentImageType = getImageTypeFromBools( - SvtMiscOptions().AreCurrentSymbolsLarge(), - m_bIsHiContrast ); + SvtMiscOptions().AreCurrentSymbolsLarge() + ); if (( Event.aInfo >>= nImageType ) && ( nImageType == nCurrentImageType ) && @@ -1350,13 +1342,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine aProp[i].Value >>= aTooltip; else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN )) aProp[i].Value >>= aLabel; - else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN )) + else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) ) aProp[i].Value >>= nType; - else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_VISIBLE, ITEM_DESCRIPTOR_VISIBLE_LEN )) + else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) ) aProp[i].Value >>= bIsVisible; - else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_WIDTH, ITEM_DESCRIPTOR_WIDTH_LEN )) + else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) ) aProp[i].Value >>= nWidth; - else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_STYLE, ITEM_DESCRIPTOR_STYLE_LEN )) + else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) ) aProp[i].Value >>= nStyle; } @@ -1548,8 +1540,7 @@ void ToolBarManager::RequestImages() } sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); - m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode(); - sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast ); + sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() ); if ( m_xDocImageManager.is() ) aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq ); @@ -1803,6 +1794,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar) // Non-configurable toolbars should disable configuration menu items aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False ); aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False ); } // Disable menu item CLOSE if the toolbar has no closer @@ -1824,10 +1816,8 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar) pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) ); pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL ); pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos, - GetImageFromURL( m_xFrame, - aCommandURL, - sal_False, - m_bIsHiContrast )); + GetImageFromURL( m_xFrame, aCommandURL, sal_False ) + ); } else { @@ -2030,11 +2020,11 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) { for ( sal_Int32 j = 0; j < aProp.getLength(); j++ ) { - if ( aProp[j].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL )) + if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) ) { aProp[j].Value >>= aCommandURL; } - else if ( aProp[j].Name.equalsAscii( ITEM_DESCRIPTOR_VISIBLE )) + else if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) ) { aProp[j].Value >>= bVisible; nVisibleIndex = j; @@ -2123,7 +2113,6 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType ) if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND ) { - // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); } else if ( *pStateChangedType == STATE_CHANGE_VISIBLE ) @@ -2144,7 +2133,6 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { - // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); } @@ -2229,9 +2217,9 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe return 0; } -Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ) +Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages ) { - Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast ); + Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages ); return aImage; } @@ -2354,3 +2342,4 @@ bool ToolBarManager::RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OU +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 05aa69e811..af4cfadb96 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -714,3 +715,5 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCom } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 1156ec4599..03c51c2eb3 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwkresid.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> #include <framework/imageproducer.hxx> @@ -63,22 +62,19 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/image.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <svtools/menuoptions.hxx> #include <unotools/cmdoptions.hxx> #include <dispatch/uieventloghelper.hxx> #include <rtl/logfile.hxx> +#include <svtools/miscopt.hxx> //_________________________________________________________________________________________________________________ // Defines @@ -207,7 +203,7 @@ void ToolbarsMenuController::addCommand( const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); if ( rSettings.GetUseImagesInMenus() ) - aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetHighContrastMode() ); + aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE ); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu ); if ( pPopupMenu ) @@ -228,7 +224,7 @@ Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const Reference< XFrame > xFrame; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; xURLTransformer = m_xURLTransformer; xFrame = m_xFrame; } @@ -273,7 +269,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString& { for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) { - if ( aPropSeq[i].Name.equalsAscii( "Label" )) + if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) )) { aPropSeq[i].Value >>= aStr; break; @@ -337,7 +333,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl aToolBarInfo.aToolBarResName = aResName; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -375,7 +371,10 @@ sal_Bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible() void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + if( SvtMiscOptions().DisableUICustomization() ) + return; + + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); m_aCommandVector.clear(); @@ -476,7 +475,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->checkItem( nIndex, sal_True ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -499,12 +498,12 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } // Create commands for non-toolbars - if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.text.TextDocument" ) || - m_aModuleIdentifier.equalsAscii( "com.sun.star.text.WebDocument" ) || - m_aModuleIdentifier.equalsAscii( "com.sun.star.text.GlobalDocument" ) || - m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) || - m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) || - m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) + if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) || + m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument" ) ) || + m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) || + m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) || + m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) || + m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) )) { addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), aEmptyString ); if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) || @@ -588,7 +587,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev if ( xPopupMenu.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -644,7 +643,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu ); if ( pPopupMenu ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); rtl::OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId )); @@ -747,7 +746,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ToolbarsMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolbarsMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); } } @@ -916,3 +915,5 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInf } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index a68617c40f..8b83f5cd17 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,9 +40,7 @@ #include <uielement/rootitemcontainer.hxx> #include <uielement/toolbarmanager.hxx> -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include <uielement/toolbar.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -59,9 +58,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> @@ -174,7 +171,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th ToolBar* pToolBar = 0; ToolBarManager* pToolBarManager = 0; { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { @@ -351,3 +348,4 @@ void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandl } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 4f07fc5dde..9f7bbcdaa1 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,6 +38,8 @@ #include "properties.h" +#include "helper/mischelper.hxx" + //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ @@ -54,9 +57,7 @@ #include <unotools/configmgr.hxx> #include <tools/string.hxx> -#ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> -#endif #include <comphelper/sequence.hxx> #include <rtl/logfile.hxx> @@ -196,9 +197,10 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ Reference< XNameAccess > m_xGenericUICommands; Reference< XMultiServiceFactory > m_xServiceManager; Reference< XMultiServiceFactory > m_xConfigProvider; - //Reference< XMultiServiceFactory > m_xConfigProviderPopups; Reference< XNameAccess > m_xConfigAccess; + Reference< XContainerListener > m_xConfigListener; Reference< XNameAccess > m_xConfigAccessPopups; + Reference< XContainerListener > m_xConfigAccessListener; Sequence< rtl::OUString > m_aCommandImageList; Sequence< rtl::OUString > m_aCommandRotateImageList; Sequence< rtl::OUString > m_aCommandMirrorImageList; @@ -249,10 +251,10 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() ResetableGuard aLock( m_aLock ); Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->removeContainerListener( this ); + xContainer->removeContainerListener(m_xConfigListener); xContainer = Reference< XContainer >( m_xConfigAccessPopups, UNO_QUERY ); if ( xContainer.is() ) - xContainer->removeContainerListener( this ); + xContainer->removeContainerListener(m_xConfigAccessListener); } @@ -402,7 +404,7 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x { } } - } // if ( m_xConfigAccessPopups.is() ) + } } sal_Bool ConfigurationAccess_UICommand::fillCache() { @@ -566,7 +568,10 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() // Add as container listener Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->addContainerListener( this ); + { + m_xConfigListener = new WeakContainerListener(this); + xContainer->addContainerListener(m_xConfigListener); + } } aPropValue.Value <<= m_aConfigPopupAccess; @@ -577,7 +582,10 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() // Add as container listener Reference< XContainer > xContainer( m_xConfigAccessPopups, UNO_QUERY ); if ( xContainer.is() ) - xContainer->addContainerListener( this ); + { + m_xConfigAccessListener = new WeakContainerListener(this); + xContainer->addContainerListener(m_xConfigAccessListener); + } } return sal_True; @@ -651,7 +659,7 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" ); Reference< XNameAccess > xEmpty; - rtl::OUString aGenericUICommand( ::rtl::OUString::createFromAscii( "GenericCommands" )); + rtl::OUString aGenericUICommand( RTL_CONSTASCII_USTRINGPARAM("GenericCommands") ); m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, xServiceManager ); impl_fillElements("ooSetupFactoryCommandConfigRef"); @@ -800,3 +808,4 @@ throw (::com::sun::star::uno::RuntimeException) } // namespace framework +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index c324284fdc..713449c602 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,9 +45,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -178,11 +177,11 @@ throw ( ::com::sun::star::container::NoSuchElementException, for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) { - if ( Args[n].Name.equalsAscii( "ConfigurationData" )) + if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) )) Args[n].Value >>= aConfigData; - else if ( Args[n].Name.equalsAscii( "Frame" )) + else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) Args[n].Value >>= xFrame; - else if ( Args[n].Name.equalsAscii( "ResourceURL" )) + else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) )) Args[n].Value >>= aResourceURL; } @@ -207,7 +206,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xServiceManager ); xToolBar = Reference< ::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY ); Reference< XInitialization > xInit( xToolBar, UNO_QUERY ); @@ -219,3 +218,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index dc2ff7e78b..2f96a265c0 100755..100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,6 +36,8 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" +#include "helper/mischelper.hxx" + //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ @@ -102,7 +105,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory() Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->removeContainerListener( this ); + xContainer->removeContainerListener(m_xConfigAccessListener); } rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const @@ -268,7 +271,10 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() aLock.unlock(); if ( xContainer.is() ) - xContainer->addContainerListener( this ); + { + m_xConfigAccessListener = new WeakContainerListener(this); + xContainer->addContainerListener(m_xConfigAccessListener); + } } } @@ -339,3 +345,5 @@ sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& return sal_True; } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index e897ce5d24..4ae733e4e1 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,17 +46,13 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> @@ -136,17 +133,17 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) { - if ( Args[n].Name.equalsAscii( "ConfigurationSource" )) + if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ConfigurationSource")) ) Args[n].Value >>= xConfigSource; - else if ( Args[n].Name.equalsAscii( "Frame" )) + else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Frame")) ) Args[n].Value >>= xFrame; - else if ( Args[n].Name.equalsAscii( "ResourceURL" )) + else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")) ) Args[n].Value >>= aResourceURL; - else if ( Args[n].Name.equalsAscii( "Persistent" )) + else if ( Args[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Persistent")) ) Args[n].Value >>= bPersistent; else if ( _pExtraMode && Args[n].Name.equalsAscii( _pExtraMode )) Args[n].Value >>= bExtraMode; - } // for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) + } if ( aResourceURL.indexOf( rtl::OUString::createFromAscii(_pAsciiName)) != 0 ) throw IllegalArgumentException(); @@ -204,9 +201,11 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL aPropSeq[4] <<= aPropValue; } - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XInitialization > xInit( _xMenuBar, UNO_QUERY ); xInit->initialize( aPropSeq ); } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx index 586ada8907..2011f9f368 100644 --- a/framework/source/uifactory/popupmenucontrollerfactory.cxx +++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XMultiS } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx index e11b435d9a..fc2fa1f75a 100644 --- a/framework/source/uifactory/statusbarcontrollerfactory.cxx +++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiS } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 8841b7c577..2fddb309f6 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,9 +46,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -107,3 +106,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 896b6b44db..b56252c3f4 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -260,3 +261,5 @@ throw (RuntimeException) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx index 502ee251df..21bf2ae567 100644 --- a/framework/source/uifactory/toolboxfactory.cxx +++ b/framework/source/uifactory/toolboxfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,9 +45,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPLLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif //_________________________________________________________________________________________________________________ // includes of other projects @@ -103,3 +102,4 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 6579d985eb..ed3889d5dd 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,6 +37,8 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" +#include "helper/mischelper.hxx" + //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ @@ -54,6 +57,7 @@ #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> + //_________________________________________________________________________________________________________________ // Defines //_________________________________________________________________________________________________________________ @@ -114,7 +118,7 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager() Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) - xContainer->removeContainerListener( this ); + xContainer->removeContainerListener(m_xConfigListener); } rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const rtl::OUString& rType, const rtl::OUString& rName, const rtl::OUString& rModule ) const @@ -352,7 +356,10 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() aLock.unlock(); // UNSAFE if ( xContainer.is() ) - xContainer->addContainerListener( this ); + { + m_xConfigListener = new WeakContainerListener(this); + xContainer->addContainerListener(m_xConfigListener); + } } } @@ -545,3 +552,5 @@ throw ( NoSuchElementException, RuntimeException ) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index fb70fdb942..cea43a2a65 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -177,9 +178,9 @@ throw (uno::Exception, uno::RuntimeException) beans::PropertyValue aPropValue; if ( Arguments[i] >>= aPropValue ) { - if ( aPropValue.Name.equalsAscii( "Frame" )) + if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) aPropValue.Value >>= xFrame; - else if ( aPropValue.Name.equalsAscii( "ResourceURL" )) + else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) )) aPropValue.Value >>= aResourceURL; } } @@ -264,3 +265,5 @@ throw (uno::Exception, uno::RuntimeException) } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml index f927434590..081c7cb05f 100644 --- a/framework/source/unotypes/fwk.xml +++ b/framework/source/unotypes/fwk.xml @@ -106,7 +106,7 @@ <name> com.sun.star.comp.framework.ServiceHandler </name> <description> It's a special dispatch object which is registered for "service:*" URL pattern - and will be automaticly used by the framework dispatch mechanism if such URL occured. + and will be automaticly used by the framework dispatch mechanism if such URL occurred. His job is to create any registered uno components which must be coded inside dispatched URL (may with some optional given parameters). After that such created service must be hold his self alive. Such mechanism can be usefull for UI components @@ -123,7 +123,7 @@ <name> com.sun.star.comp.framework.JobHandler </name> <description> It's a special dispatch object which is registered for "vnd.sun.star.job:*" URL pattern - and will be automaticly used by the framework dispatch mechanism if such URL occured. + and will be automaticly used by the framework dispatch mechanism if such URL occurred. It binds the dispatch mechanism to the generic job execution of this framework module. That can be used for e.g. addon purposes. </description> @@ -430,7 +430,6 @@ <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> @@ -444,7 +443,6 @@ <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> diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml index f91b01c22c..613fcee878 100644 --- a/framework/source/unotypes/fwl.xml +++ b/framework/source/unotypes/fwl.xml @@ -82,7 +82,6 @@ <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> @@ -90,7 +89,6 @@ <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> diff --git a/framework/source/unotypes/lgd.xml b/framework/source/unotypes/lgd.xml index d62a77c6c0..a3256a7940 100644 --- a/framework/source/unotypes/lgd.xml +++ b/framework/source/unotypes/lgd.xml @@ -19,14 +19,12 @@ <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> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 8ab3a1bc0e..5ddfa4d6b4 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ //_______________________________________________ // own includes -#ifndef __FRAMEWORK_ACCELERATORCONST_H_ #include <acceleratorconst.h> -#endif //_______________________________________________ // interface includes @@ -59,7 +58,7 @@ namespace framework{ structure was detected. This macro combined the given comment with a generic - way to find out the XML line (where the error occured) + way to find out the XML line (where the error occurred) to format a suitable message. @param COMMENT @@ -336,3 +335,5 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index f08a7c324d..3b1ffb8d95 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,16 +136,16 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt: pAttribs->AddAttribute(AL_ATTRIBUTE_URL , ATTRIBUTE_TYPE_CDATA, sCommand); if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); xConfig->ignorableWhitespace(::rtl::OUString()); xConfig->startElement(AL_ELEMENT_ITEM, xAttribs); @@ -154,3 +155,5 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt: } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |