mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boost->std

Browse Source 
Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557
This commit is contained in:
Caolán McNamara 2015-09-15 15:35:44 +01:00
parent 21b2cb540a
commit 31ebd9f475
92 changed files with 259 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
svtools/inc/table/defaultinputhandler.hxx
View File

@ -23,7 +23,7 @@
#include <svtools/table/tableinputhandler.hxx> #include <svtools/table/tableinputhandler.hxx>
#include <svtools/table/tabletypes.hxx> #include <svtools/table/tabletypes.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace svt { namespace table namespace svt { namespace table
@ -38,7 +38,7 @@ namespace svt { namespace table
class DefaultInputHandler : public ITableInputHandler class DefaultInputHandler : public ITableInputHandler
{ {
private: private:
::boost::scoped_ptr< DefaultInputHandler_Impl > m_pImpl; ::std::unique_ptr< DefaultInputHandler_Impl > m_pImpl;
public: public:
DefaultInputHandler(); DefaultInputHandler();

4
svtools/inc/table/gridtablerenderer.hxx
View File

@ -22,7 +22,7 @@
#include <svtools/table/tablemodel.hxx> #include <svtools/table/tablemodel.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace svt { namespace table namespace svt { namespace table
@ -42,7 +42,7 @@ namespace svt { namespace table
class GridTableRenderer : public ITableRenderer class GridTableRenderer : public ITableRenderer
{ {
private: private:
::boost::scoped_ptr< GridTableRenderer_Impl > m_pImpl; ::std::unique_ptr< GridTableRenderer_Impl > m_pImpl;
public: public:
/** creates a table renderer associated with the given model /** creates a table renderer associated with the given model

4
svtools/source/contnr/fileview.cxx
View File

@ -72,8 +72,8 @@
#include <unotools/intlwrapper.hxx> #include <unotools/intlwrapper.hxx>
#include <unotools/syslocale.hxx> #include <unotools/syslocale.hxx>
#include <svl/urlfilter.hxx> #include <svl/urlfilter.hxx>
#include <boost/scoped_ptr.hpp>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
#include <memory>
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbc;
@ -1600,7 +1600,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
m_aCurrentAsyncActionHandler = Link<void*,void>(); m_aCurrentAsyncActionHandler = Link<void*,void>();
// minimum time to wait // minimum time to wait
boost::scoped_ptr< TimeValue > pTimeout( new TimeValue ); std::unique_ptr< TimeValue > pTimeout( new TimeValue );
sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout; sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout;
OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" ); OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" );
if ( nMinTimeout <= 0 ) if ( nMinTimeout <= 0 )

6
svtools/source/contnr/imivctl1.cxx
View File

@ -36,7 +36,7 @@
#include <svtools/svmedit.hxx> #include <svtools/svmedit.hxx>
#include <algorithm> #include <algorithm>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <vcl/idle.hxx> #include <vcl/idle.hxx>
#define IMPICNVIEW_ACC_RETURN 1 #define IMPICNVIEW_ACC_RETURN 1
@ -302,7 +302,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t
void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator ) void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator )
{ {
boost::scoped_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator; std::unique_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
if ( !_pGenerator ) if ( !_pGenerator )
{ {
_pGenerator = new MnemonicGenerator; _pGenerator = new MnemonicGenerator;
@ -661,7 +661,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rec
rRenderContext.SetClipRegion(vcl::Region(rRect)); rRenderContext.SetClipRegion(vcl::Region(rRect));
SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new SvxIconChoiceCtrlEntryList_impl(); SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new SvxIconChoiceCtrlEntryList_impl();
boost::scoped_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl()); std::unique_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl());
size_t nPos = 0; size_t nPos = 0;
while(nCount) while(nCount)

12
svtools/source/control/calendar.cxx
View File

@ -36,7 +36,7 @@
#include <svtools/svtools.hrc> #include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx> #include <svtools/svtresid.hxx>
#include <svtools/calendar.hxx> #include <svtools/calendar.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
#define DAY_OFFX 4 #define DAY_OFFX 4
#define DAY_OFFY 2 #define DAY_OFFY 2
@ -1056,7 +1056,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld )
void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
bool bMove, bool bExpand, bool bExtended ) bool bMove, bool bExpand, bool bExtended )
{ {
boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable )); std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
Date aOldDate = maCurDate; Date aOldDate = maCurDate;
Date aTempDate = rDate; Date aTempDate = rDate;
@ -1307,7 +1307,7 @@ void Calendar::ImplEndTracking( bool bCancel )
if ( !bSpinDown ) if ( !bSpinDown )
{ {
boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable )); std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
Date aOldDate = maCurDate; Date aOldDate = maCurDate;
maCurDate = maOldCurDate; maCurDate = maOldCurDate;
*mpSelectTable = *mpOldSelectTable; *mpSelectTable = *mpOldSelectTable;
@ -1519,7 +1519,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
{ {
if ( bMultiSel && bExpand ) if ( bMultiSel && bExpand )
{ {
boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable )); std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
Date aOldAnchorDate = maAnchorDate; Date aOldAnchorDate = maAnchorDate;
mbSelLeft = aNewDate < maAnchorDate; mbSelLeft = aNewDate < maAnchorDate;
if ( !bExtended ) if ( !bExtended )
@ -1707,7 +1707,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect )
if ( !rDate.IsValidAndGregorian() ) if ( !rDate.IsValidAndGregorian() )
return; return;
boost::scoped_ptr<IntDateSet> pOldSel; std::unique_ptr<IntDateSet> pOldSel;
if ( !mbInSelChange ) if ( !mbInSelChange )
pOldSel.reset(new IntDateSet( *mpSelectTable )); pOldSel.reset(new IntDateSet( *mpSelectTable ));
@ -1720,7 +1720,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect )
void Calendar::SetNoSelection() void Calendar::SetNoSelection()
{ {
boost::scoped_ptr<IntDateSet> pOldSel; std::unique_ptr<IntDateSet> pOldSel;
if ( !mbInSelChange ) if ( !mbInSelChange )
pOldSel.reset(new IntDateSet( *mpSelectTable )); pOldSel.reset(new IntDateSet( *mpSelectTable ));

5
svtools/source/control/ruler.cxx
View File

@ -29,8 +29,7 @@
#include <svtools/svtools.hrc> #include <svtools/svtools.hrc>
#include <svtools/colorcfg.hxx> #include <svtools/colorcfg.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <vector> #include <vector>
using namespace std; using namespace std;
@ -2024,7 +2023,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt )
} }
else else
{ {
boost::scoped_ptr<RulerSelection> pHitTest(new RulerSelection); std::unique_ptr<RulerSelection> pHitTest(new RulerSelection);
bool bHitTestResult = ImplHitTest(aMousePos, pHitTest.get()); bool bHitTestResult = ImplHitTest(aMousePos, pHitTest.get());
if ( nMouseClicks == 1 ) if ( nMouseClicks == 1 )

4
svtools/source/filter/SvFilterOptionsDialog.cxx
View File

@ -46,7 +46,7 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -250,7 +250,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, meFieldUnit ); FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, meFieldUnit );
aFltCallDlgPara.aFilterData = maFilterDataSequence; aFltCallDlgPara.aFilterData = maFilterDataSequence;
boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() )); std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
aFltCallDlgPara.pResMgr = pResMgr.get(); aFltCallDlgPara.pResMgr = pResMgr.get();
aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat ); aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );

6
svtools/source/graphic/descriptor.cxx
View File

@ -33,7 +33,7 @@
#include <vcl/graph.hxx> #include <vcl/graph.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
#define UNOGRAPHIC_GRAPHICTYPE 1 #define UNOGRAPHIC_GRAPHICTYPE 1
#define UNOGRAPHIC_MIMETYPE 2 #define UNOGRAPHIC_MIMETYPE 2
@ -75,7 +75,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic )
void GraphicDescriptor::init( const OUString& rURL ) void GraphicDescriptor::init( const OUString& rURL )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ ));
if( pIStm ) if( pIStm )
implCreate( *pIStm, &rURL ); implCreate( *pIStm, &rURL );
@ -83,7 +83,7 @@ void GraphicDescriptor::init( const OUString& rURL )
void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL ) void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm ));
if( pIStm ) if( pIStm )
implCreate( *pIStm, &rURL ); implCreate( *pIStm, &rURL );

4
svtools/source/graphic/grfcache.cxx
View File

@ -30,7 +30,7 @@
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include "grfcache.hxx" #include "grfcache.hxx"
#include <rtl/crc.h> #include <rtl/crc.h>
#include <boost/scoped_ptr.hpp> #include <memory>
#define MAX_BMP_EXTENT 4096 #define MAX_BMP_EXTENT 4096
@ -865,7 +865,7 @@ void GraphicCache::AddGraphicObject(
if( !bInserted ) if( !bInserted )
{ {
GraphicCacheEntryList::iterator it = maGraphicCache.begin(); GraphicCacheEntryList::iterator it = maGraphicCache.begin();
boost::scoped_ptr< GraphicID > apID; std::unique_ptr< GraphicID > apID;
if( !pID ) if( !pID )
{ {

6
svtools/source/graphic/grfmgr.cxx
View File

@ -37,7 +37,7 @@
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
using com::sun::star::uno::Reference; using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
@ -238,7 +238,7 @@ void GraphicObject::ImplAutoSwapIn()
if( osl::FileBase::getFileURLFromSystemPath( GetLink(), aURLStr ) == osl::FileBase::E_None ) if( osl::FileBase::getFileURLFromSystemPath( GetLink(), aURLStr ) == osl::FileBase::E_None )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {
@ -1141,7 +1141,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL )
Graphic aGraphic; Graphic aGraphic;
if ( !aURL.isEmpty() ) if ( !aURL.isEmpty() )
{ {
boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ )); std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ ));
if( pStream ) if( pStream )
GraphicConverter::Import( *pStream, aGraphic ); GraphicConverter::Import( *pStream, aGraphic );
} }

8
svtools/source/graphic/provider.cxx
View File

@ -45,7 +45,7 @@
#include <svtools/grfmgr.hxx> #include <svtools/grfmgr.hxx>
#include "provider.hxx" #include "provider.hxx"
#include <vcl/dibtools.hxx> #include <vcl/dibtools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -239,7 +239,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
OString aResMgrName(OUStringToOString( OString aResMgrName(OUStringToOString(
rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US)); rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US));
boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() )); std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ));
if( pResMgr ) if( pResMgr )
{ {
@ -384,7 +384,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
{ {
uno::Reference< ::graphic::XGraphic > xRet; uno::Reference< ::graphic::XGraphic > xRet;
OUString aPath; OUString aPath;
boost::scoped_ptr<SvStream> pIStm; std::unique_ptr<SvStream> pIStm;
uno::Reference< io::XInputStream > xIStm; uno::Reference< io::XInputStream > xIStm;
uno::Reference< awt::XBitmap >xBtm; uno::Reference< awt::XBitmap >xBtm;
@ -727,7 +727,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
{ {
SolarMutexGuard g; SolarMutexGuard g;
boost::scoped_ptr<SvStream> pOStm; std::unique_ptr<SvStream> pOStm;
OUString aPath; OUString aPath;
sal_Int32 i; sal_Int32 i;

6
svtools/source/misc/ehdl.cxx
View File

@ -28,7 +28,7 @@
#include <svtools/svtresid.hxx> #include <svtools/svtresid.hxx>
#include <svtools/svtools.hrc> #include <svtools/svtools.hrc>
#include <svtools/sfxecode.hxx> #include <svtools/sfxecode.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
static sal_uInt16 aWndFunc( static sal_uInt16 aWndFunc(
@ -275,7 +275,7 @@ bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
{ {
bool bRet = false; bool bRet = false;
boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() )); std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ));
if( pResMgr ) if( pResMgr )
{ {
ResId aId(RID_ERRHDL, *pResMgr ); ResId aId(RID_ERRHDL, *pResMgr );
@ -302,7 +302,7 @@ bool SfxErrorHandler::GetMessageString(
{ {
bool bRet = false; bool bRet = false;
boost::scoped_ptr<ResId> pResId(new ResId(nId, *pMgr)); std::unique_ptr<ResId> pResId(new ResId(nId, *pMgr));
ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId); ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId);
if(aEr) if(aEr)

6
svtools/source/misc/embedhlp.cxx
View File

@ -50,7 +50,7 @@
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -434,7 +434,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
return; return;
} }
boost::scoped_ptr<SvStream> pGraphicStream(GetGraphicStream( bUpdate )); std::unique_ptr<SvStream> pGraphicStream(GetGraphicStream( bUpdate ));
if ( pGraphicStream ) if ( pGraphicStream )
{ {
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
@ -532,7 +532,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
mpImpl->aMediaType = rMediaType; mpImpl->aMediaType = rMediaType;
mpImpl->mnGraphicVersion++; mpImpl->mnGraphicVersion++;
boost::scoped_ptr<SvStream> pGraphicStream(::utl::UcbStreamHelper::CreateStream( xInGrStream )); std::unique_ptr<SvStream> pGraphicStream(::utl::UcbStreamHelper::CreateStream( xInGrStream ));
if ( pGraphicStream ) if ( pGraphicStream )
{ {

6
svtools/source/misc/imap.cxx
View File

@ -33,7 +33,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <boost/scoped_ptr.hpp> #include <memory>
#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \ #define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \
@ -81,7 +81,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
rOStm.WriteBool( bActive ); rOStm.WriteBool( bActive );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding);
boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE )); std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE ));
WriteIMapObject( rOStm ); WriteIMapObject( rOStm );
aEventList.Write( rOStm ); // V4 aEventList.Write( rOStm ); // V4
@ -110,7 +110,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
// make URL absolute // make URL absolute
aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ )); std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
ReadIMapObject( rIStm ); ReadIMapObject( rIStm );

8
svtools/source/misc/transfer.cxx
View File

@ -59,7 +59,7 @@
#include <vcl/dibtools.hxx> #include <vcl/dibtools.hxx>
#include <vcl/pngread.hxx> #include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx> #include <vcl/pngwrite.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
// - Namespaces - // - Namespaces -
@ -333,7 +333,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
if( maAny >>= aSeq ) if( maAny >>= aSeq )
{ {
boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC )); std::unique_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
GDIMetaFile aMtf; GDIMetaFile aMtf;
ReadGDIMetaFile( *pSrcStm, aMtf ); ReadGDIMetaFile( *pSrcStm, aMtf );
@ -363,7 +363,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
if( maAny >>= aSeq ) if( maAny >>= aSeq )
{ {
boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC )); std::unique_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
GDIMetaFile aMtf; GDIMetaFile aMtf;
ReadGDIMetaFile( *pSrcStm, aMtf ); ReadGDIMetaFile( *pSrcStm, aMtf );
@ -1988,7 +1988,7 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf
if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCase(".URL") ) if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCase(".URL") )
{ {
boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ), std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
STREAM_STD_READ )); STREAM_STD_READ ));
if( !pStream || pStream->GetError() ) if( !pStream || pStream->GetError() )

4
svtools/source/table/cellvalueconversion.cxx
View File

@ -35,7 +35,7 @@
#include <unotools/syslocale.hxx> #include <unotools/syslocale.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <boost/shared_ptr.hpp> #include <memory>
#include <unordered_map> #include <unordered_map>
namespace svt namespace svt
@ -96,7 +96,7 @@ namespace svt
virtual ::sal_Int32 getFormatKey() const = 0; virtual ::sal_Int32 getFormatKey() const = 0;
}; };
typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization; typedef std::shared_ptr< IValueNormalization > PValueNormalization;
typedef std::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache; typedef std::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache;

4
svtools/source/table/cellvalueconversion.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace svt namespace svt
@ -43,7 +43,7 @@ namespace svt
OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue ); OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue );
private: private:
::boost::scoped_ptr< CellValueConversion_Data > m_pData; ::std::unique_ptr< CellValueConversion_Data > m_pData;
}; };

4
svtools/source/toolpanel/paneltabbar.cxx
View File

@ -33,7 +33,7 @@
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <boost/optional.hpp> #include <memory>
#include <vector> #include <vector>
// space around an item // space around an item
@ -97,7 +97,7 @@ namespace svt
protected: protected:
~ITabBarRenderer() {} ~ITabBarRenderer() {}
}; };
typedef ::boost::shared_ptr< ITabBarRenderer > PTabBarRenderer; typedef std::shared_ptr< ITabBarRenderer > PTabBarRenderer;
//= VCLItemRenderer - declaration //= VCLItemRenderer - declaration

2
svtools/source/uno/wizard/wizardshell.cxx
View File

@ -186,7 +186,7 @@ namespace svt { namespace uno
{ {
ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL ); ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL );
::boost::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) ); std::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
VclPtr<TabPage> pPage = pController->getTabPage(); VclPtr<TabPage> pPage = pController->getTabPage();
OSL_ENSURE( pPage, "WizardShell::createPage: illegal tab page!" ); OSL_ENSURE( pPage, "WizardShell::createPage: illegal tab page!" );
if ( !pPage ) if ( !pPage )

6
svtools/source/uno/wizard/wizardshell.hxx
View File

@ -22,11 +22,9 @@
#include <com/sun/star/ui/dialogs/XWizardController.hpp> #include <com/sun/star/ui/dialogs/XWizardController.hpp>
#include <com/sun/star/ui/dialogs/XWizard.hpp> #include <com/sun/star/ui/dialogs/XWizard.hpp>
#include <svtools/roadmapwizard.hxx> #include <svtools/roadmapwizard.hxx>
#include <boost/shared_ptr.hpp>
#include <map> #include <map>
#include <memory>
namespace svt { namespace uno namespace svt { namespace uno
@ -34,7 +32,7 @@ namespace svt { namespace uno
class WizardPageController; class WizardPageController;
typedef ::boost::shared_ptr< WizardPageController > PWizardPageController; typedef std::shared_ptr< WizardPageController > PWizardPageController;
//= WizardShell //= WizardShell

4
svx/source/core/extedit.cxx
View File

@ -30,7 +30,7 @@
#include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbstreamhelper.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
@ -51,7 +51,7 @@ void ExternalToolEdit::HandleCloseEvent(ExternalToolEdit* pData)
Graphic newGraphic; Graphic newGraphic;
//import the temp file image stream into the newGraphic //import the temp file image stream into the newGraphic
boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(pData->m_aFileName, StreamMode::READ)); std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(pData->m_aFileName, StreamMode::READ));
if(pStream) if(pStream)
{ {
GraphicConverter::Import(*pStream, newGraphic); GraphicConverter::Import(*pStream, newGraphic);

3
svx/source/dialog/_bmpmask.cxx
View File

@ -31,7 +31,6 @@
#include <bmpmask.hrc> #include <bmpmask.hrc>
#include <svx/svxids.hrc> #include <svx/svxids.hrc>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
#include "helpid.hrc" #include "helpid.hrc"
#define BMP_RESID(nId) ResId(nId, DIALOG_MGR()) #define BMP_RESID(nId) ResId(nId, DIALOG_MGR())
@ -148,7 +147,7 @@ void MaskSet::KeyInput( const KeyEvent& rKEvt )
void MaskSet::onEditColor() void MaskSet::onEditColor()
{ {
boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParent() )); std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParent() ));
pColorDlg->SetColor(GetItemColor(1)); pColorDlg->SetColor(GetItemColor(1));

4
svx/source/dialog/connctrl.cxx
View File

@ -34,7 +34,7 @@
#include <vcl/builderfactory.hxx> #include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle) SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle)
: Control(pParent, nStyle) : Control(pParent, nStyle)
@ -269,7 +269,7 @@ void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
MapMode aMapMode = GetMapMode(); MapMode aMapMode = GetMapMode();
Fraction aXFrac = aMapMode.GetScaleX(); Fraction aXFrac = aMapMode.GetScaleX();
Fraction aYFrac = aMapMode.GetScaleY(); Fraction aYFrac = aMapMode.GetScaleY();
boost::scoped_ptr<Fraction> pMultFrac; std::unique_ptr<Fraction> pMultFrac;
if( bZoomIn ) if( bZoomIn )
{ {

4
svx/source/dialog/databaseregistrationui.cxx
View File

@ -25,7 +25,7 @@
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace svx namespace svx
{ {
@ -36,7 +36,7 @@ namespace svx
SfxItemSet aRegistrationItems( SfxGetpApp()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 ); SfxItemSet aRegistrationItems( SfxGetpApp()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create();
boost::scoped_ptr< SfxAbstractDialog > pDialog; std::unique_ptr< SfxAbstractDialog > pDialog;
if ( pDialogFactory ) if ( pDialogFactory )
pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) ); pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) );
if ( pDialog.get() ) if ( pDialog.get() )

14
svx/source/dialog/grfflt.cxx
View File

@ -27,7 +27,7 @@
#include <svx/grfflt.hxx> #include <svx/grfflt.hxx>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx> #include <svx/svxdlg.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
// - SvxGraphicFilter - // - SvxGraphicFilter -
@ -77,7 +77,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSmooth(pWindow, rGraphic, 0.7)); std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSmooth(pWindow, rGraphic, 0.7));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@ -165,7 +165,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false)); std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@ -178,7 +178,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RP_MM)); std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RP_MM));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@ -191,7 +191,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16)); std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@ -229,7 +229,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10)); std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@ -242,7 +242,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false)); std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );

6
svx/source/dialog/hdft.cxx
View File

@ -44,7 +44,7 @@
#include <editeng/boxitem.hxx> #include <editeng/boxitem.hxx>
#include <svx/svxdlg.hxx> #include <svx/svxdlg.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
//UUUU //UUUU
#include <svx/xdef.hxx> #include <svx/xdef.hxx>
@ -95,7 +95,7 @@ namespace svx {
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, bEnableBackgroundSelector )); std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, bEnableBackgroundSelector ));
DBG_ASSERT(pDlg, "Dialog creation failed!"); DBG_ASSERT(pDlg, "Dialog creation failed!");
if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() ) if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
{ {
@ -285,7 +285,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
aSet.Put( SfxBoolItem( nWSharedFirst, m_pCntSharedFirstBox->IsChecked() ) ); aSet.Put( SfxBoolItem( nWSharedFirst, m_pCntSharedFirstBox->IsChecked() ) );
if(m_pDynSpacingCB->IsVisible() && SFX_WHICH_MAX > nWDynSpacing) if(m_pDynSpacingCB->IsVisible() && SFX_WHICH_MAX > nWDynSpacing)
{ {
boost::scoped_ptr<SfxBoolItem> pBoolItem(static_cast<SfxBoolItem*>(pPool->GetDefaultItem(nWDynSpacing).Clone())); std::unique_ptr<SfxBoolItem> pBoolItem(static_cast<SfxBoolItem*>(pPool->GetDefaultItem(nWDynSpacing).Clone()));
pBoolItem->SetValue(m_pDynSpacingCB->IsChecked()); pBoolItem->SetValue(m_pDynSpacingCB->IsChecked());
aSet.Put(*pBoolItem); aSet.Put(*pBoolItem);
} }

6
svx/source/dialog/imapdlg.cxx
View File

@ -54,7 +54,7 @@
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx> #include <vcl/builderfactory.hxx>
#include "dlgunit.hxx" #include "dlgunit.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
#define SELF_TARGET "_self" #define SELF_TARGET "_self"
#define IMAP_ALL_FILTER OUString("<Alle>") #define IMAP_ALL_FILTER OUString("<Alle>")
@ -471,7 +471,7 @@ void SvxIMapDlg::DoOpen()
{ {
INetURLObject aURL( aDlg.GetPath() ); INetURLObject aURL( aDlg.GetPath() );
DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {
@ -546,7 +546,7 @@ bool SvxIMapDlg::DoSave()
if( aURL.getExtension().isEmpty() ) if( aURL.getExtension().isEmpty() )
aURL.setExtension( aExt ); aURL.setExtension( aExt );
boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC )); std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
if( pOStm ) if( pOStm )
{ {
pIMapWnd->GetImageMap().Write( *pOStm, nFormat, "" ); pIMapWnd->GetImageMap().Write( *pOStm, nFormat, "" );

6
svx/source/dialog/imapwnd.cxx
View File

@ -48,7 +48,7 @@
#include <svx/svxdlg.hxx> #include <svx/svxdlg.hxx>
#include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
using ::com::sun::star::frame::XFrame; using ::com::sun::star::frame::XFrame;
@ -660,7 +660,7 @@ void IMapWindow::DoMacroAssign()
aSet.Put( aMacroItem, SID_ATTR_MACROITEM ); aSet.Put( aMacroItem, SID_ATTR_MACROITEM );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
boost::scoped_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, mxDocumentFrame, SID_EVENTCONFIG )); std::unique_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, mxDocumentFrame, SID_EVENTCONFIG ));
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK ) if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
{ {
@ -682,7 +682,7 @@ void IMapWindow::DoPropertyDialog()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractURLDlg> aDlg(pFact->CreateURLDialog( this, pIMapObj->GetURL(), pIMapObj->GetAltText(), pIMapObj->GetDesc(), std::unique_ptr<AbstractURLDlg> aDlg(pFact->CreateURLDialog( this, pIMapObj->GetURL(), pIMapObj->GetAltText(), pIMapObj->GetDesc(),
pIMapObj->GetTarget(), pIMapObj->GetName(), aTargetList )); pIMapObj->GetTarget(), pIMapObj->GetName(), aTargetList ));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if ( aDlg->Execute() == RET_OK ) if ( aDlg->Execute() == RET_OK )

4
svx/source/dialog/imapwnd.hxx
View File

@ -59,11 +59,11 @@ const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+
sal_uInt32('P') * 0x01000000; sal_uInt32('P') * 0x01000000;
typedef boost::shared_ptr< IMapObject > IMapObjectPtr; typedef std::shared_ptr< IMapObject > IMapObjectPtr;
class IMapUserData : public SdrObjUserData class IMapUserData : public SdrObjUserData
{ {
// #i98386# use boost::shared_ptr here due to cloning possibilities // #i98386# use std::shared_ptr here due to cloning possibilities
IMapObjectPtr mpObj; IMapObjectPtr mpObj;
public: public:

4
svx/source/dialog/measctrl.cxx
View File

@ -25,7 +25,7 @@
#include "svx/dlgutil.hxx" #include "svx/dlgutil.hxx"
#include <vcl/builderfactory.hxx> #include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
SvxXMeasurePreview::SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle) SvxXMeasurePreview::SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle)
: Control(pParent, nStyle) : Control(pParent, nStyle)
@ -118,7 +118,7 @@ void SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
MapMode aMapMode = GetMapMode(); MapMode aMapMode = GetMapMode();
Fraction aXFrac = aMapMode.GetScaleX(); Fraction aXFrac = aMapMode.GetScaleX();
Fraction aYFrac = aMapMode.GetScaleY(); Fraction aYFrac = aMapMode.GetScaleY();
boost::scoped_ptr<Fraction> pMultFrac; std::unique_ptr<Fraction> pMultFrac;
if (bZoomIn) if (bZoomIn)
{ {

9
svx/source/dialog/srchdlg.cxx
View File

@ -69,7 +69,6 @@
#include <svx/svxdlg.hxx> #include <svx/svxdlg.hxx>
#include <vcl/toolbox.hxx> #include <vcl/toolbox.hxx>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
using namespace com::sun::star::i18n; using namespace com::sun::star::i18n;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
@ -1335,7 +1334,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractSvxSearchSimilarityDialog> pDlg(pFact->CreateSvxSearchSimilarityDialog( this, std::unique_ptr<AbstractSvxSearchSimilarityDialog> pDlg(pFact->CreateSvxSearchSimilarityDialog( this,
pSearchItem->IsLEVRelaxed(), pSearchItem->IsLEVRelaxed(),
pSearchItem->GetLEVOther(), pSearchItem->GetLEVOther(),
pSearchItem->GetLEVShorter(), pSearchItem->GetLEVShorter(),
@ -1358,7 +1357,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet, std::unique_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet,
pSearchItem->GetTransliterationFlags() )); pSearchItem->GetTransliterationFlags() ));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
int nRet = aDlg->Execute(); int nRet = aDlg->Execute();
@ -1935,7 +1934,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(this, aSet)); std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(this, aSet));
DBG_ASSERT(pDlg, "Dialog creation failed!"); DBG_ASSERT(pDlg, "Dialog creation failed!");
aTxt = pDlg->GetText() + aTxt; aTxt = pDlg->GetText() + aTxt;
pDlg->SetText( aTxt ); pDlg->SetText( aTxt );
@ -2019,7 +2018,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges )); std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges ));
DBG_ASSERT(pDlg, "Dialog creation failed!"); DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->Execute(); pDlg->Execute();
} }

4
svx/source/fmcomp/fmgridcl.cxx
View File

@ -71,7 +71,7 @@
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <math.h> #include <math.h>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::view; using namespace ::com::sun::star::view;
@ -866,7 +866,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL)); std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL));
DBG_ASSERT(pDlg, "Dialog creation failed!"); DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->SetColumns(xCols); pDlg->SetColumns(xCols);
pDlg->Execute(); pDlg->Execute();

5
svx/source/fmcomp/gridctrl.cxx
View File

@ -57,11 +57,10 @@
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <boost/scoped_ptr.hpp>
#include <algorithm> #include <algorithm>
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <memory>
using namespace ::dbtools; using namespace ::dbtools;
using namespace ::dbtools::DBTypeConversion; using namespace ::dbtools::DBTypeConversion;
@ -3568,7 +3567,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
if (pColumn) if (pColumn)
{ {
boost::scoped_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard; std::unique_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard;
while (!m_bWantDestruction && (!pGuard || !pGuard->isAcquired())) while (!m_bWantDestruction && (!pGuard || !pGuard->isAcquired()))
pGuard.reset(new vcl::SolarMutexTryAndBuyGuard); pGuard.reset(new vcl::SolarMutexTryAndBuyGuard);

8
svx/source/form/fmscriptingenv.cxx
View File

@ -40,12 +40,12 @@
#include <basic/basmgr.hxx> #include <basic/basmgr.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/assign/list_of.hpp> #include <boost/assign/list_of.hpp>
#include <utility> #include <memory>
using std::pair;
#include <set> #include <set>
#include <utility>
using std::pair;
namespace svxform namespace svxform
{ {
@ -858,7 +858,7 @@ namespace svxform
virtual ~IScript() { } virtual ~IScript() { }
}; };
typedef ::boost::shared_ptr< IScript > PScript; typedef std::shared_ptr< IScript > PScript;
class NewStyleUNOScript : public IScript class NewStyleUNOScript : public IScript
{ {

4
svx/source/form/fmshell.cxx
View File

@ -88,7 +88,7 @@
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
// wird fuer Invalidate verwendet -> mitpflegen // wird fuer Invalidate verwendet -> mitpflegen
// aufsteigend sortieren !!!!!! // aufsteigend sortieren !!!!!!
@ -753,7 +753,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
DBG_ASSERT( pFact, "no dialog factory!" ); DBG_ASSERT( pFact, "no dialog factory!" );
if ( pFact ) if ( pFact )
{ {
boost::scoped_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) ); std::unique_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
DBG_ASSERT( dlg.get(), "Dialog creation failed!" ); DBG_ASSERT( dlg.get(), "Dialog creation failed!" );
dlg->SetValue( rController->getCursor()->getRow() ); dlg->SetValue( rController->getCursor()->getRow() );
if ( dlg->Execute() == RET_OK ) if ( dlg->Execute() == RET_OK )

8
svx/source/form/fmshimp.cxx
View File

@ -99,8 +99,8 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <map> #include <map>
#include <memory>
#include <vector> #include <vector>
#include <boost/scoped_ptr.hpp>
// wird fuer Invalidate verwendet -> mitpflegen // wird fuer Invalidate verwendet -> mitpflegen
static const sal_uInt16 DatabaseSlotMap[] = static const sal_uInt16 DatabaseSlotMap[] =
@ -285,7 +285,7 @@ namespace
{ {
SdrObject* pCurrent = _rMarkList.GetMark( i )->GetMarkedSdrObj(); SdrObject* pCurrent = _rMarkList.GetMark( i )->GetMarkedSdrObj();
boost::scoped_ptr<SdrObjListIter> pGroupIterator; std::unique_ptr<SdrObjListIter> pGroupIterator;
if ( pCurrent->IsGroupObject() ) if ( pCurrent->IsGroupObject() )
{ {
pGroupIterator.reset(new SdrObjListIter( *pCurrent->GetSubList() )); pGroupIterator.reset(new SdrObjListIter( *pCurrent->GetSubList() ));
@ -1568,7 +1568,7 @@ void FmXFormShell::ExecuteSearch()
// ausgeraeumt sind, sollte hier ein SM_USETHREAD rein, denn die Suche in einem eigenen Thread ist doch etwas fluessiger // ausgeraeumt sind, sollte hier ein SM_USETHREAD rein, denn die Suche in einem eigenen Thread ist doch etwas fluessiger
// sollte allerdings irgendwie von dem unterliegenden Cursor abhaengig gemacht werden, DAO zum Beispiel ist nicht thread-sicher // sollte allerdings irgendwie von dem unterliegenden Cursor abhaengig gemacht werden, DAO zum Beispiel ist nicht thread-sicher
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
boost::scoped_ptr<AbstractFmSearchDialog> pDialog; std::unique_ptr<AbstractFmSearchDialog> pDialog;
if ( pFact ) if ( pFact )
pDialog.reset(pFact->CreateFmSearchDialog( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow(), strInitialText, aContextNames, nInitialContext, LINK( this, FmXFormShell, OnSearchContextRequest ) )); pDialog.reset(pFact->CreateFmSearchDialog( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow(), strInitialText, aContextNames, nInitialContext, LINK( this, FmXFormShell, OnSearchContextRequest ) ));
DBG_ASSERT( pDialog, "FmXFormShell::ExecuteSearch: could not create the search dialog!" ); DBG_ASSERT( pDialog, "FmXFormShell::ExecuteSearch: could not create the search dialog!" );
@ -4068,7 +4068,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
{ {
// We can't simply re-insert the item because we have a clear order for all the our items. // We can't simply re-insert the item because we have a clear order for all the our items.
// So first we have to determine the position of the item to insert. // So first we have to determine the position of the item to insert.
boost::scoped_ptr<PopupMenu> pSource(FmXFormShell::GetConversionMenu()); std::unique_ptr<PopupMenu> pSource(FmXFormShell::GetConversionMenu());
sal_uInt16 nSourcePos = pSource->GetItemPos(nSID); sal_uInt16 nSourcePos = pSource->GetItemPos(nSID);
DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !"); DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !");
sal_uInt16 nPrevInSource = nSourcePos; sal_uInt16 nPrevInSource = nSourcePos;

6
svx/source/form/fmtextcontrolshell.cxx
View File

@ -63,7 +63,7 @@
#include <vcl/outdev.hxx> #include <vcl/outdev.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace svx namespace svx
@ -644,10 +644,10 @@ namespace svx
SfxItemPool* pPool = EditEngine::CreatePool(); SfxItemPool* pPool = EditEngine::CreatePool();
pPool->FreezeIdRanges(); pPool->FreezeIdRanges();
boost::scoped_ptr< SfxItemSet > xPureItems( new SfxItemSet( *pPool ) ); std::unique_ptr< SfxItemSet > xPureItems( new SfxItemSet( *pPool ) );
// put the current states of the items into the set // put the current states of the items into the set
boost::scoped_ptr<SfxAllItemSet> xCurrentItems( new SfxAllItemSet( *xPureItems ) ); std::unique_ptr<SfxAllItemSet> xCurrentItems( new SfxAllItemSet( *xPureItems ) );
transferFeatureStatesToItemSet( m_aControlFeatures, *xCurrentItems ); transferFeatureStatesToItemSet( m_aControlFeatures, *xCurrentItems );
// additional items, which we are not responsible for at the SfxShell level, // additional items, which we are not responsible for at the SfxShell level,

8
svx/source/gallery2/galbrws1.cxx
View File

@ -38,7 +38,7 @@
#include <svx/dialmgr.hxx> #include <svx/dialmgr.hxx>
#include <svx/svxdlg.hxx> #include <svx/svxdlg.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
// - Namespaces - // - Namespaces -
@ -358,7 +358,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<VclAbstractRefreshableDialog> aActualizeProgress(pFact->CreateActualizeProgressDialog( this, pTheme )); std::unique_ptr<VclAbstractRefreshableDialog> aActualizeProgress(pFact->CreateActualizeProgressDialog( this, pTheme ));
DBG_ASSERT(aActualizeProgress, "Dialog creation failed!"); DBG_ASSERT(aActualizeProgress, "Dialog creation failed!");
aActualizeProgress->Update(); aActualizeProgress->Update();
@ -382,7 +382,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!"); DBG_ASSERT(pFact, "Dialog creation failed!");
boost::scoped_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldName )); std::unique_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldName ));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
@ -418,7 +418,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog( this, pTheme )); std::unique_ptr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog( this, pTheme ));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )

4
svx/source/gallery2/galbrws2.cxx
View File

@ -57,7 +57,7 @@
#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/style/GraphicLocation.hpp> #include <com/sun/star/style/GraphicLocation.hpp>
#include <map> #include <map>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#undef GALLERY_USE_CLIPBOARD #undef GALLERY_USE_CLIPBOARD
@ -1177,7 +1177,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldTitle )); std::unique_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldTitle ));
DBG_ASSERT(aDlg, "Dialog creation failed!"); DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK ) if( aDlg->Execute() == RET_OK )
{ {

4
svx/source/gallery2/galini.cxx
View File

@ -23,11 +23,11 @@
#include <unotools/syslocale.hxx> #include <unotools/syslocale.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName ) OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName )
{ {
boost::scoped_ptr<SvStream> pStrm(::utl::UcbStreamHelper::CreateStream( std::unique_ptr<SvStream> pStrm(::utl::UcbStreamHelper::CreateStream(
GetStrURL().GetMainURL( INetURLObject::NO_DECODE ), GetStrURL().GetMainURL( INetURLObject::NO_DECODE ),
StreamMode::READ )); StreamMode::READ ));

6
svx/source/gallery2/gallery1.cxx
View File

@ -43,7 +43,7 @@
#include "svx/gallery1.hxx" #include "svx/gallery1.hxx"
#include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/XContentAccess.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
// - Namespaces - // - Namespaces -
@ -260,7 +260,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
OUString aTestFile( "cdefghij.klm" ); OUString aTestFile( "cdefghij.klm" );
aTestURL.Append( aTestFile ); aTestURL.Append( aTestFile );
boost::scoped_ptr<SvStream> pTestStm(::utl::UcbStreamHelper::CreateStream( aTestURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE )); std::unique_ptr<SvStream> pTestStm(::utl::UcbStreamHelper::CreateStream( aTestURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
if( pTestStm ) if( pTestStm )
{ {
@ -620,7 +620,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
if( FileExists( aURL ) ) if( FileExists( aURL ) )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {

4
svx/source/gallery2/galmisc.cxx
View File

@ -49,7 +49,7 @@
#include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp> #include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/ucb/NameClash.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -96,7 +96,7 @@ GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic
if( pIStm ) if( pIStm )
{ {
GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
boost::scoped_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL); std::unique_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL);
sal_uInt16 nFormat; sal_uInt16 nFormat;
if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )

4
svx/source/gallery2/galobj.cxx
View File

@ -39,7 +39,7 @@
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <vcl/dibtools.hxx> #include <vcl/dibtools.hxx>
#include "gallerydrawmodel.hxx" #include "gallerydrawmodel.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -229,7 +229,7 @@ const OUString SgaObject::GetTitle() const
!aResourceName.isEmpty() && ( nResId > 0 ) && ( nResId < 0x10000 ) ) !aResourceName.isEmpty() && ( nResId > 0 ) && ( nResId < 0x10000 ) )
{ {
OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8));
boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aMgrName.getStr(), std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aMgrName.getStr(),
Application::GetSettings().GetUILanguageTag() )); Application::GetSettings().GetUILanguageTag() ));
if ( pResMgr ) if ( pResMgr )
{ {

37
svx/source/gallery2/galtheme.cxx
View File

@ -56,7 +56,6 @@
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>
#include "gallerydrawmodel.hxx" #include "gallerydrawmodel.hxx"
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -110,7 +109,7 @@ void GalleryTheme::ImplCreateSvDrawStorage()
bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ) bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry )
{ {
boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE )); std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
bool bRet = false; bool bRet = false;
if( pOStm ) if( pOStm )
@ -154,7 +153,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
if( pEntry ) if( pEntry )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {
@ -206,9 +205,9 @@ void GalleryTheme::ImplWrite()
if( FileExists( aPathURL ) || CreateDir( aPathURL ) ) if( FileExists( aPathURL ) || CreateDir( aPathURL ) )
{ {
#ifdef UNX #ifdef UNX
boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::COPY_ON_SYMLINK | StreamMode::TRUNC )); std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::COPY_ON_SYMLINK | StreamMode::TRUNC ));
#else #else
boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC )); std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
#endif #endif
if( pOStm ) if( pOStm )
@ -257,7 +256,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat
// read next possible number // read next possible number
if( FileExists( aInfoFileURL ) ) if( FileExists( aInfoFileURL ) )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {
@ -322,7 +321,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat
while( bExists ); while( bExists );
// write updated number // write updated number
boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE )); std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
if( pOStm ) if( pOStm )
{ {
@ -389,7 +388,7 @@ bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
// update title of new object if necessary // update title of new object if necessary
if (rObj.GetTitle().isEmpty()) if (rObj.GetTitle().isEmpty())
{ {
boost::scoped_ptr<SgaObject> pOldObj(ImplReadSgaObject(pFoundEntry)); std::unique_ptr<SgaObject> pOldObj(ImplReadSgaObject(pFoundEntry));
if (pOldObj) if (pOldObj)
{ {
@ -555,7 +554,7 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr
if ( GalleryGraphicImport( aURL, aGraphic, aFormat ) != GalleryGraphicImportRet::IMPORT_NONE ) if ( GalleryGraphicImport( aURL, aGraphic, aFormat ) != GalleryGraphicImportRet::IMPORT_NONE )
{ {
boost::scoped_ptr<SgaObject> pNewObj; std::unique_ptr<SgaObject> pNewObj;
if ( SGA_OBJ_INET == pEntry->eObjKind ) if ( SGA_OBJ_INET == pEntry->eObjKind )
pNewObj.reset(static_cast<SgaObject*>(new SgaObjectINet( aGraphic, aURL, aFormat ))); pNewObj.reset(static_cast<SgaObject*>(new SgaObjectINet( aGraphic, aURL, aFormat )));
@ -617,15 +616,15 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr
DBG_ASSERT( aInURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); DBG_ASSERT( aInURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
DBG_ASSERT( aTmpURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); DBG_ASSERT( aTmpURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
boost::scoped_ptr<SvStream> pTmpStm(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC )); std::unique_ptr<SvStream> pTmpStm(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
if( pIStm && pTmpStm ) if( pIStm && pTmpStm )
{ {
for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
{ {
pEntry = aObjectList[ i ]; pEntry = aObjectList[ i ];
boost::scoped_ptr<SgaObject> pObj; std::unique_ptr<SgaObject> pObj;
switch( pEntry->eObjKind ) switch( pEntry->eObjKind )
{ {
@ -697,7 +696,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
if( FileExists( rURL ) ) if( FileExists( rURL ) )
{ {
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {
@ -736,7 +735,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
if( nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) && if( nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) &&
nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) ) nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) )
{ {
boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( *pIStm, StreamMode::READ )); std::unique_ptr<VersionCompat> pCompat(new VersionCompat( *pIStm, StreamMode::READ ));
pIStm->ReadUInt32( nThemeId ); pIStm->ReadUInt32( nThemeId );
@ -892,7 +891,7 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPo
} }
const INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_BMP, nExportFormat ) ); const INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_BMP, nExportFormat ) );
boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC )); std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
if( pOStm ) if( pOStm )
{ {
@ -1104,7 +1103,7 @@ bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos
{ {
Graphic aGraphic; Graphic aGraphic;
OUString aFormat; OUString aFormat;
boost::scoped_ptr<SgaObject> pNewObj; std::unique_ptr<SgaObject> pNewObj;
const GalleryGraphicImportRet nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat ); const GalleryGraphicImportRet nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
bool bRet = false; bool bRet = false;
@ -1183,7 +1182,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
if( rxTransferable.is() ) if( rxTransferable.is() )
{ {
TransferableDataHelper aDataHelper( rxTransferable ); TransferableDataHelper aDataHelper( rxTransferable );
boost::scoped_ptr<Graphic> pGraphic; std::unique_ptr<Graphic> pGraphic;
if( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) ) if( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) )
{ {
@ -1356,7 +1355,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
rOStm.WriteUInt32( COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) ).WriteUInt32( COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) ); rOStm.WriteUInt32( COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) ).WriteUInt32( COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) );
const long nReservePos = rOStm.Tell(); const long nReservePos = rOStm.Tell();
boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 )); std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 ));
rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up
@ -1486,7 +1485,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) && nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) &&
nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) ) nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) )
{ {
boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( rIStm, StreamMode::READ )); std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rIStm, StreamMode::READ ));
sal_uInt32 nTemp32; sal_uInt32 nTemp32;
bool bThemeNameFromResource = false; bool bThemeNameFromResource = false;

4
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
View File

@ -27,7 +27,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <svx/unoapi.hxx> #include <svx/unoapi.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr { namespace contact { namespace sdr { namespace contact {
@ -116,7 +116,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo)
// if there is something to show, use a vclProcessor to render it // if there is something to show, use a vclProcessor to render it
if(xPrimitiveSequence.hasElements()) if(xPrimitiveSequence.hasElements())
{ {
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
*pTargetDevice, *pTargetDevice,
getViewInformation2D())); getViewInformation2D()));

4
svx/source/sdr/contact/objectcontactofpageview.cxx
View File

@ -37,7 +37,7 @@
#include <svx/unoapi.hxx> #include <svx/unoapi.hxx>
#include "eventhandler.hxx" #include "eventhandler.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -292,7 +292,7 @@ namespace sdr
pOutDev->SetLayoutMode(TEXT_LAYOUT_DEFAULT); // reset, default is no BiDi/RTL pOutDev->SetLayoutMode(TEXT_LAYOUT_DEFAULT); // reset, default is no BiDi/RTL
// create renderer // create renderer
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createProcessor2DFromOutputDevice( drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rTargetOutDev, getViewInformation2D())); rTargetOutDev, getViewInformation2D()));

4
svx/source/sdr/contact/viewcontactofe3dcube.cxx
View File

@ -24,7 +24,7 @@
#include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/range/b3drange.hxx> #include <basegfx/range/b3drange.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr namespace sdr
@ -71,7 +71,7 @@ namespace sdr
aWorldTransform.translate(aCubeRange.getMinX(), aCubeRange.getMinY(), aCubeRange.getMinZ()); aWorldTransform.translate(aCubeRange.getMinX(), aCubeRange.getMinY(), aCubeRange.getMinZ());
// get 3D Object Attributes // get 3D Object Attributes
boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet)); std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size to get a perfect mapping for // calculate texture size to get a perfect mapping for
// the front/back sides // the front/back sides

4
svx/source/sdr/contact/viewcontactofe3dextrude.cxx
View File

@ -24,7 +24,7 @@
#include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr namespace sdr
@ -51,7 +51,7 @@ namespace sdr
const basegfx::B2DPolyPolygon aPolyPolygon(GetE3dExtrudeObj().GetExtrudePolygon()); const basegfx::B2DPolyPolygon aPolyPolygon(GetE3dExtrudeObj().GetExtrudePolygon());
// get 3D Object Attributes // get 3D Object Attributes
boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet)); std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size; use size of top/bottom cap to get a perfect mapping // calculate texture size; use size of top/bottom cap to get a perfect mapping
// for the caps. The in-between geometry will get a stretched size with a // for the caps. The in-between geometry will get a stretched size with a

4
svx/source/sdr/contact/viewcontactofe3dlathe.cxx
View File

@ -24,7 +24,7 @@
#include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr namespace sdr
@ -51,7 +51,7 @@ namespace sdr
const basegfx::B2DPolyPolygon aPolyPolygon(GetE3dLatheObj().GetPolyPoly2D()); const basegfx::B2DPolyPolygon aPolyPolygon(GetE3dLatheObj().GetPolyPoly2D());
// get 3D Object Attributes // get 3D Object Attributes
boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet)); std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size. Use the polygon length of the longest polygon for // calculate texture size. Use the polygon length of the longest polygon for
// height and the rotated radius for width (using polygon center) to get a good // height and the rotated radius for width (using polygon center) to get a good

4
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
View File

@ -25,7 +25,7 @@
#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr namespace sdr
@ -99,7 +99,7 @@ namespace sdr
} }
// get 3D Object Attributes // get 3D Object Attributes
boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet)); std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size // calculate texture size
basegfx::B2DVector aTextureSize(1.0, 1.0); basegfx::B2DVector aTextureSize(1.0, 1.0);

4
svx/source/sdr/contact/viewcontactofe3dsphere.cxx
View File

@ -23,7 +23,7 @@
#include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx> #include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx>
#include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx> #include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr namespace sdr
@ -57,7 +57,7 @@ namespace sdr
aWorldTransform.translate(aSpherePosition.getX(), aSpherePosition.getY(), aSpherePosition.getZ()); aWorldTransform.translate(aSpherePosition.getX(), aSpherePosition.getY(), aSpherePosition.getZ());
// get 3D Object Attributes // get 3D Object Attributes
boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet)); std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// get segment count // get segment count
const sal_uInt32 nHorizontalSegments(GetE3dSphereObj().GetHorizontalSegments()); const sal_uInt32 nHorizontalSegments(GetE3dSphereObj().GetHorizontalSegments());

4
svx/source/sdr/overlay/overlaymanager.cxx
View File

@ -26,7 +26,7 @@
#include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -47,7 +47,7 @@ namespace sdr
const bool bIsAntiAliasing(getDrawinglayerOpt().IsAntiAliasing()); const bool bIsAntiAliasing(getDrawinglayerOpt().IsAntiAliasing());
// create processor // create processor
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rDestinationDevice, rDestinationDevice,
getCurrentViewInformation2D())); getCurrentViewInformation2D()));

4
svx/source/sdr/properties/e3dsceneproperties.cxx
View File

@ -23,7 +23,7 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/scene3d.hxx> #include <svx/scene3d.hxx>
#include <svx/svditer.hxx> #include <svx/svditer.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace sdr namespace sdr
@ -121,7 +121,7 @@ namespace sdr
{ {
// Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items. // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
// #i50808# Leak fix, Clone produces a new instance and we get ownership here // #i50808# Leak fix, Clone produces a new instance and we get ownership here
boost::scoped_ptr<SfxItemSet> pNewSet(rSet.Clone(true)); std::unique_ptr<SfxItemSet> pNewSet(rSet.Clone(true));
DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)"); DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++) for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)

4
svx/source/sdr/properties/itemsettools.cxx
View File

@ -26,7 +26,7 @@
#include <svx/svditer.hxx> #include <svx/svditer.hxx>
#include <vcl/region.hxx> #include <vcl/region.hxx>
#include <vcl/outdev.hxx> #include <vcl/outdev.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
// class to remember broadcast start positions // class to remember broadcast start positions
@ -115,7 +115,7 @@ namespace sdr
{ {
if(pItem->HasMetrics()) if(pItem->HasMetrics())
{ {
boost::scoped_ptr<SfxPoolItem> pNewItem(pItem->Clone()); std::unique_ptr<SfxPoolItem> pNewItem(pItem->Clone());
pNewItem->ScaleMetrics(nMul, nDiv); pNewItem->ScaleMetrics(nMul, nDiv);
rSet.Put(*pNewItem); rSet.Put(*pNewItem);
} }

4
svx/source/svdraw/svdedtv2.cxx
View File

@ -42,7 +42,7 @@
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#include <svx/svdoashp.hxx> #include <svx/svdoashp.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
#include <vector> #include <vector>
using ::std::vector; using ::std::vector;
using namespace com::sun::star; using namespace com::sun::star;
@ -770,7 +770,7 @@ void SdrEditView::DistributeMarkedObjects()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact) if(pFact)
{ {
boost::scoped_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(NULL, aNewAttr)); std::unique_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(NULL, aNewAttr));
DBG_ASSERT(pDlg, "Dialog creation failed!"); DBG_ASSERT(pDlg, "Dialog creation failed!");
sal_uInt16 nResult = pDlg->Execute(); sal_uInt16 nResult = pDlg->Execute();

4
svx/source/svdraw/svdedxv.cxx
View File

@ -61,8 +61,6 @@
#include <svx/sdr/table/tablecontroller.hxx> #include <svx/sdr/table/tablecontroller.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <boost/scoped_ptr.hpp>
#include <memory> #include <memory>
@ -358,7 +356,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
{ {
// completely reworked to use primitives; this ensures same look and functionality // completely reworked to use primitives; this ensures same look and functionality
const drawinglayer::geometry::ViewInformation2D aViewInformation2D; const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rTargetDevice, rTargetDevice,
aViewInformation2D)); aViewInformation2D));

3
svx/source/svdraw/svdhdl.cxx
View File

@ -66,7 +66,6 @@
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
// #i15222# // #i15222#
@ -1045,7 +1044,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
aRetval.Erase(aCol); aRetval.Erase(aCol);
// get write access // get write access
boost::scoped_ptr<BitmapWriteAccess> pWrite(aRetval.AcquireWriteAccess()); std::unique_ptr<BitmapWriteAccess> pWrite(aRetval.AcquireWriteAccess());
DBG_ASSERT(pWrite, "Got NO write access to a new Bitmap!"); DBG_ASSERT(pWrite, "Got NO write access to a new Bitmap!");
if(pWrite) if(pWrite)

4
svx/source/svdraw/svdobj.cxx
View File

@ -135,9 +135,9 @@
#include <svdobjplusdata.hxx> #include <svdobjplusdata.hxx>
#include <svdobjuserdatalist.hxx> #include <svdobjuserdatalist.hxx>
#include <boost/scoped_ptr.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <libxml/xmlwriter.h> #include <libxml/xmlwriter.h>
#include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -3163,7 +3163,7 @@ SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNe
SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel ) SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel )
{ {
boost::scoped_ptr<SdrObjFactory> pFact(new SdrObjFactory(nInventor, nIdentifier, pPage, pModel)); std::unique_ptr<SdrObjFactory> pFact(new SdrObjFactory(nInventor, nIdentifier, pPage, pModel));
SdrLinkList& rLL = ImpGetUserMakeObjHdl(); SdrLinkList& rLL = ImpGetUserMakeObjHdl();
unsigned n = rLL.GetLinkCount(); unsigned n = rLL.GetLinkCount();

6
svx/source/svdraw/svdograf.cxx
View File

@ -61,7 +61,7 @@
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <drawinglayer/processor2d/objectinfoextractor2d.hxx> #include <drawinglayer/processor2d/objectinfoextractor2d.hxx>
#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
@ -1315,7 +1315,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* )
uno::Reference<io::XInputStream> const xStream( uno::Reference<io::XInputStream> const xStream(
pModel->GetDocumentStream(aUserData, proxy)); pModel->GetDocumentStream(aUserData, proxy));
::boost::scoped_ptr<SvStream> const pStream( (xStream.is()) std::unique_ptr<SvStream> const pStream( (xStream.is())
? ::utl::UcbStreamHelper::CreateStream(xStream) ? ::utl::UcbStreamHelper::CreateStream(xStream)
: 0 ); : 0 );
@ -1323,7 +1323,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* )
{ {
Graphic aGraphic; Graphic aGraphic;
boost::scoped_ptr<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > pFilterData; std::unique_ptr<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > pFilterData;
if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true)) if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true))
{ {

2
svx/source/svdraw/svdomedia.cxx
View File

@ -72,7 +72,7 @@ struct MediaTempFile
struct SdrMediaObj::Impl struct SdrMediaObj::Impl
{ {
::avmedia::MediaItem m_MediaProperties; ::avmedia::MediaItem m_MediaProperties;
::boost::shared_ptr< MediaTempFile > m_pTempFile; std::shared_ptr< MediaTempFile > m_pTempFile;
uno::Reference< graphic::XGraphic > m_xCachedSnapshot; uno::Reference< graphic::XGraphic > m_xCachedSnapshot;
OUString m_LastFailedPkgURL; OUString m_LastFailedPkgURL;
}; };

4
svx/source/svdraw/svdotxln.cxx
View File

@ -33,7 +33,7 @@
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#include <tools/tenccvt.hxx> #include <tools/tenccvt.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
class ImpSdrObjTextLink: public ::sfx2::SvBaseLink class ImpSdrObjTextLink: public ::sfx2::SvBaseLink
{ {
@ -220,7 +220,7 @@ bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterNa
DBG_ASSERT( aFileURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); DBG_ASSERT( aFileURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm ) if( pIStm )
{ {

4
svx/source/svdraw/svdtext.cxx
View File

@ -25,7 +25,7 @@
#include "editeng/fhgtitem.hxx" #include "editeng/fhgtitem.hxx"
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ ) SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ )
: mpOutlinerParaObject( pOutlinerParaObject ) : mpOutlinerParaObject( pOutlinerParaObject )
@ -173,7 +173,7 @@ void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode )
{ {
if( mpModel && !mpOutlinerParaObject ) if( mpModel && !mpOutlinerParaObject )
{ {
boost::scoped_ptr<Outliner> pOutliner(SdrMakeOutliner(nOutlMode, *mpModel)); std::unique_ptr<Outliner> pOutliner(SdrMakeOutliner(nOutlMode, *mpModel));
if( pOutliner ) if( pOutliner )
{ {
Outliner& aDrawOutliner = mpModel->GetDrawOutliner(); Outliner& aDrawOutliner = mpModel->GetDrawOutliner();

13
svx/source/table/tablertfimporter.cxx
View File

@ -18,9 +18,8 @@
*/ */
#include <memory>
#include <vector> #include <vector>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <com/sun/star/table/XTable.hpp> #include <com/sun/star/table/XTable.hpp>
@ -58,7 +57,7 @@ struct RTFCellDefault
explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {} explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {}
}; };
typedef std::vector< boost::shared_ptr< RTFCellDefault > > RTFCellDefaultVector; typedef std::vector< std::shared_ptr< RTFCellDefault > > RTFCellDefaultVector;
struct RTFCellInfo struct RTFCellInfo
{ {
@ -70,10 +69,10 @@ struct RTFCellInfo
explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0), mnParaCount(0), mnColSpan(0) {} explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0), mnParaCount(0), mnColSpan(0) {}
}; };
typedef boost::shared_ptr< RTFCellInfo > RTFCellInfoPtr; typedef std::shared_ptr< RTFCellInfo > RTFCellInfoPtr;
typedef std::vector< RTFCellInfoPtr > RTFColumnVector; typedef std::vector< RTFCellInfoPtr > RTFColumnVector;
typedef boost::shared_ptr< RTFColumnVector > RTFColumnVectorPtr; typedef std::shared_ptr< RTFColumnVector > RTFColumnVectorPtr;
class SdrTableRTFParser class SdrTableRTFParser
{ {
@ -274,7 +273,7 @@ void SdrTableRTFParser::FillTable()
if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SfxItemState::SET) if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SfxItemState::SET)
xCell->SetMergedItem( *pPoolItem ); xCell->SetMergedItem( *pPoolItem );
boost::scoped_ptr<OutlinerParaObject> pTextObject(mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount )); std::unique_ptr<OutlinerParaObject> pTextObject(mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount ));
if( pTextObject ) if( pTextObject )
{ {
SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner(); SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
@ -361,7 +360,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
{ {
mbNewDef = true; mbNewDef = true;
mpInsDefault->mnCol = mnColCnt; mpInsDefault->mnCol = mnColCnt;
maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) ); maDefaultList.push_back( std::shared_ptr< RTFCellDefault >( mpInsDefault ) );
if( (sal_Int32)maColumnEdges.size() <= mnColCnt ) if( (sal_Int32)maColumnEdges.size() <= mnColCnt )
maColumnEdges.resize( mnColCnt + 1 ); maColumnEdges.resize( mnColCnt + 1 );

6
svx/source/tbxctrls/fillctrl.cxx
View File

@ -38,7 +38,7 @@
#include <svx/itemwin.hxx> #include <svx/itemwin.hxx>
#include <svx/dialmgr.hxx> #include <svx/dialmgr.hxx>
#include "helpid.hrc" #include "helpid.hrc"
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
@ -376,7 +376,7 @@ void SvxFillToolBoxControl::Update()
} }
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END; aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
boost::scoped_ptr<XGradientEntry> pEntry(new XGradientEntry(mpFillGradientItem->GetGradientValue(), aTmpStr)); std::unique_ptr<XGradientEntry> pEntry(new XGradientEntry(mpFillGradientItem->GetGradientValue(), aTmpStr));
XGradientList aGradientList( "", ""/*TODO?*/ ); XGradientList aGradientList( "", ""/*TODO?*/ );
aGradientList.Insert( pEntry.get() ); aGradientList.Insert( pEntry.get() );
aGradientList.SetDirty( false ); aGradientList.SetDirty( false );
@ -501,7 +501,7 @@ void SvxFillToolBoxControl::Update()
} }
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END; aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
boost::scoped_ptr<XBitmapEntry> pEntry(new XBitmapEntry(mpBitmapItem->GetGraphicObject(), aTmpStr)); std::unique_ptr<XBitmapEntry> pEntry(new XBitmapEntry(mpBitmapItem->GetGraphicObject(), aTmpStr));
XBitmapListRef xBitmapList = XBitmapListRef xBitmapList =
XPropertyList::AsBitmapList( XPropertyList::AsBitmapList(
XPropertyList::CreatePropertyList( XPropertyList::CreatePropertyList(

4
svx/source/tbxctrls/fontworkgallery.cxx
View File

@ -51,7 +51,7 @@
#include "coreservices.hxx" #include "coreservices.hxx"
#include <algorithm> #include <algorithm>
#include <boost/scoped_ptr.hpp> #include <memory>
#include "helpid.hrc" #include "helpid.hrc"
@ -201,7 +201,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
if( nItemId > 0 ) if( nItemId > 0 )
{ {
boost::scoped_ptr<FmFormModel> pModel(new FmFormModel()); std::unique_ptr<FmFormModel> pModel(new FmFormModel());
pModel->GetItemPool().FreezeIdRanges(); pModel->GetItemPool().FreezeIdRanges();
if( GalleryExplorer::GetSdrObj( mnThemeId, nItemId-1, pModel.get() ) ) if( GalleryExplorer::GetSdrObj( mnThemeId, nItemId-1, pModel.get() ) )

6
svx/source/tbxctrls/linectrl.cxx
View File

@ -34,7 +34,7 @@
#include <svx/itemwin.hxx> #include <svx/itemwin.hxx>
#include <svx/dialmgr.hxx> #include <svx/dialmgr.hxx>
#include <svx/unoapi.hxx> #include <svx/unoapi.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
@ -333,8 +333,8 @@ void SvxLineEndWindow::dispose()
IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void)
{ {
boost::scoped_ptr<XLineEndItem> pLineEndItem; std::unique_ptr<XLineEndItem> pLineEndItem;
boost::scoped_ptr<XLineStartItem> pLineStartItem; std::unique_ptr<XLineStartItem> pLineStartItem;
sal_uInt16 nId = aLineEndSet->GetSelectItemId(); sal_uInt16 nId = aLineEndSet->GetSelectItemId();
if( nId == 1 ) if( nId == 1 )

4
svx/source/tbxctrls/tbunocontroller.cxx
View File

@ -36,7 +36,7 @@
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -195,7 +195,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto
// Sizes-Liste auff"ullen // Sizes-Liste auff"ullen
sal_Int64 nOldVal = GetValue(); // alten Wert merken sal_Int64 nOldVal = GetValue(); // alten Wert merken
const FontList* _pFontList = NULL; const FontList* _pFontList = NULL;
boost::scoped_ptr<FontList> aHold( new FontList( this )); std::unique_ptr<FontList> aHold( new FontList( this ));
_pFontList = aHold.get(); _pFontList = aHold.get();
if ( !rCurrentFont.Name.isEmpty() ) if ( !rCurrentFont.Name.isEmpty() )

12
svx/source/unodraw/UnoGraphicExporter.cxx
View File

@ -66,10 +66,8 @@
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
#include <svx/svdoutl.hxx> #include <svx/svdoutl.hxx>
#include <editeng/flditem.hxx> #include <editeng/flditem.hxx>
#include <boost/scoped_ptr.hpp>
#include <UnoGraphicExporter.hxx> #include <UnoGraphicExporter.hxx>
#include <memory>
#define MAX_EXT_PIX 2048 #define MAX_EXT_PIX 2048
@ -437,7 +435,7 @@ VclPtr<VirtualDevice> GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntP
if(bSuccess) if(bSuccess)
{ {
boost::scoped_ptr<SdrView> pView(new SdrView(mpDoc, pVDev)); std::unique_ptr<SdrView> pView(new SdrView(mpDoc, pVDev));
pView->SetPageVisible( false ); pView->SetPageVisible( false );
pView->SetBordVisible( false ); pView->SetBordVisible( false );
pView->SetGridVisible( false ); pView->SetGridVisible( false );
@ -699,7 +697,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
} }
} }
boost::scoped_ptr< SdrView > pLocalView; std::unique_ptr< SdrView > pLocalView;
if( PTR_CAST( FmFormModel, mpDoc ) ) if( PTR_CAST( FmFormModel, mpDoc ) )
{ {
pLocalView.reset( new FmFormView( PTR_CAST( FmFormModel, mpDoc ), aVDev ) ); pLocalView.reset( new FmFormView( PTR_CAST( FmFormModel, mpDoc ), aVDev ) );
@ -732,7 +730,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
Size aNewSize; Size aNewSize;
// create a view // create a view
boost::scoped_ptr< SdrView > pView; std::unique_ptr< SdrView > pView;
if( PTR_CAST( FmFormModel, mpDoc ) ) if( PTR_CAST( FmFormModel, mpDoc ) )
{ {
pView.reset(new FmFormView( PTR_CAST( FmFormModel, mpDoc ), aVDev )); pView.reset(new FmFormView( PTR_CAST( FmFormModel, mpDoc ), aVDev ));
@ -861,7 +859,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
Rectangle aScrollRectangle; Rectangle aScrollRectangle;
Rectangle aPaintRectangle; Rectangle aPaintRectangle;
const boost::scoped_ptr< GDIMetaFile > pMtf( const std::unique_ptr< GDIMetaFile > pMtf(
static_cast<SdrTextObj*>(pObj)->GetTextScrollMetaFileAndRectangle( static_cast<SdrTextObj*>(pObj)->GetTextScrollMetaFileAndRectangle(
aScrollRectangle, aPaintRectangle ) ); aScrollRectangle, aPaintRectangle ) );

4
svx/source/unodraw/UnoNameItemTable.cxx
View File

@ -30,7 +30,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include "svx/unoapi.hxx" #include "svx/unoapi.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::cppu; using namespace ::cppu;
@ -87,7 +87,7 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich ); SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich );
maItemSetVector.push_back( mpInSet ); maItemSetVector.push_back( mpInSet );
boost::scoped_ptr<NameOrIndex> pNewItem(createItem()); std::unique_ptr<NameOrIndex> pNewItem(createItem());
pNewItem->SetName( aName ); pNewItem->SetName( aName );
pNewItem->PutValue( aElement, mnMemberId ); pNewItem->PutValue( aElement, mnMemberId );
mpInSet->Put( *pNewItem, mnWhich ); mpInSet->Put( *pNewItem, mnWhich );

4
svx/source/unodraw/unopool.cxx
View File

@ -38,7 +38,7 @@
#include <editeng/editeng.hxx> #include <editeng/editeng.hxx>
#include "svx/unoapi.hxx" #include "svx/unoapi.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::cppu; using namespace ::cppu;
@ -185,7 +185,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
default: default:
{ {
boost::scoped_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() ); std::unique_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM ) if( pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM )
nMemberId &= (~CONVERT_TWIPS); nMemberId &= (~CONVERT_TWIPS);

5
svx/source/unodraw/unoshap2.cxx
View File

@ -34,7 +34,6 @@
#include <vcl/fltcall.hxx> #include <vcl/fltcall.hxx>
#include <vcl/graphicfilter.hxx> #include <vcl/graphicfilter.hxx>
#include <boost/scoped_ptr.hpp>
#include <svx/svdpool.hxx> #include <svx/svdpool.hxx>
#include <editeng/unoprnms.hxx> #include <editeng/unoprnms.hxx>
@ -58,6 +57,8 @@
#include <comphelper/servicehelper.hxx> #include <comphelper/servicehelper.hxx>
#include <vcl/wmf.hxx> #include <vcl/wmf.hxx>
#include <memory>
using namespace ::osl; using namespace ::osl;
using namespace ::cppu; using namespace ::cppu;
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -1866,7 +1867,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
bool bNeedsMirrorX = static_cast<SdrObjCustomShape*>(pObject)->IsMirroredX() != bMirroredX; bool bNeedsMirrorX = static_cast<SdrObjCustomShape*>(pObject)->IsMirroredX() != bMirroredX;
bool bNeedsMirrorY = static_cast<SdrObjCustomShape*>(pObject)->IsMirroredY() != bMirroredY; bool bNeedsMirrorY = static_cast<SdrObjCustomShape*>(pObject)->IsMirroredY() != bMirroredY;
boost::scoped_ptr< SdrGluePointList > pListCopy; std::unique_ptr< SdrGluePointList > pListCopy;
if( bNeedsMirrorX || bNeedsMirrorY ) if( bNeedsMirrorX || bNeedsMirrorY )
{ {
const SdrGluePointList* pList = pObject->GetGluePointList(); const SdrGluePointList* pList = pObject->GetGluePointList();

8
svx/source/unodraw/unoshape.cxx
View File

@ -87,14 +87,14 @@
#include "shapeimpl.hxx" #include "shapeimpl.hxx"
#include <sal/log.hxx> #include <sal/log.hxx>
#include <vector>
#include "svx/lathe3d.hxx" #include "svx/lathe3d.hxx"
#include "svx/extrud3d.hxx" #include "svx/extrud3d.hxx"
#include <boost/scoped_ptr.hpp>
#include <vcl/wmf.hxx> #include <vcl/wmf.hxx>
#include <memory>
#include <vector>
using namespace ::osl; using namespace ::osl;
using namespace ::cppu; using namespace ::cppu;
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -675,7 +675,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
SdrModel* pModel = mpObj->GetModel(); SdrModel* pModel = mpObj->GetModel();
SdrPage* pPage = mpObj->GetPage(); SdrPage* pPage = mpObj->GetPage();
boost::scoped_ptr<E3dView> pView(new E3dView( pModel, pVDev.get() )); std::unique_ptr<E3dView> pView(new E3dView( pModel, pVDev.get() ));
pView->hideMarkHandles(); pView->hideMarkHandles();
SdrPageView* pPageView = pView->ShowSdrPage(pPage); SdrPageView* pPageView = pView->ShowSdrPage(pPage);

4
svx/source/unogallery/unogalitem.cxx
View File

@ -35,7 +35,7 @@
#include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/gallery/GalleryItemType.hpp> #include <com/sun/star/gallery/GalleryItemType.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
#define UNOGALLERY_GALLERYITEMTYPE 1 #define UNOGALLERY_GALLERYITEMTYPE 1
#define UNOGALLERY_URL 2 #define UNOGALLERY_URL 2
@ -273,7 +273,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt
if( pGalTheme ) if( pGalTheme )
{ {
boost::scoped_ptr<SgaObject> pObj(pGalTheme->ImplReadSgaObject( const_cast< GalleryObject* >( implGetObject() ) )); std::unique_ptr<SgaObject> pObj(pGalTheme->ImplReadSgaObject( const_cast< GalleryObject* >( implGetObject() ) ));
if( pObj ) if( pObj )
{ {

6
svx/source/xml/xmleohlp.cxx
View File

@ -44,9 +44,9 @@
#include <comphelper/classids.hxx> #include <comphelper/classids.hxx>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <map>
#include "svx/xmleohlp.hxx" #include "svx/xmleohlp.hxx"
#include <boost/scoped_ptr.hpp> #include <map>
#include <memory>
using namespace ::osl; using namespace ::osl;
using namespace ::cppu; using namespace ::cppu;
@ -405,7 +405,7 @@ bool SvXMLEmbeddedObjectHelper::ImplReadObject(
pTemp->Seek( 0 ); pTemp->Seek( 0 );
uno::Reference < io::XStream > xStm = xDocStor->openStreamElement( rObjName, uno::Reference < io::XStream > xStm = xDocStor->openStreamElement( rObjName,
embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( xStm )); std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( xStm ));
pTemp->ReadStream( *pStream ); pTemp->ReadStream( *pStream );
pStream.reset(); pStream.reset();

8
svx/source/xml/xmlgrhlp.cxx
View File

@ -47,7 +47,7 @@
#include "svx/xmleohlp.hxx" #include "svx/xmleohlp.hxx"
#include <algorithm> #include <algorithm>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
@ -313,7 +313,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
if( sFirstBytes[0] == 0x1f && sFirstBytes[1] == 0x8b ) if( sFirstBytes[0] == 0x1f && sFirstBytes[1] == 0x8b )
{ {
boost::scoped_ptr<SvMemoryStream> pDest(new SvMemoryStream); std::unique_ptr<SvMemoryStream> pDest(new SvMemoryStream);
ZCodec aZCodec( 0x8000, 0x8000 ); ZCodec aZCodec( 0x8000, 0x8000 );
aZCodec.BeginCompression(ZCODEC_DEFAULT_COMPRESSION, false, true); aZCodec.BeginCompression(ZCODEC_DEFAULT_COMPRESSION, false, true);
mpOStm->Seek( 0 ); mpOStm->Seek( 0 );
@ -501,7 +501,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName
SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) ); SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) );
if( aStream.xStream.is() ) if( aStream.xStream.is() )
{ {
boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aStream.xStream )); std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aStream.xStream ));
GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *pStream ); GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, "", *pStream );
} }
@ -538,7 +538,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName,
aAny <<= bCompressed; aAny <<= bCompressed;
xProps->setPropertyValue( "Compressed", aAny ); xProps->setPropertyValue( "Compressed", aAny );
boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aStream.xStream )); std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aStream.xStream ));
if( bUseGfxLink && aGfxLink.GetDataSize() && aGfxLink.GetData() ) if( bUseGfxLink && aGfxLink.GetDataSize() && aGfxLink.GetData() )
pStream->Write( aGfxLink.GetData(), aGfxLink.GetDataSize() ); pStream->Write( aGfxLink.GetData(), aGfxLink.GetDataSize() );
else else

4
svx/source/xml/xmlxtexp.cxx
View File

@ -49,7 +49,7 @@
#include "xmlxtexp.hxx" #include "xmlxtexp.hxx"
#include <comphelper/storagehelper.hxx> #include <comphelper/storagehelper.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
using namespace com::sun::star::container; using namespace com::sun::star::container;
@ -355,7 +355,7 @@ bool SvxXMLXTableExportComponent::exportTable() throw()
char const* pEleName; char const* pEleName;
Type aExportType = mxTable->getElementType(); Type aExportType = mxTable->getElementType();
boost::scoped_ptr<SvxXMLTableEntryExporter> pExporter; std::unique_ptr<SvxXMLTableEntryExporter> pExporter;
if( aExportType == cppu::UnoType<sal_Int32>::get() ) if( aExportType == cppu::UnoType<sal_Int32>::get() )
{ {

4
svx/source/xoutdev/xexch.cxx
View File

@ -26,7 +26,7 @@
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <svx/xdef.hxx> #include <svx/xdef.hxx>
#include "svx/xexch.hxx" #include "svx/xexch.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
/// default CTOR, for Assign() /// default CTOR, for Assign()
@ -107,7 +107,7 @@ SvStream& ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rData )
if( nWhich ) if( nWhich )
{ {
boost::scoped_ptr<SfxPoolItem> pNewItem(rData.pPool->GetDefaultItem( nWhich ).Create( rIStm, nItemVersion )); std::unique_ptr<SfxPoolItem> pNewItem(rData.pPool->GetDefaultItem( nWhich ).Create( rIStm, nItemVersion ));
if( pNewItem ) if( pNewItem )
{ {

4
svx/source/xoutdev/xtabdash.cxx
View File

@ -31,7 +31,7 @@
#include <drawinglayer/attribute/strokeattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -159,7 +159,7 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
} }
// create processor and draw primitives // create processor and draw primitives
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
*pVirtualDevice.get(), *pVirtualDevice.get(),
aNewViewInformation2D)); aNewViewInformation2D));

4
svx/source/xoutdev/xtabgrdt.cxx
View File

@ -32,7 +32,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -190,7 +190,7 @@ Bitmap XGradientList::CreateBitmapForUI( long nIndex )
: DrawModeFlags::Default); : DrawModeFlags::Default);
// create processor and draw primitives // create processor and draw primitives
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
*pVirtualDevice.get(), *pVirtualDevice.get(),
aNewViewInformation2D)); aNewViewInformation2D));

