diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index bd2786be5443..1d1ab237d3a7 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 11b6477c82c3..c27cb3d18eb9 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index 8d985ccfd0af..d5b24b21d5ff 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include namespace ww8 @@ -35,14 +36,14 @@ namespace ww8 { sal_Size nRemainingSize = rSt.remainingSize(); nSize = std::min(nRemainingSize, nSize); - mp_data.reset(new sal_uInt8[nSize]); - mn_size = rSt.Read(mp_data.get(), nSize); + m_pData = o3tl::make_shared_array(nSize); + mn_size = rSt.Read(m_pData.get(), nSize); } OSL_ENSURE(mn_size == nSize, "short read in WW8Struct::WW8Struct"); } WW8Struct::WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize) - : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos) + : m_pData(pStruct->m_pData), mn_offset(pStruct->mn_offset + nPos) , mn_size(nSize) { } @@ -57,7 +58,7 @@ namespace ww8 if (nOffset < mn_size) { - nResult = mp_data[mn_offset + nOffset]; + nResult = m_pData.get()[mn_offset + nOffset]; } return nResult; @@ -79,7 +80,7 @@ namespace ww8 nCount = nAvailable; #if defined OSL_LITENDIAN aResult = OUString(reinterpret_cast( - mp_data.get() + nStartOff), nCount); + m_pData.get() + nStartOff), nCount); #else OUStringBuffer aBuf; for (sal_uInt32 i = 0; i < nCount; ++i) diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 744e4d9d085f..e6f4cf23820c 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -22,7 +22,7 @@ #include #include -#include + #include #include #include @@ -34,7 +34,7 @@ namespace ww8 class WW8Struct : public ::sw::ExternalData { - boost::shared_array mp_data; + std::shared_ptr m_pData; sal_uInt32 mn_offset; sal_uInt32 mn_size;