tdf#123936 Formatting files in module framework with clang-format

Change-Id: I8210a1d4bb51519f59265f370f5e8bab8a3c4179
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105674
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Philipp Hofer
2020-11-13 15:18:12 +01:00
committed by Christian Lohmaier
parent 951764106e
commit 49494bb703
13 changed files with 132 additions and 161 deletions
+8 -7
View File
@@ -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
+6 -6
View File
@@ -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
+10 -8
View File
@@ -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 {}
};
+31 -29
View File
@@ -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;
@@ -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
+1 -4
View File
@@ -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: */
@@ -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: */
+4 -12
View File
@@ -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: */
+12 -15
View File
@@ -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());
+14 -13
View File
@@ -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;
@@ -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);
};
+19 -22
View File
@@ -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: */
-12
View File
@@ -4555,12 +4555,10 @@ framework/inc/helper/titlebarupdate.hxx
framework/inc/helper/uiconfigelementwrapperbase.hxx
framework/inc/helper/uielementwrapperbase.hxx
framework/inc/helper/vclstatusindicator.hxx
framework/inc/helper/wakeupthread.hxx
framework/inc/interaction/quietinteraction.hxx
framework/inc/jobs/configaccess.hxx
framework/inc/jobs/helponstartup.hxx
framework/inc/jobs/job.hxx
framework/inc/jobs/jobconst.hxx
framework/inc/jobs/jobdata.hxx
framework/inc/jobs/jobresult.hxx
framework/inc/jobs/joburl.hxx
@@ -4573,7 +4571,6 @@ framework/inc/recording/dispatchrecordersupplier.hxx
framework/inc/services.h
framework/inc/services/layoutmanager.hxx
framework/inc/services/mediatypedetectionhelper.hxx
framework/inc/services/uriabbreviation.hxx
framework/inc/statusbarconfiguration.hxx
framework/inc/stdtypes.h
framework/inc/targets.h
@@ -4645,14 +4642,12 @@ framework/source/accelerators/keymapping.cxx
framework/source/accelerators/moduleacceleratorconfiguration.cxx
framework/source/accelerators/presethandler.cxx
framework/source/accelerators/storageholder.cxx
framework/source/classes/framecontainer.cxx
framework/source/classes/taskcreator.cxx
framework/source/dispatch/closedispatcher.cxx
framework/source/dispatch/dispatchdisabler.cxx
framework/source/dispatch/dispatchinformationprovider.cxx
framework/source/dispatch/dispatchprovider.cxx
framework/source/dispatch/interceptionhelper.cxx
framework/source/dispatch/isstartmoduledispatch.hxx
framework/source/dispatch/loaddispatcher.cxx
framework/source/dispatch/mailtodispatcher.cxx
framework/source/dispatch/oxt_handler.cxx
@@ -4667,7 +4662,6 @@ framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
framework/source/fwe/classes/addonmenu.cxx
framework/source/fwe/classes/addonsoptions.cxx
framework/source/fwe/classes/framelistanalyzer.cxx
framework/source/fwe/classes/fwkresid.cxx
framework/source/fwe/classes/imagewrapper.cxx
framework/source/fwe/classes/rootactiontriggercontainer.cxx
framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -4683,13 +4677,11 @@ framework/source/fwe/xml/menudocumenthandler.cxx
framework/source/fwe/xml/saxnamespacefilter.cxx
framework/source/fwe/xml/statusbarconfiguration.cxx
framework/source/fwe/xml/statusbardocumenthandler.cxx
framework/source/fwe/xml/toolboxconfiguration.cxx
framework/source/fwe/xml/toolboxdocumenthandler.cxx
framework/source/fwe/xml/xmlnamespaces.cxx
framework/source/fwi/classes/converter.cxx
framework/source/fwi/classes/protocolhandlercache.cxx
framework/source/fwi/helper/mischelper.cxx
framework/source/fwi/helper/shareablemutex.cxx
framework/source/fwi/jobs/configaccess.cxx
framework/source/fwi/threadhelp/transactionmanager.cxx
framework/source/fwi/uielement/constitemcontainer.cxx
@@ -4700,7 +4692,6 @@ framework/source/helper/ocomponentaccess.cxx
framework/source/helper/ocomponentenumeration.cxx
framework/source/helper/oframes.cxx
framework/source/helper/persistentwindowstate.cxx
framework/source/helper/statusindicator.cxx
framework/source/helper/statusindicatorfactory.cxx
framework/source/helper/tagwindowasmodified.cxx
framework/source/helper/titlebarupdate.cxx
@@ -4728,7 +4719,6 @@ framework/source/jobs/job.cxx
framework/source/jobs/jobdata.cxx
framework/source/jobs/jobdispatch.cxx
framework/source/jobs/jobexecutor.cxx
framework/source/jobs/jobresult.cxx
framework/source/jobs/joburl.cxx
framework/source/jobs/shelljob.cxx
framework/source/layoutmanager/helpers.cxx
@@ -4754,7 +4744,6 @@ framework/source/services/taskcreatorsrv.cxx
framework/source/services/uriabbreviation.cxx
framework/source/services/urltransformer.cxx
framework/source/uiconfiguration/CommandImageResolver.cxx
framework/source/uiconfiguration/CommandImageResolver.hxx
framework/source/uiconfiguration/ImageList.cxx
framework/source/uiconfiguration/ImageList.hxx
framework/source/uiconfiguration/globalsettings.cxx
@@ -4821,7 +4810,6 @@ framework/source/uifactory/uielementfactorymanager.cxx
framework/source/uifactory/windowcontentfactorymanager.cxx
framework/source/xml/acceleratorconfigurationreader.cxx
framework/source/xml/acceleratorconfigurationwriter.cxx
framework/source/xml/imagesconfiguration.cxx
framework/source/xml/imagesdocumenthandler.cxx
helpcompiler/inc/BasCodeTagger.hxx
helpcompiler/inc/HelpCompiler.hxx