4
svx/source/xoutdev/xtabhtch.cxx
View File

@ -31,7 +31,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -165,7 +165,7 @@ Bitmap XHatchList::CreateBitmapForUI( long nIndex )
} }
// create processor and draw primitives // create processor and draw primitives
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
*pVirtualDevice.get(), *pVirtualDevice.get(),
aNewViewInformation2D)); aNewViewInformation2D));

4
svx/source/xoutdev/xtablend.cxx
View File

@ -31,7 +31,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace com::sun::star; using namespace com::sun::star;
@ -148,7 +148,7 @@ Bitmap XLineEndList::CreateBitmapForUI( long nIndex )
} }
// create processor and draw primitives // create processor and draw primitives
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
*pVirtualDevice.get(), *pVirtualDevice.get(),
aNewViewInformation2D)); aNewViewInformation2D));

4
toolkit/source/controls/unocontrolcontainer.cxx
View File

@ -36,7 +36,7 @@
#include <limits> #include <limits>
#include <map> #include <map>
#include <boost/shared_ptr.hpp> #include <memory>
#include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -65,7 +65,7 @@ class UnoControlHolderList
public: public:
typedef sal_Int32 ControlIdentifier; typedef sal_Int32 ControlIdentifier;
private: private:
typedef ::boost::shared_ptr< UnoControlHolder > ControlInfo; typedef std::shared_ptr< UnoControlHolder > ControlInfo;
typedef ::std::map< ControlIdentifier, ControlInfo > ControlMap; typedef ::std::map< ControlIdentifier, ControlInfo > ControlMap;
private: private:

