diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 09:21:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:00:51 +0100 |
| commit | eaf2c278888ebca0ac99055ee34df6f011da3596 (patch) | |
| tree | 3177ca36a5eeac09b791ded9fc55d2d82e52c9cd /svl/source/items | |
| parent | 498cb0b3a372ce1ec0e66640eb0badddff3f2e90 (diff) | |
boost->std
Change-Id: Ifde84627578283bd057d7393eb7e5578ef5c029a
Diffstat (limited to 'svl/source/items')
| -rw-r--r-- | svl/source/items/itempool.cxx | 1 | ||||
| -rw-r--r-- | svl/source/items/itemprop.cxx | 4 | ||||
| -rw-r--r-- | svl/source/items/poolio.cxx | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index c76d8f45adc1..20b9e3a719fa 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -28,6 +28,7 @@ #include <svl/smplhint.hxx> #include "poolio.hxx" +#include <algorithm> #include <vector> diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 3916db7e8038..66951f1340c0 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -22,7 +22,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <unordered_map> /* * UNO III Implementation @@ -233,7 +233,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn { // get the SfxPoolItem const SfxPoolItem* pItem = 0; - boost::scoped_ptr<SfxPoolItem> pNewItem; + std::unique_ptr<SfxPoolItem> pNewItem; SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem ); if(SfxItemState::SET != eState && SFX_WHICH_MAX > rEntry.nWID ) pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID); diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 441396054eab..bed569a1bac1 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -27,7 +27,7 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/filerec.hxx> #include "poolio.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> /** * Returns the <SfxItemPool> that is being saved. @@ -236,7 +236,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const { sal_uLong nMark = rStream.Tell(); rStream.Seek( nItemStartPos + sizeof(sal_uInt16) ); - boost::scoped_ptr<SfxPoolItem> pClone(pItem->Create(rStream, nItemVersion )); + std::unique_ptr<SfxPoolItem> pClone(pItem->Create(rStream, nItemVersion )); sal_uInt16 nWh = pItem->Which(); SFX_ASSERT( rStream.Tell() == nMark, nWh,"asymmetric store/create" ); SFX_ASSERT( *pClone == *pItem, nWh, "unequal after store/create" ); |