diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 14:54:51 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 14:54:51 +0200 |
commit | 9703cc63cea3c47d13afe5f9b0eb22c631000958 (patch) | |
tree | 65456e93a12de0f7f7303f7de7f72f683142b5e0 /hwpfilter | |
parent | b39a778b5efa73936893a91b3223bb350bae1fb2 (diff) |
Remove o3tl/heap_ptr.hxx, use std::unique_ptr instead
Change-Id: Iac70c9be13892a36bfb5975f62e5345b88d4f144
Diffstat (limited to 'hwpfilter')
-rw-r--r-- | hwpfilter/inc/pch/precompiled_hwp.hxx | 1 | ||||
-rw-r--r-- | hwpfilter/source/hwpreader.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hwpfilter/inc/pch/precompiled_hwp.hxx b/hwpfilter/inc/pch/precompiled_hwp.hxx index b495dad9d90e..f149f13f8d71 100644 --- a/hwpfilter/inc/pch/precompiled_hwp.hxx +++ b/hwpfilter/inc/pch/precompiled_hwp.hxx @@ -25,7 +25,6 @@ #include <list> #include <locale.h> #include <math.h> -#include <o3tl/heap_ptr.hxx> #include <osl/diagnose.h> #include <sal/config.h> #include <sal/macros.h> diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index d79b8f506590..ec305db4e40d 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -18,6 +18,7 @@ */ #include <deque> +#include <memory> #include <boost/shared_ptr.hpp> @@ -25,7 +26,6 @@ #include <math.h> #include <comphelper/newarray.hxx> -#include <o3tl/heap_ptr.hxx> #include "fontmap.hxx" #include "formula.h" @@ -131,7 +131,7 @@ sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor) throw(R Reference< XInputStream > xInputStream( aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY_THROW); - o3tl::heap_ptr<HStream> stream(new HStream); + std::unique_ptr<HStream> stream(new HStream); Sequence < sal_Int8 > aBuffer; sal_Int32 nRead, nBlock = 32768, nTotal = 0; while( true ) |