5
vbahelper/source/vbahelper/vbacommandbarhelper.hxx
View File

@ -27,8 +27,7 @@
#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XLayoutManager.hpp>
#include <boost/shared_ptr.hpp> #include <memory>
static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
@ -47,7 +46,7 @@ static const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu"; static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
class VbaCommandBarHelper; class VbaCommandBarHelper;
typedef ::boost::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef; typedef std::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef;
class VbaCommandBarHelper class VbaCommandBarHelper
{ {

4
writerperfect/qa/unit/WPXSvStreamTest.cxx
View File

@ -11,7 +11,7 @@
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
#include <boost/shared_ptr.hpp> #include <memory>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
@ -32,7 +32,7 @@ namespace io = com::sun::star::io;
namespace ucb = com::sun::star::ucb; namespace ucb = com::sun::star::ucb;
namespace uno = com::sun::star::uno; namespace uno = com::sun::star::uno;
using boost::shared_ptr; using std::shared_ptr;
using librevenge::RVNGInputStream; using librevenge::RVNGInputStream;
using librevenge::RVNG_SEEK_CUR; using librevenge::RVNG_SEEK_CUR;

4
writerperfect/source/impress/KeynoteImportFilter.cxx
View File

@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <boost/shared_ptr.hpp> #include <memory>
#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XChild.hpp>
@ -33,7 +33,7 @@
#include "KeynoteImportFilter.hxx" #include "KeynoteImportFilter.hxx"
using boost::shared_ptr; using std::shared_ptr;
using com::sun::star::io::XInputStream; using com::sun::star::io::XInputStream;
using com::sun::star::uno::Any; using com::sun::star::uno::Any;

1
xmloff/inc/pch/precompiled_xo.hxx
View File

@ -37,7 +37,6 @@
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <cassert> #include <cassert>
#include <com/sun/star/animations/AnimationAdditiveMode.hpp> #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
#include <com/sun/star/animations/AnimationCalcMode.hpp> #include <com/sun/star/animations/AnimationCalcMode.hpp>

3
xmloff/source/draw/XMLNumberStyles.cxx
View File

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <boost/shared_ptr.hpp>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <XMLNumberStylesExport.hxx> #include <XMLNumberStylesExport.hxx>
#include <XMLNumberStylesImport.hxx> #include <XMLNumberStylesImport.hxx>
@ -486,7 +485,7 @@ private:
bool mbTextual; bool mbTextual;
bool mbDecimal02; bool mbDecimal02;
OUString maText; OUString maText;
boost::shared_ptr< SvXMLImportContext > mpSlaveContext; std::shared_ptr< SvXMLImportContext > mpSlaveContext;
public: public:
TYPEINFO_OVERRIDE(); TYPEINFO_OVERRIDE();

4
xmloff/source/draw/shapeexport.cxx
View File

@ -113,7 +113,7 @@
#include "xexptran.hxx" #include "xexptran.hxx"
#include "XMLBase64Export.hxx" #include "XMLBase64Export.hxx"
#include "XMLImageMapExport.hxx" #include "XMLImageMapExport.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
#include <config_features.h> #include <config_features.h>
@ -585,7 +585,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
sal_Int32 nZIndex = 0; sal_Int32 nZIndex = 0;
uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY );
boost::scoped_ptr< SvXMLElementExport > mpHyperlinkElement; std::unique_ptr< SvXMLElementExport > mpHyperlinkElement;
// export hyperlinks with <a><shape/></a>. Currently only in draw since draw // export hyperlinks with <a><shape/></a>. Currently only in draw since draw
// does not support document events // does not support document events

20
xmloff/source/style/PageMasterImportPropMapper.cxx
View File

@ -25,7 +25,7 @@
#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>
#include <xmloff/xmlimp.hxx> #include <xmloff/xmlimp.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
#define XML_LINE_LEFT 0 #define XML_LINE_LEFT 0
#define XML_LINE_RIGHT 1 #define XML_LINE_RIGHT 1
@ -50,7 +50,7 @@ PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper()
bool PageMasterImportPropertyMapper::handleSpecialItem( bool PageMasterImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty, XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties, std::vector< XMLPropertyState >& rProperties,
const OUString& rValue, const OUString& rValue,
const SvXMLUnitConverter& rUnitConverter, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap ) const const SvXMLNamespaceMap& rNamespaceMap ) const
@ -82,7 +82,7 @@ bool PageMasterImportPropertyMapper::handleSpecialItem(
} }
void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const
{ {
SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex); SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex);
XMLPropertyState* pAllPaddingProperty = NULL; XMLPropertyState* pAllPaddingProperty = NULL;
@ -111,22 +111,22 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
XMLPropertyState* pFooterBorderWidths[4] = { NULL, NULL, NULL, NULL }; XMLPropertyState* pFooterBorderWidths[4] = { NULL, NULL, NULL, NULL };
XMLPropertyState* pHeaderHeight = NULL; XMLPropertyState* pHeaderHeight = NULL;
XMLPropertyState* pHeaderMinHeight = NULL; XMLPropertyState* pHeaderMinHeight = NULL;
boost::scoped_ptr<XMLPropertyState> xHeaderDynamic; std::unique_ptr<XMLPropertyState> xHeaderDynamic;
XMLPropertyState* pFooterHeight = NULL; XMLPropertyState* pFooterHeight = NULL;
XMLPropertyState* pFooterMinHeight = NULL; XMLPropertyState* pFooterMinHeight = NULL;
boost::scoped_ptr<XMLPropertyState> xFooterDynamic; std::unique_ptr<XMLPropertyState> xFooterDynamic;
XMLPropertyState* pAllMarginProperty = NULL; XMLPropertyState* pAllMarginProperty = NULL;
XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL }; XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
::std::unique_ptr<XMLPropertyState> pNewMargins[4]; std::unique_ptr<XMLPropertyState> pNewMargins[4];
XMLPropertyState* pAllHeaderMarginProperty = NULL; XMLPropertyState* pAllHeaderMarginProperty = NULL;
XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL }; XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
::std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4]; std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4];
XMLPropertyState* pAllFooterMarginProperty = NULL; XMLPropertyState* pAllFooterMarginProperty = NULL;
XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL }; XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL };
::std::unique_ptr<XMLPropertyState> pNewFooterMargins[4]; std::unique_ptr<XMLPropertyState> pNewFooterMargins[4];
::std::vector< XMLPropertyState >::iterator aEnd = rProperties.end(); std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter) for (std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter)
{ {
XMLPropertyState *property = &(*aIter); XMLPropertyState *property = &(*aIter);
sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex); sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex);

4
xmloff/source/style/styleexp.cxx
View File

@ -39,8 +39,8 @@
#include <xmloff/xmlexp.hxx> #include <xmloff/xmlexp.hxx>
#include <xmloff/XMLEventExport.hxx> #include <xmloff/XMLEventExport.hxx>
#include <xmloff/maptype.hxx> #include <xmloff/maptype.hxx>
#include <memory>
#include <set> #include <set>
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
@ -398,7 +398,7 @@ void XMLStyleExport::exportStyleFamily(
// If next styles are supported and used styles should be exported only, // If next styles are supported and used styles should be exported only,
// the next style may be unused but has to be exported, too. In this case // the next style may be unused but has to be exported, too. In this case
// the names of all exported styles are remembered. // the names of all exported styles are remembered.
boost::scoped_ptr<std::set<OUString> > pExportedStyles(0); std::unique_ptr<std::set<OUString> > pExportedStyles(nullptr);
bool bFirstStyle = true; bool bFirstStyle = true;
const uno::Sequence< OUString> aSeq = xStyleCont->getElementNames(); const uno::Sequence< OUString> aSeq = xStyleCont->getElementNames();

24
xmlscript/source/xmldlg_imexp/imp_share.hxx
View File

@ -41,8 +41,8 @@
#include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/container/ElementExistException.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <memory>
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp>
namespace xmlscript namespace xmlscript
{ {
@ -118,8 +118,8 @@ struct DialogImport
css::uno::Reference< css::uno::XComponentContext > _xContext; css::uno::Reference< css::uno::XComponentContext > _xContext;
css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier; css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier;
::boost::shared_ptr< ::std::vector< OUString > > _pStyleNames; std::shared_ptr< std::vector< OUString > > _pStyleNames;
::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles; std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles;
css::uno::Reference< css::container::XNameContainer > _xDialogModel; css::uno::Reference< css::container::XNameContainer > _xDialogModel;
css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory; css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
@ -151,8 +151,8 @@ public:
css::uno::Reference<css::uno::XComponentContext> const & xContext, css::uno::Reference<css::uno::XComponentContext> const & xContext,
css::uno::Reference<css::container::XNameContainer> css::uno::Reference<css::container::XNameContainer>
const & xDialogModel, const & xDialogModel,
::boost::shared_ptr< ::std::vector< OUString > >& pStyleNames, std::shared_ptr< std::vector< OUString > >& pStyleNames,
::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles, std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles,
css::uno::Reference<css::frame::XModel> const & xDoc ) css::uno::Reference<css::frame::XModel> const & xDoc )
: _xContext( xContext ) : _xContext( xContext )
, _pStyleNames( pStyleNames ) , _pStyleNames( pStyleNames )
@ -330,8 +330,8 @@ public:
class MenuPopupElement class MenuPopupElement
: public ElementBase : public ElementBase
{ {
::std::vector< OUString > _itemValues; std::vector< OUString > _itemValues;
::std::vector< sal_Int16 > _itemSelected; std::vector< sal_Int16 > _itemSelected;
public: public:
css::uno::Sequence< OUString > getItemValues(); css::uno::Sequence< OUString > getItemValues();
css::uno::Sequence< sal_Int16 > getSelectedItems(); css::uno::Sequence< sal_Int16 > getSelectedItems();
@ -359,7 +359,7 @@ class ControlElement
protected: protected:
sal_Int32 _nBasePosX, _nBasePosY; sal_Int32 _nBasePosX, _nBasePosY;
::std::vector< css::uno::Reference< css::xml::input::XElement > > _events; std::vector< css::uno::Reference< css::xml::input::XElement > > _events;
OUString getControlId( OUString getControlId(
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
@ -369,7 +369,7 @@ protected:
css::uno::Reference< css::xml::input::XElement > getStyle( css::uno::Reference< css::xml::input::XElement > getStyle(
css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ); css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
public: public:
::std::vector<css::uno::Reference< css::xml::input::XElement> >& getEvents() std::vector<css::uno::Reference< css::xml::input::XElement> >& getEvents()
{ return _events; } { return _events; }
ControlElement( ControlElement(
@ -404,7 +404,7 @@ public:
css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
bool supportPrintable = true ); bool supportPrintable = true );
void importEvents( void importEvents(
::std::vector< css::uno::Reference< css::xml::input::XElement > > std::vector< css::uno::Reference< css::xml::input::XElement > >
const & rEvents ); const & rEvents );
bool importStringProperty( bool importStringProperty(
@ -669,7 +669,7 @@ public:
class RadioGroupElement class RadioGroupElement
: public ControlElement : public ControlElement
{ {
::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios; std::vector< css::uno::Reference< css::xml::input::XElement > > _radios;
public: public:
virtual css::uno::Reference< css::xml::input::XElement > virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement( SAL_CALL startChildElement(
@ -691,7 +691,7 @@ class TitledBoxElement
: public BulletinBoardElement : public BulletinBoardElement
{ {
OUString _label; OUString _label;
::std::vector< css::uno::Reference< css::xml::input::XElement > > _radios; std::vector< css::uno::Reference< css::xml::input::XElement > > _radios;
public: public:
virtual css::uno::Reference< css::xml::input::XElement > virtual css::uno::Reference< css::xml::input::XElement >
SAL_CALL startChildElement( SAL_CALL startChildElement(

6
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
View File

@ -1450,7 +1450,7 @@ extern StringTriple const * const g_pEventTranslations;
StringTriple const * const g_pEventTranslations = s_aEventTranslations; StringTriple const * const g_pEventTranslations = s_aEventTranslations;
void ImportContext::importEvents( void ImportContext::importEvents(
::std::vector< Reference< xml::input::XElement > > const & rEvents ) std::vector< Reference< xml::input::XElement > > const & rEvents )
{ {
Reference< script::XScriptEventsSupplier > xSupplier( Reference< script::XScriptEventsSupplier > xSupplier(
_xControlModel, UNO_QUERY ); _xControlModel, UNO_QUERY );
@ -1826,8 +1826,8 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
Reference< XModel > const & xDocument ) Reference< XModel > const & xDocument )
{ {
// single set of styles and stylenames apply to all containees // single set of styles and stylenames apply to all containees
:: boost::shared_ptr< ::std::vector< OUString > > pStyleNames( new ::std::vector< OUString > ); std::shared_ptr< std::vector< OUString > > pStyleNames( new std::vector< OUString > );
:: boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new ::std::vector< css::uno::Reference< css::xml::input::XElement > > ); std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new std::vector< css::uno::Reference< css::xml::input::XElement > > );
return ::xmlscript::createDocumentHandler( return ::xmlscript::createDocumentHandler(
static_cast< xml::input::XRoot * >( static_cast< xml::input::XRoot * >(
new DialogImport( xContext, xDialogModel, pStyleNames, pStyles, xDocument ) ) ); new DialogImport( xContext, xDialogModel, pStyleNames, pStyles, xDocument ) ) );