diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-18 08:15:47 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-18 08:16:18 +0200 |
commit | 88f12d9c7e58a3465f4d9a50fafb9e47fe67c537 (patch) | |
tree | 460c83b0782b88d7e42cdadc09c71daa3c8b85bc /filter | |
parent | 2861d5bedcc1c4f57c69faf86c5b18ce15049d06 (diff) |
Some oslCondition -> osl::Condition
Change-Id: I57c10b14cd8a5ab821516575768891b66f834ca6
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 95a514c4ee69..c9ba40a314ba 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -24,7 +24,7 @@ #include <sax/tools/documenthandleradapter.hxx> #include <osl/time.h> -#include <osl/conditn.h> +#include <osl/conditn.hxx> #include <rtl/strbuf.hxx> #include <tools/urlobj.hxx> @@ -110,7 +110,7 @@ namespace XSLT css::uno::Reference<xslt::XXSLTTransformer> m_tcontrol; - oslCondition m_cTransformed; + osl::Condition m_cTransformed; bool m_bTerminated; bool m_bError; @@ -128,8 +128,6 @@ namespace XSLT // ctor... XSLTFilter(const css::uno::Reference<XComponentContext> &r); - virtual ~XSLTFilter(); - // XStreamListener virtual void SAL_CALL error(const Any& a) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -162,14 +160,7 @@ namespace XSLT XSLTFilter::XSLTFilter(const css::uno::Reference<XComponentContext> &r): m_xContext(r), m_bTerminated(false), m_bError(false) - { - m_cTransformed = osl_createCondition(); - } - - XSLTFilter::~XSLTFilter() - { - osl_destroyCondition(m_cTransformed); - } + {} void XSLTFilter::disposing(const EventObject&) throw (RuntimeException, std::exception) @@ -233,7 +224,7 @@ namespace XSLT void XSLTFilter::started() throw (RuntimeException, std::exception) { - osl_resetCondition(m_cTransformed); + m_cTransformed.reset(); } void XSLTFilter::error(const Any& a) throw (RuntimeException, std::exception) @@ -244,18 +235,18 @@ namespace XSLT SAL_WARN("filter.xslt", "XSLTFilter::error was called: " << e.Message); } m_bError = true; - osl_setCondition(m_cTransformed); + m_cTransformed.set(); } void XSLTFilter::closed() throw (RuntimeException, std::exception) { - osl_setCondition(m_cTransformed); + m_cTransformed.set(); } void XSLTFilter::terminated() throw (RuntimeException, std::exception) { m_bTerminated = true; - osl_setCondition(m_cTransformed); + m_cTransformed.set(); } OUString @@ -370,8 +361,8 @@ namespace XSLT // transform m_tcontrol->start(); TimeValue timeout = { TRANSFORMATION_TIMEOUT_SEC, 0}; - oslConditionResult result(osl_waitCondition(m_cTransformed, &timeout)); - while (osl_cond_result_timeout == result) { + osl::Condition::Result result(m_cTransformed.wait(&timeout)); + while (osl::Condition::result_timeout == result) { if (xInterActionHandler.is()) { Sequence<Any> excArgs(0); ::com::sun::star::ucb::InteractiveAugmentedIOException exc( @@ -391,10 +382,10 @@ namespace XSLT xInterActionHandler->handle(xRequest); if (pAbort->wasSelected()) { m_bError = true; - osl_setCondition(m_cTransformed); + m_cTransformed.set(); } } - result = osl_waitCondition(m_cTransformed, &timeout); + result = m_cTransformed.wait(&timeout); }; if (!m_bError) { xSaxParser->parseStream(aInput); @@ -528,7 +519,7 @@ namespace XSLT { ExtendedDocumentHandlerAdapter::endDocument(); // wait for the transformer to finish - osl_waitCondition(m_cTransformed, 0); + m_cTransformed.wait(); m_tcontrol->terminate(); if (!m_bError && !m_bTerminated) { |