diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/helper/wakeupthread.hxx | 15 | ||||
-rw-r--r-- | framework/inc/jobs/jobconst.hxx | 12 | ||||
-rw-r--r-- | framework/inc/services/uriabbreviation.hxx | 18 | ||||
-rw-r--r-- | framework/source/classes/framecontainer.cxx | 60 | ||||
-rw-r--r-- | framework/source/dispatch/isstartmoduledispatch.hxx | 8 | ||||
-rw-r--r-- | framework/source/fwe/classes/fwkresid.cxx | 5 | ||||
-rw-r--r-- | framework/source/fwe/xml/toolboxconfiguration.cxx | 44 | ||||
-rw-r--r-- | framework/source/fwi/helper/shareablemutex.cxx | 16 | ||||
-rw-r--r-- | framework/source/helper/statusindicator.cxx | 27 | ||||
-rw-r--r-- | framework/source/jobs/jobresult.cxx | 27 | ||||
-rw-r--r-- | framework/source/uiconfiguration/CommandImageResolver.hxx | 8 | ||||
-rw-r--r-- | framework/source/xml/imagesconfiguration.cxx | 41 |
12 files changed, 132 insertions, 149 deletions
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index 51cf859f0462..49f268a821e8 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -28,13 +28,15 @@ #include <osl/mutex.hxx> #include <salhelper/thread.hxx> -namespace com::sun::star::util { - class XUpdatable; +namespace com::sun::star::util +{ +class XUpdatable; } -namespace framework{ - -class WakeUpThread final : public salhelper::Thread { +namespace framework +{ +class WakeUpThread final : public salhelper::Thread +{ css::uno::WeakReference<css::util::XUpdatable> updatable_; osl::Condition condition_; @@ -44,11 +46,10 @@ class WakeUpThread final : public salhelper::Thread { void execute() override; public: - WakeUpThread(css::uno::Reference<css::util::XUpdatable> const & updatable); + WakeUpThread(css::uno::Reference<css::util::XUpdatable> const& updatable); void stop(); }; - } #endif diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index b2efb749e3a9..31a504a9d360 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -22,8 +22,8 @@ #include <rtl/ustring.hxx> -namespace framework{ - +namespace framework +{ /** @short defines all constant values used within a job environment. @@ -34,10 +34,10 @@ namespace framework{ */ class JobConst { - public: - static constexpr OUStringLiteral ANSWER_DEACTIVATE_JOB = u"Deactivate"; - static constexpr OUStringLiteral ANSWER_SAVE_ARGUMENTS = u"SaveArguments"; - static constexpr OUStringLiteral ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult"; +public: + static constexpr OUStringLiteral ANSWER_DEACTIVATE_JOB = u"Deactivate"; + static constexpr OUStringLiteral ANSWER_SAVE_ARGUMENTS = u"SaveArguments"; + static constexpr OUStringLiteral ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult"; }; } // namespace framework diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index 200296da2df9..f4e3ef10dc4b 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -28,23 +28,25 @@ namespace framework { - -class UriAbbreviation final : public ::cppu::WeakImplHelper< css::util::XStringAbbreviation, css::lang::XServiceInfo> +class UriAbbreviation final + : public ::cppu::WeakImplHelper<css::util::XStringAbbreviation, css::lang::XServiceInfo> { public: - explicit UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & context); + explicit UriAbbreviation(css::uno::Reference<css::uno::XComponentContext> const& context); /* interface XServiceInfo */ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::util::XStringAbbreviation: - virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) override; + virtual OUString SAL_CALL + abbreviateString(const css::uno::Reference<css::util::XStringWidth>& xStringWidth, + ::sal_Int32 nWidth, const OUString& aString) override; private: - UriAbbreviation(UriAbbreviation const &) = delete; - UriAbbreviation& operator =(UriAbbreviation const &) = delete; + UriAbbreviation(UriAbbreviation const&) = delete; + UriAbbreviation& operator=(UriAbbreviation const&) = delete; virtual ~UriAbbreviation() override {} }; diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index d07697cbe8ef..4063ed938001 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -25,8 +25,8 @@ #include <comphelper/sequence.hxx> #include <sal/log.hxx> -namespace framework{ - +namespace framework +{ /**-*************************************************************************************************************** @short initialize an empty container @descr The container will be empty then - special features (e.g. the async quit mechanism) are disabled. @@ -64,12 +64,12 @@ FrameContainer::~FrameContainer() @threadsafe yes *****************************************************************************************************************/ -void FrameContainer::append( const css::uno::Reference< css::frame::XFrame >& xFrame ) +void FrameContainer::append(const css::uno::Reference<css::frame::XFrame>& xFrame) { - if (xFrame.is() && ! exist(xFrame)) + if (xFrame.is() && !exist(xFrame)) { SolarMutexGuard g; - m_aContainer.push_back( xFrame ); + m_aContainer.push_back(xFrame); } } @@ -84,17 +84,18 @@ void FrameContainer::append( const css::uno::Reference< css::frame::XFrame >& xF @threadsafe yes *****************************************************************************************************************/ -void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) +void FrameContainer::remove(const css::uno::Reference<css::frame::XFrame>& xFrame) { SolarMutexGuard g; - TFrameContainer::iterator aSearchedItem = ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ); - if (aSearchedItem!=m_aContainer.end()) + TFrameContainer::iterator aSearchedItem + = ::std::find(m_aContainer.begin(), m_aContainer.end(), xFrame); + if (aSearchedItem != m_aContainer.end()) { - m_aContainer.erase( aSearchedItem ); + m_aContainer.erase(aSearchedItem); // If removed frame was the current active frame - reset state variable. - if (m_xActiveFrame==xFrame) + if (m_xActiveFrame == xFrame) m_xActiveFrame.clear(); } } @@ -109,10 +110,10 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF @threadsafe yes *****************************************************************************************************************/ -bool FrameContainer::exist( const css::uno::Reference< css::frame::XFrame >& xFrame ) const +bool FrameContainer::exist(const css::uno::Reference<css::frame::XFrame>& xFrame) const { SolarMutexGuard g; - return( ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ) != m_aContainer.end() ); + return (::std::find(m_aContainer.begin(), m_aContainer.end(), xFrame) != m_aContainer.end()); } /**-*************************************************************************************************************** @@ -157,22 +158,21 @@ sal_uInt32 FrameContainer::getCount() const @threadsafe yes *****************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32 nIndex ) const +css::uno::Reference<css::frame::XFrame> FrameContainer::operator[](sal_uInt32 nIndex) const { - - css::uno::Reference< css::frame::XFrame > xFrame; + css::uno::Reference<css::frame::XFrame> xFrame; try { // Get element form container WITH automatic test of ranges! // If index not valid, an out_of_range exception is thrown. SolarMutexGuard g; - xFrame = m_aContainer.at( nIndex ); + xFrame = m_aContainer.at(nIndex); } - catch( const std::out_of_range& ) + catch (const std::out_of_range&) { // The index is not valid for current container-content - we must handle this case! // We can return the default value ... - SAL_INFO( "fwk", "FrameContainer::operator[]: Exception caught: std::out_of_range" ); + SAL_INFO("fwk", "FrameContainer::operator[]: Exception caught: std::out_of_range"); } return xFrame; } @@ -185,7 +185,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32 @threadsafe yes *****************************************************************************************************************/ -css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > FrameContainer::getAllElements() const +css::uno::Sequence<css::uno::Reference<css::frame::XFrame>> FrameContainer::getAllElements() const { SolarMutexGuard g; return comphelper::containerToSequence(m_aContainer); @@ -201,9 +201,9 @@ css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > FrameContainer:: @threadsafe yes *****************************************************************************************************************/ -void FrameContainer::setActive( const css::uno::Reference< css::frame::XFrame >& xFrame ) +void FrameContainer::setActive(const css::uno::Reference<css::frame::XFrame>& xFrame) { - if ( !xFrame.is() || exist(xFrame) ) + if (!xFrame.is() || exist(xFrame)) { SolarMutexGuard g; m_xActiveFrame = xFrame; @@ -220,7 +220,7 @@ void FrameContainer::setActive( const css::uno::Reference< css::frame::XFrame >& @threadsafe yes *****************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const +css::uno::Reference<css::frame::XFrame> FrameContainer::getActive() const { SolarMutexGuard g; return m_xActiveFrame; @@ -237,22 +237,23 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::getActive() const @threadsafe yes *****************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( const OUString& sName ) const +css::uno::Reference<css::frame::XFrame> +FrameContainer::searchOnAllChildrens(const OUString& sName) const { SolarMutexGuard g; // Step over all child frames. But if direct child isn't the right one search on his children first - before // you go to next direct child of this container! - css::uno::Reference< css::frame::XFrame > xSearchedFrame; + css::uno::Reference<css::frame::XFrame> xSearchedFrame; for (auto const& container : m_aContainer) { - if (container->getName()==sName) + if (container->getName() == sName) { xSearchedFrame = container; break; } else { - xSearchedFrame = container->findFrame( sName, css::frame::FrameSearchFlag::CHILDREN ); + xSearchedFrame = container->findFrame(sName, css::frame::FrameSearchFlag::CHILDREN); if (xSearchedFrame.is()) break; } @@ -271,13 +272,14 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( @threadsafe yes *****************************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildrens( const OUString& sName ) const +css::uno::Reference<css::frame::XFrame> +FrameContainer::searchOnDirectChildrens(const OUString& sName) const { SolarMutexGuard g; - css::uno::Reference< css::frame::XFrame > xSearchedFrame; + css::uno::Reference<css::frame::XFrame> xSearchedFrame; for (auto const& container : m_aContainer) { - if (container->getName()==sName) + if (container->getName() == sName) { xSearchedFrame = container; break; diff --git a/framework/source/dispatch/isstartmoduledispatch.hxx b/framework/source/dispatch/isstartmoduledispatch.hxx index 1ae23e7c8704..e48c84d744bb 100644 --- a/framework/source/dispatch/isstartmoduledispatch.hxx +++ b/framework/source/dispatch/isstartmoduledispatch.hxx @@ -22,12 +22,12 @@ #include <com/sun/star/util/URL.hpp> -namespace framework { - -inline bool isStartModuleDispatch(css::util::URL const & url) { +namespace framework +{ +inline bool isStartModuleDispatch(css::util::URL const& url) +{ return url.Complete == ".uno:ShowStartModule"; } - } #endif diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index b6dcaecff893..00bc8232370f 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -20,9 +20,6 @@ #include <classes/fwkresid.hxx> #include <unotools/resmgr.hxx> -OUString FwkResId(const char* pId) -{ - return Translate::get(pId, Translate::Create("fwk")); -} +OUString FwkResId(const char* pId) { return Translate::get(pId, Translate::Create("fwk")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 7eb068357ddc..d9e34baabc98 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -35,13 +35,12 @@ using namespace ::com::sun::star::container; namespace framework { - bool ToolBoxConfiguration::LoadToolBox( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::io::XInputStream >& rInputStream, - const css::uno::Reference< css::container::XIndexContainer >& rToolbarConfiguration ) + const css::uno::Reference<css::uno::XComponentContext>& rxContext, + const css::uno::Reference<css::io::XInputStream>& rInputStream, + const css::uno::Reference<css::container::XIndexContainer>& rToolbarConfiguration) { - Reference< XParser > xParser = Parser::create(rxContext); + Reference<XParser> xParser = Parser::create(rxContext); // connect stream to input stream to the parser InputSource aInputSource; @@ -49,60 +48,59 @@ bool ToolBoxConfiguration::LoadToolBox( aInputSource.aInputStream = rInputStream; // create namespace filter and set menudocument handler inside to support xml namespaces - Reference< XDocumentHandler > xDocHandler( new OReadToolBoxDocumentHandler( rToolbarConfiguration )); - Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler )); + Reference<XDocumentHandler> xDocHandler(new OReadToolBoxDocumentHandler(rToolbarConfiguration)); + Reference<XDocumentHandler> xFilter(new SaxNamespaceFilter(xDocHandler)); // connect parser and filter - xParser->setDocumentHandler( xFilter ); + xParser->setDocumentHandler(xFilter); try { - xParser->parseStream( aInputSource ); + xParser->parseStream(aInputSource); return true; } - catch ( const RuntimeException& ) + catch (const RuntimeException&) { return false; } - catch( const SAXException& ) + catch (const SAXException&) { return false; } - catch( const css::io::IOException& ) + catch (const css::io::IOException&) { return false; } } bool ToolBoxConfiguration::StoreToolBox( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::io::XOutputStream >& rOutputStream, - const css::uno::Reference< css::container::XIndexAccess >& rToolbarConfiguration ) + const css::uno::Reference<css::uno::XComponentContext>& rxContext, + const css::uno::Reference<css::io::XOutputStream>& rOutputStream, + const css::uno::Reference<css::container::XIndexAccess>& rToolbarConfiguration) { - Reference< XWriter > xWriter = Writer::create(rxContext); - xWriter->setOutputStream( rOutputStream ); + Reference<XWriter> xWriter = Writer::create(rxContext); + xWriter->setOutputStream(rOutputStream); try { - Reference< XDocumentHandler > xHandler( xWriter, UNO_QUERY_THROW ); - OWriteToolBoxDocumentHandler aWriteToolBoxDocumentHandler( rToolbarConfiguration, xHandler ); + Reference<XDocumentHandler> xHandler(xWriter, UNO_QUERY_THROW); + OWriteToolBoxDocumentHandler aWriteToolBoxDocumentHandler(rToolbarConfiguration, xHandler); aWriteToolBoxDocumentHandler.WriteToolBoxDocument(); return true; } - catch ( const RuntimeException& ) + catch (const RuntimeException&) { return false; } - catch ( const SAXException& ) + catch (const SAXException&) { return false; } - catch ( const css::io::IOException& ) + catch (const css::io::IOException&) { return false; } } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwi/helper/shareablemutex.cxx b/framework/source/fwi/helper/shareablemutex.cxx index fba41f2b952e..cd3b6bd18ddb 100644 --- a/framework/source/fwi/helper/shareablemutex.cxx +++ b/framework/source/fwi/helper/shareablemutex.cxx @@ -21,20 +21,19 @@ namespace framework { - ShareableMutex::ShareableMutex() { m_pMutexRef = new MutexRef; m_pMutexRef->acquire(); } -ShareableMutex::ShareableMutex( const ShareableMutex& rShareableMutex ) +ShareableMutex::ShareableMutex(const ShareableMutex& rShareableMutex) { m_pMutexRef = rShareableMutex.m_pMutexRef; m_pMutexRef->acquire(); } -ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex ) +ShareableMutex& ShareableMutex::operator=(const ShareableMutex& rShareableMutex) { rShareableMutex.m_pMutexRef->acquire(); m_pMutexRef->release(); @@ -42,16 +41,9 @@ ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex return *this; } -void ShareableMutex::acquire() -{ - m_pMutexRef->m_oslMutex.acquire(); -} - -void ShareableMutex::release() -{ - m_pMutexRef->m_oslMutex.release(); -} +void ShareableMutex::acquire() { m_pMutexRef->m_oslMutex.acquire(); } +void ShareableMutex::release() { m_pMutexRef->m_oslMutex.release(); } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 25d67694c5df..2073b8e68d9d 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -20,8 +20,8 @@ #include <comphelper/lok.hxx> #include <helper/statusindicator.hxx> -namespace framework{ - +namespace framework +{ StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory) : m_xFactory(pFactory) , m_nRange(100) @@ -29,12 +29,9 @@ StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory) { } -StatusIndicator::~StatusIndicator() -{ -} +StatusIndicator::~StatusIndicator() {} -void SAL_CALL StatusIndicator::start(const OUString& sText , - sal_Int32 nRange) +void SAL_CALL StatusIndicator::start(const OUString& sText, sal_Int32 nRange) { if (comphelper::LibreOfficeKit::isActive()) { @@ -44,14 +41,14 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , comphelper::LibreOfficeKit::statusIndicatorStart(); } #if !defined(IOS) && !defined(ANDROID) - css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); + css::uno::Reference<css::task::XStatusIndicatorFactory> xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->start(this, sText, nRange); } #else - (void) sText; + (void)sText; #endif } @@ -62,7 +59,7 @@ void SAL_CALL StatusIndicator::end() comphelper::LibreOfficeKit::statusIndicatorFinish(); } #if !defined(IOS) && !defined(ANDROID) - css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); + css::uno::Reference<css::task::XStatusIndicatorFactory> xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); @@ -76,7 +73,7 @@ void SAL_CALL StatusIndicator::reset() if (comphelper::LibreOfficeKit::isActive()) return; #if !defined(IOS) && !defined(ANDROID) - css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); + css::uno::Reference<css::task::XStatusIndicatorFactory> xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); @@ -90,14 +87,14 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText) if (comphelper::LibreOfficeKit::isActive()) return; #if !defined(IOS) && !defined(ANDROID) - css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); + css::uno::Reference<css::task::XStatusIndicatorFactory> xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->setText(this, sText); } #else - (void) sText; + (void)sText; #endif } @@ -107,7 +104,7 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) { if (m_nRange > 0) { - int nPercent = (100*nValue)/m_nRange; + int nPercent = (100 * nValue) / m_nRange; if (nPercent >= m_nLastCallbackPercent) { comphelper::LibreOfficeKit::statusIndicatorSetValue(nPercent); @@ -117,7 +114,7 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) return; } #if !defined(IOS) && !defined(ANDROID) - css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); + css::uno::Reference<css::task::XStatusIndicatorFactory> xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 4205d5e92086..58cd2b59401c 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -24,8 +24,8 @@ #include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequence.hxx> -namespace framework{ - +namespace framework +{ /** @short special ctor @descr It initialize this new instance with a pure job execution result @@ -69,7 +69,7 @@ namespace framework{ @param aResult the job result */ -JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) +JobResult::JobResult(/*IN*/ const css::uno::Any& aResult) { // reset the flag mask! // It will reset the accessible state of this object. @@ -78,10 +78,11 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) // analyze the result and update our other members ::comphelper::SequenceAsHashMap aProtocol(aResult); - if ( aProtocol.empty() ) + if (aProtocol.empty()) return; - ::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB); + ::comphelper::SequenceAsHashMap::const_iterator pIt + = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB); if (pIt != aProtocol.end()) { /** @@ -116,10 +117,10 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) /** @short copy dtor */ -JobResult::JobResult( const JobResult& rCopy ) +JobResult::JobResult(const JobResult& rCopy) { - m_eParts = rCopy.m_eParts; - m_lArguments = rCopy.m_lArguments; + m_eParts = rCopy.m_eParts; + m_lArguments = rCopy.m_lArguments; m_aDispatchResult = rCopy.m_aDispatchResult; } @@ -139,11 +140,11 @@ JobResult::~JobResult() @param rCopy reference to the other instance, which should be used for copying. */ -JobResult& JobResult::operator=( const JobResult& rCopy ) +JobResult& JobResult::operator=(const JobResult& rCopy) { SolarMutexGuard g; - m_eParts = rCopy.m_eParts; - m_lArguments = rCopy.m_lArguments; + m_eParts = rCopy.m_eParts; + m_lArguments = rCopy.m_lArguments; m_aDispatchResult = rCopy.m_aDispatchResult; return *this; } @@ -160,7 +161,7 @@ JobResult& JobResult::operator=( const JobResult& rCopy ) @return We return true only, if any set flag of the given mask match. */ -bool JobResult::existPart( sal_uInt32 eParts ) const +bool JobResult::existPart(sal_uInt32 eParts) const { SolarMutexGuard g; return ((m_eParts & eParts) == eParts); @@ -174,7 +175,7 @@ bool JobResult::existPart( sal_uInt32 eParts ) const @return It returns the state of the internal member without any checks! */ -std::vector< css::beans::NamedValue > JobResult::getArguments() const +std::vector<css::beans::NamedValue> JobResult::getArguments() const { SolarMutexGuard g; return m_lArguments; diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx b/framework/source/uiconfiguration/CommandImageResolver.hxx index fe9a4ed958fe..d79274304b2f 100644 --- a/framework/source/uiconfiguration/CommandImageResolver.hxx +++ b/framework/source/uiconfiguration/CommandImageResolver.hxx @@ -23,11 +23,10 @@ namespace vcl { - class CommandImageResolver final { private: - typedef std::unordered_map<OUString, OUString > CommandToImageNameMap; + typedef std::unordered_map<OUString, OUString> CommandToImageNameMap; CommandToImageNameMap m_aCommandToImageNameMap; std::vector<OUString> m_aImageCommandNameVector; @@ -45,10 +44,7 @@ public: void registerCommands(css::uno::Sequence<OUString>& aCommandSequence); Image getImageFromCommandURL(ImageType nImageType, const OUString& rCommandURL); - std::vector<OUString>& getCommandNames() - { - return m_aImageCommandNameVector; - } + std::vector<OUString>& getCommandNames() { return m_aImageCommandNameVector; } bool hasImage(const OUString& rCommandURL); }; diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 5c31414c78cb..6b4773c21685 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -35,13 +35,11 @@ using namespace ::com::sun::star::io; namespace framework { - bool ImagesConfiguration::LoadImages( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::io::XInputStream >& rInputStream, - ImageItemDescriptorList& rItems ) + const css::uno::Reference<css::uno::XComponentContext>& rxContext, + const css::uno::Reference<css::io::XInputStream>& rInputStream, ImageItemDescriptorList& rItems) { - Reference< XParser > xParser = Parser::create( rxContext ); + Reference<XParser> xParser = Parser::create(rxContext); // connect stream to input stream to the parser InputSource aInputSource; @@ -49,59 +47,58 @@ bool ImagesConfiguration::LoadImages( aInputSource.aInputStream = rInputStream; // create namespace filter and set document handler inside to support xml namespaces - Reference< XDocumentHandler > xDocHandler( new OReadImagesDocumentHandler( rItems )); - Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler )); + Reference<XDocumentHandler> xDocHandler(new OReadImagesDocumentHandler(rItems)); + Reference<XDocumentHandler> xFilter(new SaxNamespaceFilter(xDocHandler)); // connect parser and filter - xParser->setDocumentHandler( xFilter ); + xParser->setDocumentHandler(xFilter); try { - xParser->parseStream( aInputSource ); + xParser->parseStream(aInputSource); return true; } - catch ( const RuntimeException& ) + catch (const RuntimeException&) { return false; } - catch( const SAXException& ) + catch (const SAXException&) { return false; } - catch( const css::io::IOException& ) + catch (const css::io::IOException&) { return false; } } bool ImagesConfiguration::StoreImages( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::io::XOutputStream >& rOutputStream, - const ImageItemDescriptorList& rItems ) + const css::uno::Reference<css::uno::XComponentContext>& rxContext, + const css::uno::Reference<css::io::XOutputStream>& rOutputStream, + const ImageItemDescriptorList& rItems) { - Reference< XWriter > xWriter = Writer::create(rxContext); - xWriter->setOutputStream( rOutputStream ); + Reference<XWriter> xWriter = Writer::create(rxContext); + xWriter->setOutputStream(rOutputStream); try { - OWriteImagesDocumentHandler aWriteImagesDocumentHandler( rItems, xWriter ); + OWriteImagesDocumentHandler aWriteImagesDocumentHandler(rItems, xWriter); aWriteImagesDocumentHandler.WriteImagesDocument(); return true; } - catch ( const RuntimeException& ) + catch (const RuntimeException&) { return false; } - catch ( const SAXException& ) + catch (const SAXException&) { return false; } - catch ( const css::io::IOException& ) + catch (const css::io::IOException&) { return false; } } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |