diff options
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 3 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index e93fe9638c65..2ed8c1032e6d 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -39,6 +39,7 @@ #include <oox/ole/vbaproject.hxx> #include <ooxml/OOXMLDocument.hxx> #include <unotools/mediadescriptor.hxx> +#include <rtl/ref.hxx> using namespace ::com::sun::star; @@ -158,7 +159,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc try { // use the oox.core.FilterDetect implementation to extract the decrypted ZIP package - uno::Reference<::oox::core::FilterDetect> xDetector(new ::oox::core::FilterDetect(m_xContext)); + rtl::Reference<::oox::core::FilterDetect> xDetector(new ::oox::core::FilterDetect(m_xContext)); xInputStream = xDetector->extractUnencryptedPackage(aMediaDesc); } catch (uno::Exception&) diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index 36695026d248..715b8a2fa122 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -42,6 +42,8 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler( { } +OOXMLFastDocumentHandler::~OOXMLFastDocumentHandler() {} + // css::xml::sax::XFastContextHandler: void SAL_CALL OOXMLFastDocumentHandler::startFastElement (::sal_Int32 @@ -115,7 +117,7 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception) #endif } -uno::Reference< OOXMLFastContextHandler > +rtl::Reference< OOXMLFastContextHandler > OOXMLFastDocumentHandler::getContextHandler() const { if (!mxContextHandler.is()) diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index 6514ef0de282..c104db71df63 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> #include <dmapper/resourcemodel.hxx> #include <ooxml/OOXMLDocument.hxx> +#include <rtl/ref.hxx> #include "OOXMLParserState.hxx" namespace writerfilter { @@ -41,7 +42,7 @@ public: Stream* pStream, OOXMLDocumentImpl* pDocument, sal_Int32 nXNoteId ); - virtual ~OOXMLFastDocumentHandler() {} + virtual ~OOXMLFastDocumentHandler(); // css::xml::sax::XFastDocumentHandler: virtual void SAL_CALL startDocument() @@ -93,8 +94,8 @@ private: Stream * mpStream; OOXMLDocumentImpl* mpDocument; sal_Int32 mnXNoteId; - mutable css::uno::Reference<OOXMLFastContextHandler> mxContextHandler; - css::uno::Reference<OOXMLFastContextHandler> getContextHandler() const; + mutable rtl::Reference<OOXMLFastContextHandler> mxContextHandler; + rtl::Reference<OOXMLFastContextHandler> getContextHandler() const; }; }} |