diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 17:10:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 07:59:14 +0000 |
| commit | 3a00aaef2a51d7a1a87475a316dc9ae232fac60c (patch) | |
| tree | 4cc4516528c0dcb0bb6871e5b517efb74550a521 /package | |
| parent | c8ee3be0e08c435b106f0ac4b76618b33333b040 (diff) | |
boost->std
Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0
Reviewed-on: https://gerrit.libreoffice.org/18670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/pch/precompiled_package2.hxx | 1 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 8 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/package/inc/pch/precompiled_package2.hxx b/package/inc/pch/precompiled_package2.hxx index f7143254501c..32525b766a85 100644 --- a/package/inc/pch/precompiled_package2.hxx +++ b/package/inc/pch/precompiled_package2.hxx @@ -16,7 +16,6 @@ #include "com/sun/star/io/XAsyncOutputMonitor.hpp" #include <algorithm> -#include <boost/scoped_ptr.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index eae3fa4dd84f..d3d713be0327 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -69,7 +69,7 @@ #include "com/sun/star/io/XAsyncOutputMonitor.hpp" #include <cstring> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <vector> #include <comphelper/processfactory.hxx> @@ -492,18 +492,18 @@ void ZipPackage::parseContentType() void ZipPackage::getZipFileContents() { - boost::scoped_ptr < ZipEnumeration > pEnum ( m_pZipFile->entries() ); + std::unique_ptr < ZipEnumeration > xEnum(m_pZipFile->entries()); ZipPackageStream *pPkgStream; ZipPackageFolder *pPkgFolder, *pCurrent; OUString sTemp, sDirName; sal_Int32 nOldIndex, nIndex, nStreamIndex; FolderHash::iterator aIter; - while ( pEnum->hasMoreElements() ) + while (xEnum->hasMoreElements()) { nIndex = nOldIndex = 0; pCurrent = m_pRootFolder; - const ZipEntry & rEntry = *pEnum->nextElement(); + const ZipEntry & rEntry = *xEnum->nextElement(); OUString rName = rEntry.sPath; if ( m_bForceRecovery ) diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index d52b4bdf21f2..c76d6520590f 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <EncryptedDataHeader.hxx> #include <rtl/instance.hxx> -#include <boost/scoped_ptr.hpp> using namespace com::sun::star; using namespace com::sun::star::packages::zip::ZipConstants; |