diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 13:43:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:24:05 +0000 |
| commit | 3744d8506ef231d642785faf6da4926cea64c6a0 (patch) | |
| tree | 2d57ca5be9eda54aafb5065d7010bb50a37053ac | |
| parent | 7a17c038a6f4c433a69c6c1ed04aca2e5c929027 (diff) | |
boost->std
Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853
60 files changed, 397 insertions, 401 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 3d8c89f624b2..f81441cd747e 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -97,7 +97,7 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index b6d5e29b9124..959ed582287b 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/processfactory.hxx> #include <iderdll.hxx> @@ -48,7 +48,7 @@ namespace class Dll { Shell* m_pShell; - boost::scoped_ptr<ExtraData> m_pExtraData; + std::unique_ptr<ExtraData> m_xExtraData; public: Dll (); @@ -60,10 +60,10 @@ public: // Holds a basctl::Dll and release it on exit, or dispose of the //default XComponent, whichever comes first -class DllInstance : public comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll> +class DllInstance : public comphelper::unique_disposing_solar_mutex_reset_ptr<Dll> { public: - DllInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll>(Reference<lang::XComponent>( frame::Desktop::create(comphelper::getProcessComponentContext()), UNO_QUERY_THROW), new Dll) + DllInstance() : comphelper::unique_disposing_solar_mutex_reset_ptr<Dll>(Reference<lang::XComponent>( frame::Desktop::create(comphelper::getProcessComponentContext()), UNO_QUERY_THROW), new Dll) { } }; @@ -137,9 +137,9 @@ Dll::Dll () : ExtraData* Dll::GetExtraData () { - if (!m_pExtraData) - m_pExtraData.reset(new ExtraData); - return m_pExtraData.get(); + if (!m_xExtraData) + m_xExtraData.reset(new ExtraData); + return m_xExtraData.get(); } } // namespace diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx index c704b4aef005..1b5f86592ccf 100644 --- a/cppcanvas/qa/extras/emfplus/emfplus.cxx +++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx @@ -57,9 +57,9 @@ public: SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); CPPUNIT_ASSERT(pModel); SfxObjectShell* pShell = pModel->GetObjectShell(); - boost::shared_ptr<GDIMetaFile> pMetaFile = pShell->GetPreviewMetaFile(); + std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile(); BitmapEx aResultBitmap; - CPPUNIT_ASSERT(pMetaFile->CreateThumbnail(aResultBitmap)); + CPPUNIT_ASSERT(xMetaFile->CreateThumbnail(aResultBitmap)); // If this is set, the metafile will be dumped as a PNG one for debug purposes. char* pEnv = getenv("CPPCANVAS_DEBUG_EMFPLUS_DUMP_TO"); if (pEnv) diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index d993b0664ec7..3c0c6d8efcf0 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -80,7 +80,7 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/random.hxx> -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/string.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 12e83f6baf09..b1e1ad0f62a8 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <vcl/timer.hxx> #include <vcl/virdev.hxx> #include <vcl/font.hxx> @@ -46,10 +46,10 @@ namespace //The ImpTimerRefDev itself, if the timeout ever gets hit, will call //reset on the scoped_timed_RefDev to release the ImpTimerRefDev early //if its unused for a few minutes - class scoped_timed_RefDev : public comphelper::scoped_disposing_ptr<ImpTimedRefDev> + class scoped_timed_RefDev : public comphelper::unique_disposing_ptr<ImpTimedRefDev> { public: - scoped_timed_RefDev() : comphelper::scoped_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW))) + scoped_timed_RefDev() : comphelper::unique_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW))) { } }; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 11a2d9233003..4c33d210f778 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2588,7 +2588,7 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, EnhancedCustomShape2d aCustoShape2d( pCustoShape ); try { - ::boost::shared_ptr< EnhancedCustomShape::ExpressionNode > aExpressNode( + std::shared_ptr< EnhancedCustomShape::ExpressionNode > aExpressNode( EnhancedCustomShape::FunctionParser::parseFunction( sEquationSource[ i ], aCustoShape2d ) ); com::sun::star::drawing::EnhancedCustomShapeParameter aPara( aExpressNode->fillNode( rEquations, NULL, 0 ) ); if ( aPara.Type != com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 387bbac49af6..328fe2f9306e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -137,7 +137,7 @@ #include <rtl/ustring.hxx> #include <svtools/embedhlp.hxx> #include <boost/scoped_array.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star ; using namespace ::com::sun::star::drawing; @@ -257,17 +257,17 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( OUString("d:\\ashape.dbg"), aURLStr ) ) { - boost::scoped_ptr<SvStream> pOut(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::WRITE )); + std::unique_ptr<SvStream> xOut(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::WRITE )); - if( pOut ) + if( xOut ) { - pOut->Seek( STREAM_SEEK_TO_END ); + xOut->Seek( STREAM_SEEK_TO_END ); if ( IsProperty( DFF_Prop_adjustValue ) || IsProperty( DFF_Prop_pVertices ) ) { - pOut->WriteLine( "" ); + xOut->WriteLine( "" ); OString aString("ShapeId: " + OString::number(nShapeId)); - pOut->WriteLine(aString); + xOut->WriteLine(aString); } for ( sal_uInt32 i = DFF_Prop_adjustValue; i <= DFF_Prop_adjust10Value; i++ ) { @@ -275,7 +275,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const { OString aString("Prop_adjustValue" + OString::number( ( i - DFF_Prop_adjustValue ) + 1 ) + ":" + OString::number(GetPropertyValue(i)) ); - pOut->WriteLine(aString); + xOut->WriteLine(aString); } } sal_Int32 i; @@ -290,15 +290,15 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const sal_Int32 nLen = (sal_Int32)GetPropertyValue( i ); if ( nLen ) { - pOut->WriteLine( "" ); + xOut->WriteLine( "" ); OStringBuffer aDesc("Property:" + OString::number(i) + " Size:" + OString::number(nLen)); - pOut->WriteLine(aDesc.makeStringAndClear()); + xOut->WriteLine(aDesc.makeStringAndClear()); sal_Int16 nNumElem, nNumElemMem, nNumSize; rIn >> nNumElem >> nNumElemMem >> nNumSize; aDesc.append("Entries: " + OString::number(nNumElem) + " Size:" + OString::number(nNumSize)); - pOut->WriteLine(aDesc.makeStringAndClear()); + xOut->WriteLine(aDesc.makeStringAndClear()); if ( nNumSize < 0 ) nNumSize = ( ( -nNumSize ) >> 2 ); if ( !nNumSize ) @@ -315,21 +315,21 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const sal_uInt8 nVal; rIn >> nVal; if ( ( nVal >> 4 ) > 9 ) - *pOut << (sal_uInt8)( ( nVal >> 4 ) + 'A' - 10 ); + *xOut << (sal_uInt8)( ( nVal >> 4 ) + 'A' - 10 ); else - *pOut << (sal_uInt8)( ( nVal >> 4 ) + '0' ); + *xOut << (sal_uInt8)( ( nVal >> 4 ) + '0' ); if ( ( nVal & 0xf ) > 9 ) - *pOut << (sal_uInt8)( ( nVal & 0xf ) + 'A' - 10 ); + *xOut << (sal_uInt8)( ( nVal & 0xf ) + 'A' - 10 ); else - *pOut << (sal_uInt8)( ( nVal & 0xf ) + '0' ); + *xOut << (sal_uInt8)( ( nVal & 0xf ) + '0' ); nLen--; } } - *pOut << (char)( ' ' ); + *xOut << (char)( ' ' ); } - pOut->WriteLine( OString() ); + xOut->WriteLine( OString() ); } } } @@ -337,7 +337,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const { OString aString("Property" + OString::number(i) + ":" + OString::number(GetPropertyValue(i))); - pOut->WriteLine(aString); + xOut->WriteLine(aString); } } } @@ -3084,15 +3084,15 @@ DffRecordHeader* DffRecordManager::GetRecordHeader( sal_uInt16 nRecId, DffSeekTo bool CompareSvxMSDffShapeInfoById::operator() ( - ::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, - ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const + std::shared_ptr<SvxMSDffShapeInfo> const& lhs, + std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const { return lhs->nShapeId < rhs->nShapeId; } bool CompareSvxMSDffShapeInfoByTxBxComp::operator() ( - ::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, - ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const + std::shared_ptr<SvxMSDffShapeInfo> const& lhs, + std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const { return lhs->nTxBxComp < rhs->nTxBxComp; } @@ -5144,7 +5144,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, // the object with a frame, otherwise if( bTextFrame ) { - ::boost::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( + std::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( new SvxMSDffShapeInfo(0, pImpRec->nShapeId)); SvxMSDffShapeInfos_ById::const_iterator const it = @@ -5707,7 +5707,7 @@ void SvxMSDffManager::CheckTxBxStoryChain() mark = m_xShapeInfosByTxBxComp->begin(); iter != m_xShapeInfosByTxBxComp->end(); ++iter) { - boost::shared_ptr<SvxMSDffShapeInfo> const pObj = *iter; + std::shared_ptr<SvxMSDffShapeInfo> const pObj = *iter; if( pObj->nTxBxComp ) { // group change? @@ -6136,7 +6136,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, { aInfo.bReplaceByFly = true; } - m_xShapeInfosByTxBxComp->insert(::boost::shared_ptr<SvxMSDffShapeInfo>( + m_xShapeInfosByTxBxComp->insert(std::shared_ptr<SvxMSDffShapeInfo>( new SvxMSDffShapeInfo(aInfo))); pShapeOrders->push_back( new SvxMSDffShapeOrder( aInfo.nShapeId ) ); } @@ -6156,7 +6156,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape, SvxMSDffImportData& rData) { - ::boost::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( + std::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( new SvxMSDffShapeInfo(0, nId)); SvxMSDffShapeInfos_ById::const_iterator const it = @@ -6333,18 +6333,18 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect rBLIPStream.SeekRel( nSkip ); SvStream* pGrStream = &rBLIPStream; - boost::scoped_ptr<SvMemoryStream> pOut; + std::unique_ptr<SvMemoryStream> xOut; if( bZCodecCompression ) { - pOut.reset(new SvMemoryStream( 0x8000, 0x4000 )); + xOut.reset(new SvMemoryStream( 0x8000, 0x4000 )); ZCodec aZCodec( 0x8000, 0x8000 ); aZCodec.BeginCompression(); - aZCodec.Decompress( rBLIPStream, *pOut ); + aZCodec.Decompress( rBLIPStream, *xOut ); aZCodec.EndCompression(); - pOut->Seek( STREAM_SEEK_TO_BEGIN ); - pOut->SetResizeOffset( 0 ); // sj: #i102257# setting ResizeOffset of 0 prevents from seeking + xOut->Seek( STREAM_SEEK_TO_BEGIN ); + xOut->SetResizeOffset( 0 ); // sj: #i102257# setting ResizeOffset of 0 prevents from seeking // behind the stream end (allocating too much memory) - pGrStream = pOut.get(); + pGrStream = xOut.get(); } #if OSL_DEBUG_LEVEL > 2 @@ -6376,24 +6376,24 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect SAL_INFO("filter.ms", "dumping " << aURLStr); - boost::scoped_ptr<SvStream> pDbgOut(::utl::UcbStreamHelper::CreateStream(aURLStr, StreamMode::TRUNC | StreamMode::WRITE)); + std::unique_ptr<SvStream> pDbgOut(::utl::UcbStreamHelper::CreateStream(aURLStr, StreamMode::TRUNC | StreamMode::WRITE)); if( pDbgOut ) { if ( bZCodecCompression ) { - pOut->Seek( STREAM_SEEK_TO_END ); - pDbgOut->Write( pOut->GetData(), pOut->Tell() ); - pOut->Seek( STREAM_SEEK_TO_BEGIN ); + xOut->Seek( STREAM_SEEK_TO_END ); + pDbgOut->Write( xOut->GetData(), xOut->Tell() ); + xOut->Seek( STREAM_SEEK_TO_BEGIN ); } else { sal_Int32 nDbgLen = nLength - nSkip; if ( nDbgLen ) { - boost::scoped_array<sal_Char> pDat(new sal_Char[ nDbgLen ]); - pGrStream->Read( pDat.get(), nDbgLen ); - pDbgOut->Write( pDat.get(), nDbgLen ); + std::scoped_array<sal_Char> xDat(new sal_Char[ nDbgLen ]); + pGrStream->Read( xDat.get(), nDbgLen ); + pDbgOut->Write( xDat.get(), nDbgLen ); pGrStream->SeekRel( -nDbgLen ); } } @@ -6905,7 +6905,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS { //TODO/MBA: check if (and when) storage and stream will be destroyed! const SfxFilter* pFilter = 0; - ::boost::scoped_ptr<SvMemoryStream> xMemStream (new SvMemoryStream); + std::unique_ptr<SvMemoryStream> xMemStream (new SvMemoryStream); if ( pName ) { // TODO/LATER: perhaps we need to retrieve VisArea and Metafile from the storage also diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx index 2625f40510b9..1848639698c2 100644 --- a/include/comphelper/scoped_disposing_ptr.hxx +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -7,11 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX -#define INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX +#ifndef INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX +#define INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX #include <cppuhelper/implbase1.hxx> -#include <boost/utility.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XDesktop.hpp> @@ -22,13 +21,16 @@ namespace comphelper { //Similar to std::unique_ptr, except additionally releases the ptr on XComponent::disposing and/or XTerminateListener::notifyTermination if supported -template<class T> class scoped_disposing_ptr : private boost::noncopyable +template<class T> class unique_disposing_ptr { private: std::unique_ptr<T> m_xItem; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener; + + unique_disposing_ptr(const unique_disposing_ptr&) SAL_DELETED_FUNCTION; + unique_disposing_ptr& operator=(const unique_disposing_ptr&) SAL_DELETED_FUNCTION; public: - scoped_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) + unique_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) : m_xItem(p) { m_xTerminateListener = new TerminateListener(rComponent, *this); @@ -59,7 +61,7 @@ public: return static_cast< bool >(m_xItem); } - virtual ~scoped_disposing_ptr() + virtual ~unique_disposing_ptr() { reset(); } @@ -68,10 +70,10 @@ private: { private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; - scoped_disposing_ptr<T>& m_rItem; + unique_disposing_ptr<T>& m_rItem; public: TerminateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, - scoped_disposing_ptr<T>& rItem) : m_xComponent(rComponent), m_rItem(rItem) + unique_disposing_ptr<T>& rItem) : m_xComponent(rComponent), m_rItem(rItem) { if (m_xComponent.is()) { @@ -135,19 +137,19 @@ private: //for threadsafety. The user can ensure this, except in the case of its dtor //being called from reset due to a terminate on the XComponent being called //from an aribitrary thread -template<class T> class scoped_disposing_solar_mutex_reset_ptr - : public scoped_disposing_ptr<T> +template<class T> class unique_disposing_solar_mutex_reset_ptr + : public unique_disposing_ptr<T> { public: - scoped_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) - : scoped_disposing_ptr<T>(rComponent, p) + unique_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) + : unique_disposing_ptr<T>(rComponent, p) { } virtual void reset(T * p = 0) { SolarMutexGuard aGuard; - scoped_disposing_ptr<T>::reset(p); + unique_disposing_ptr<T>::reset(p); } }; diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 93f8d35d52fd..884829b3a97e 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1155,9 +1155,7 @@ private: bool mbPicStrmQueried; /// True = ImplQueryPictureStream() has been called. }; -typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef; - - +typedef std::shared_ptr< EscherExGlobal > EscherExGlobalRef; class SdrObject; class SdrPage; diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index a6fdf663c0d4..b6b6bd7dd011 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -23,10 +23,10 @@ #include <string.h> #include <map> -#include <vector> +#include <memory> #include <set> +#include <vector> -#include <boost/shared_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_set.hpp> @@ -114,19 +114,19 @@ typedef boost::ptr_vector<SvxMSDffShapeOrder> SvxMSDffShapeOrders; struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById { - bool operator()(::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, - ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; + bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs, + std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; }; struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoByTxBxComp { - bool operator()(::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, - ::boost::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; + bool operator()(std::shared_ptr<SvxMSDffShapeInfo> const& lhs, + std::shared_ptr<SvxMSDffShapeInfo> const& rhs) const; }; // the following will be sorted explicitly: -typedef ::std::set< ::boost::shared_ptr<SvxMSDffShapeInfo>, +typedef ::std::set< std::shared_ptr<SvxMSDffShapeInfo>, CompareSvxMSDffShapeInfoById > SvxMSDffShapeInfos_ById; -typedef ::std::multiset< ::boost::shared_ptr<SvxMSDffShapeInfo>, +typedef ::std::multiset< std::shared_ptr<SvxMSDffShapeInfo>, CompareSvxMSDffShapeInfoByTxBxComp> SvxMSDffShapeInfos_ByTxBxComp; #define SVXMSDFF_SETTINGS_CROP_BITMAPS 1 diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 2ad8338e9932..2705df3bc343 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -13,7 +13,6 @@ #include <ostream> #include <memory> #include <vector> -#include <boost/shared_ptr.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -173,7 +172,7 @@ public: class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase { sal_Int32 tbid; - boost::shared_ptr< WString > name; //exist only if tbid equals 0x00000001 + std::shared_ptr< WString > name; //exist only if tbid equals 0x00000001 public: TBCMenuSpecific(); virtual ~TBCMenuSpecific(){} @@ -205,7 +204,7 @@ public: class TBCComboDropdownSpecific : public TBBase { - boost::shared_ptr< TBCCDData > data; + std::shared_ptr< TBCCDData > data; public: TBCComboDropdownSpecific( const TBCHeader& header ); TBCComboDropdownSpecific(){} @@ -218,10 +217,10 @@ public: class TBCBSpecific : public TBBase { sal_uInt8 bFlags; - boost::shared_ptr< TBCBitMap > icon; // optional - boost::shared_ptr< TBCBitMap > iconMask; // optional - boost::shared_ptr< sal_uInt16 > iBtnFace; // optional - boost::shared_ptr< WString > wstrAcc; // optional + std::shared_ptr< TBCBitMap > icon; // optional + std::shared_ptr< TBCBitMap > iconMask; // optional + std::shared_ptr< sal_uInt16 > iBtnFace; // optional + std::shared_ptr< WString > wstrAcc; // optional public: TBCBSpecific(); @@ -266,8 +265,8 @@ class MSFILTER_DLLPUBLIC TBCHeader : public TBBase sal_uInt16 tcid; sal_uInt32 tbct; sal_uInt8 bPriority; - boost::shared_ptr< sal_uInt16 > width; //optional - boost::shared_ptr< sal_uInt16 > height; //optional + std::shared_ptr< sal_uInt16 > width; //optional + std::shared_ptr< sal_uInt16 > height; //optional public: TBCHeader(); @@ -287,7 +286,7 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase { TBCHeader rHeader; TBCGeneralInfo controlGeneralInfo; - boost::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct + std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct TBCData(const TBCData&) SAL_DELETED_FUNCTION; TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION; public: diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 90e7cfe669ac..d08baa9ea590 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -34,8 +34,6 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/CmisVersion.hpp> -#include <boost/shared_ptr.hpp> -#include <set> #include <vcl/timer.hxx> #include <svl/poolitem.hxx> @@ -47,6 +45,8 @@ #include <sfx2/shell.hxx> #include <comphelper/embeddedobjectcontainer.hxx> #include <com/sun/star/frame/XModel.hpp> +#include <memory> +#include <set> class SbxValue; class SvxMacro; @@ -415,7 +415,7 @@ public: virtual Size GetFirstPageSize(); bool DoClose(); virtual void PrepareReload(); - ::boost::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; + std::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; virtual void CancelTransfers(); bool GenerateAndStoreThumbnail( @@ -597,7 +597,7 @@ public: virtual bool SetProtectionPassword( const OUString &rPassword ); virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ); - SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( bool bFullContent ) const; + SAL_DLLPRIVATE std::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( bool bFullContent ) const; SAL_DLLPRIVATE bool IsOwnStorageFormat_Impl(const SfxMedium &) const; diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 871776e1417d..74f06e06f8e4 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -35,7 +35,7 @@ #include <svx/EnhancedCustomShapeFunctionParser.hxx> #include <tools/gen.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> #define DFF_CUSTOMSHAPE_FLIP_V 1 @@ -102,8 +102,8 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet bool bReady; double fValue; }; - com::sun::star::uno::Sequence< OUString > seqEquations; - std::vector< ::boost::shared_ptr< EnhancedCustomShape::ExpressionNode > > vNodesSharedPtr; + com::sun::star::uno::Sequence< OUString > seqEquations; + std::vector< std::shared_ptr< EnhancedCustomShape::ExpressionNode > > vNodesSharedPtr; std::vector< EquationResult > vEquationResults; com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments; diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index 164ca6fd13f5..9f4f464e7133 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -21,9 +21,9 @@ #define INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX #include <sal/config.h> -#include <boost/shared_ptr.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> +#include <memory> #include <vector> #include <svx/svxdllapi.h> @@ -119,7 +119,7 @@ public: virtual com::sun::star::drawing::EnhancedCustomShapeParameter fillNode( std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) = 0; }; -typedef ::boost::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; +typedef std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; /** This exception is thrown, when the arithmetic expression parser failed to parse a string. diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 7810ddab29b5..d27afb6c9042 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -22,8 +22,8 @@ #include <vcl/ctrl.hxx> #include <vcl/metric.hxx> #include <vcl/scrbar.hxx> -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> #include <svx/svxdllapi.h> // define ---------------------------------------------------------------- @@ -95,7 +95,7 @@ protected: private: - typedef ::std::map<sal_Int32, boost::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap; + typedef std::map<sal_Int32, std::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap; ItemsMap m_aItems; Link aDoubleClkHdl; Link aSelectHdl; diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx index 1febdbd53467..bb0bdc39513c 100644 --- a/include/svx/modctrl.hxx +++ b/include/svx/modctrl.hxx @@ -23,7 +23,7 @@ #include <sfx2/stbitem.hxx> #include <svx/svxdllapi.h> -#include <boost/shared_ptr.hpp> +#include <memory> // Forward declarations class Timer; @@ -50,7 +50,7 @@ private: // Functions private: struct ImplData; - ::boost::shared_ptr<ImplData> mpImpl; + std::shared_ptr<ImplData> mxImpl; }; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index b6ca6f61cb73..41e679d8389c 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_NBDTMG_HXX #define INCLUDED_SVX_NBDTMG_HXX #include <svx/svxdllapi.h> -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> #include <editeng/numitem.hxx> #include <vcl/font.hxx> @@ -81,7 +81,7 @@ class SVX_DLLPUBLIC NumSettings_Impl }; typedef NumSettings_Impl* NumSettings_ImplPtr; -typedef std::vector< boost::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl; +typedef std::vector< std::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl; class SVX_DLLPUBLIC BulletsSettings { @@ -165,7 +165,7 @@ class SVX_DLLPUBLIC NumberSettings_Impl }; typedef NumberSettings_Impl* NumberSettings_ImplPtr; -typedef std::vector< boost::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_Impl; +typedef std::vector< std::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_Impl; class SVX_DLLPUBLIC OutlineSettings_Impl { diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index ca5f024f3134..92d893dfc26b 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -61,7 +61,7 @@ public: SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ) SAL_OVERRIDE; SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) SAL_OVERRIDE; // slots diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx index 98532141ae87..6c15e286eca2 100644 --- a/include/svx/selectioncontroller.hxx +++ b/include/svx/selectioncontroller.hxx @@ -21,10 +21,8 @@ #define INCLUDED_SVX_SELECTIONCONTROLLER_HXX #include <svx/svxdllapi.h> - -#include <boost/shared_ptr.hpp> - #include <cppuhelper/weak.hxx> +#include <memory> class KeyEvent; class MouseEvent; @@ -63,7 +61,7 @@ public: virtual bool PasteObjModel( const SdrModel& rModel ); /** returns a format paint brush set from the current selection */ - virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); + virtual bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ); /** applies a format paint brush set from the current selection. if bNoCharacterFormats is true, no character attributes are changed. diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 5d9f90b56b50..1d2147a93d56 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -26,8 +26,6 @@ #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <memory> namespace cppu @@ -58,7 +56,7 @@ namespace svx virtual ~IPropertyValueProvider(); }; - typedef ::boost::shared_ptr< IPropertyValueProvider > PPropertyValueProvider; + typedef std::shared_ptr< IPropertyValueProvider > PPropertyValueProvider; //= PropertyValueProvider @@ -69,7 +67,6 @@ namespace svx and calls the getPropertyValue method. */ class SVX_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider - ,public ::boost::noncopyable { public: PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char* _pAsciiPropertyName ) @@ -83,6 +80,9 @@ namespace svx protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } + PropertyValueProvider(const PropertyValueProvider&) SAL_DELETED_FUNCTION; + PropertyValueProvider& operator=(const PropertyValueProvider&) SAL_DELETED_FUNCTION; + private: ::cppu::OWeakObject& m_rContext; const OUString m_sPropertyName; @@ -97,7 +97,7 @@ namespace svx The class is intended to be held as member of the class which does the property change broadcasting. */ - class SVX_DLLPUBLIC PropertyChangeNotifier : public ::boost::noncopyable + class SVX_DLLPUBLIC PropertyChangeNotifier { public: /** constructs a notifier instance @@ -129,7 +129,10 @@ namespace svx void disposing(); private: - ::std::unique_ptr< PropertyChangeNotifier_Data > m_pData; + PropertyChangeNotifier(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; + PropertyChangeNotifier& operator=(const PropertyChangeNotifier&) SAL_DELETED_FUNCTION; + + std::unique_ptr< PropertyChangeNotifier_Data > m_xData; }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 0b9ed762b933..ed5e9a80ad1e 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -28,10 +28,8 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> -#include <boost/noncopyable.hpp> #include <boost/function.hpp> - class SdrMarkView; @@ -45,8 +43,7 @@ namespace { class SVX_DLLPUBLIC SelectionChangeHandler - : private ::boost::noncopyable, - private ::cppu::BaseMutex, + : private ::cppu::BaseMutex, public SelectionChangeHandlerInterfaceBase { public: @@ -69,6 +66,9 @@ public: void Disconnect (void); private: + SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; + SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; + const boost::function<rtl::OUString(void)> maSelectionChangeCallback; css::uno::Reference<css::frame::XController> mxController; const sfx2::sidebar::EnumContext::Context meDefaultContext; diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 66bbe0b8f043..fb30ff7a428e 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -26,7 +26,7 @@ #include <svx/selectioncontroller.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> class SdrOutliner; class OutlinerView; @@ -259,7 +259,7 @@ public: bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; /** returns a format paint brush set from the current selection */ - bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); + bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ); /** applies a format paint brush set from the current selection. if bNoCharacterFormats is true, no character attributes are changed. diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index b3fa3c4b43a0..40063882f1fa 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -38,8 +38,6 @@ #include <svx/pageitem.hxx> #include <vcl/field.hxx> -#include <boost/shared_ptr.hpp> - class OutputDevice; #include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index b1ee25d81f21..864cc83c543e 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -29,7 +29,6 @@ #include <svx/xtextit0.hxx> #include <svx/svdtext.hxx> #include <vector> -#include <boost/shared_ptr.hpp> #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/svdpagv.hxx> diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index cf324e76924e..82e6d240274c 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -25,8 +25,8 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> #include <vector> #include <com/sun/star/table/XTableColumns.hpp> @@ -49,7 +49,7 @@ class SvXMLExport; class SvXMLExportPropertyMapper; -typedef ::std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap; +typedef std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap; struct XMLTableInfo { @@ -59,7 +59,7 @@ struct XMLTableInfo std::vector< OUString > maDefaultRowCellStyles; }; -typedef ::std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, boost::shared_ptr< XMLTableInfo > > TableInfoMap; +typedef std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, std::shared_ptr< XMLTableInfo > > TableInfoMap; class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject { @@ -96,8 +96,8 @@ private: SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell ); - void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle ); - void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const boost::shared_ptr< XMLTableInfo >& pTableInfo ); + void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const std::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle ); + void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const std::shared_ptr< XMLTableInfo >& pTableInfo ); }; diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index 4de0822b3bb3..8e6bb2659627 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -30,13 +30,13 @@ #include <rtl/ref.hxx> -#include <boost/shared_ptr.hpp> #include <map> +#include <memory> class SvXMLStyleContext; typedef std::map< OUString, OUString > XMLTableTemplate; -typedef std::map < OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; +typedef std::map < OUString, std::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap; class XMLTableImport : public salhelper::SimpleReferenceObject { diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 43b9315bef54..03b2319ce069 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -26,8 +26,6 @@ #include <map> #include <memory> -#include <boost/utility.hpp> -#include <boost/shared_ptr.hpp> #include <xmloff/xmltkmap.hxx> #include <rtl/ref.hxx> @@ -366,16 +364,18 @@ enum XMLTextType #define XML_TEXT_RENAME_TYPE_FRAME 10 #define XML_TEXT_RENAME_TYPE_TABLE 20 -class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject, - private boost::noncopyable +class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject { private: + XMLTextImportHelper(const XMLTextImportHelper&) SAL_DELETED_FUNCTION; + XMLTextImportHelper& operator=(const XMLTextImportHelper&) SAL_DELETED_FUNCTION; + struct Impl; std::unique_ptr<Impl> m_xImpl; /// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx struct BackpatcherImpl; - ::boost::shared_ptr<BackpatcherImpl> m_pBackpatcherImpl; - ::boost::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl(); + std::shared_ptr<BackpatcherImpl> m_xBackpatcherImpl; + std::shared_ptr<BackpatcherImpl> MakeBackpatcherImpl(); protected: virtual SvXMLImportContext *CreateTableChildContext( @@ -567,7 +567,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & rRange, OUString const& i_rXmlId, - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes); /// process the start of a range reference @@ -576,7 +576,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & o_rRange, OUString & o_rXmlId, - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes); OUString FindActiveBookmarkName(); diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index b43a63b5a7a3..00d8a34521aa 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -26,7 +26,6 @@ #include <memory> #include <limits.h> -#include <boost/utility.hpp> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -80,9 +79,11 @@ public: */ class XMLOFF_DLLPUBLIC SvXMLUnitConverter - : private ::boost::noncopyable { private: + SvXMLUnitConverter(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION; + SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION; + struct Impl; ::std::unique_ptr<Impl> m_pImpl; diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 8356acd8b5b8..29e157d7b531 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -92,10 +92,10 @@ FltError ExportBiff5::Write() = xDPS->getDocumentProperties(); if ( SvtFilterOptions::Get().IsEnableCalcPreview() ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile (false); uno::Sequence<sal_uInt8> metaFile( - sfx2::convertMetaFile(pMetaFile.get())); + sfx2::convertMetaFile(xMetaFile.get())); sfx2::SaveOlePropertySet(xDocProps, xRootStrg, &metaFile); } else diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index b5481caccd3c..3a9658ce6027 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -34,8 +34,8 @@ public: class ScTBC : public TBBase { TBCHeader tbch; - boost::shared_ptr<TBCCmd> tbcCmd; // optional - boost::shared_ptr<TBCData> tbcd; + std::shared_ptr<TBCCmd> tbcCmd; // optional + std::shared_ptr<TBCData> tbcd; public: ScTBC(); virtual ~ScTBC(){} diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index d4fb0d6ae87e..cc25b13160c0 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -71,7 +71,7 @@ void FuFormatPaintBrush::DoExecute( SfxRequest& rReq ) if( mpView ) { - mpView->TakeFormatPaintBrush( mpItemSet ); + mpView->TakeFormatPaintBrush( mxItemSet ); } } @@ -175,7 +175,7 @@ bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) { - if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() ) + if( mxItemSet.get() && mpView && mpView->AreObjectsMarked() ) { bool bNoCharacterFormats = false; bool bNoParagraphFormats = false; @@ -233,7 +233,7 @@ void FuFormatPaintBrush::Deactivate() bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const { - if( mpItemSet.get() == 0 ) + if( mxItemSet.get() == 0 ) return false; if( !mpView || (!mpView->SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) ) return false; @@ -243,7 +243,7 @@ bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphFormats ) { const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - if( mpItemSet.get() && ( rMarkList.GetMarkCount() == 1 ) ) + if( mxItemSet.get() && ( rMarkList.GetMarkCount() == 1 ) ) { SdrObject* pObj( NULL ); bool bUndo = mpDoc->IsUndoEnabled(); @@ -260,7 +260,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) ); } - mpView->ApplyFormatPaintBrush( *mpItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); + mpView->ApplyFormatPaintBrush( *mxItemSet.get(), bNoCharacterFormats, bNoParagraphFormats ); if( pObj ) { diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 41c3396b27cb..13ec578608a2 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -23,7 +23,7 @@ #include "futext.hxx" #include <svl/itemset.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace sd { @@ -57,7 +57,7 @@ private: void implcancel(); - ::boost::shared_ptr<SfxItemSet> mpItemSet; + std::shared_ptr<SfxItemSet> mxItemSet; bool mbPermanent; bool mbOldIsQuickTextEditMode; }; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 4319fd79ed5b..e6b828dc3db3 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1110,19 +1110,18 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) pDoc->SetSelected( pDoc->GetSdPage( nPgNum, PK_STANDARD ), nPgNum == nPageNumber ); nPgNum++; } - ::boost::shared_ptr<GDIMetaFile> pMetaFile = - pDocShell->GetPreviewMetaFile(); - if ( pMetaFile ) + std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(); + if (xMetaFile) { Point aPoint; Size aSize( GetPage()->GetSize() ); - pMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, true ), 0 ); - pMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); - pMetaFile->SetPrefMapMode( MAP_100TH_MM ); - pMetaFile->SetPrefSize( aSize ); + xMetaFile->AddAction( (MetaAction*) new MetaFillColorAction( COL_WHITE, true ), 0 ); + xMetaFile->AddAction( (MetaAction*) new MetaRectAction( Rectangle( aPoint, aSize ) ), 1 ); + xMetaFile->SetPrefMapMode( MAP_100TH_MM ); + xMetaFile->SetPrefSize( aSize ); SvMemoryStream aDestStrm( 65535, 65535 ); - ConvertGDIMetaFileToWMF( *pMetaFile, aDestStrm, NULL, false ); + ConvertGDIMetaFileToWMF( *xMetaFile, aDestStrm, NULL, false ); Sequence<sal_Int8> aSeq( (sal_Int8*)aDestStrm.GetData(), aDestStrm.Tell() ); aAny <<= aSeq; } @@ -1147,10 +1146,9 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) pDoc->SetSelected( pDoc->GetSdPage( nPgNum, PK_STANDARD ), nPgNum == nPageNumber ); nPgNum++; } - ::boost::shared_ptr<GDIMetaFile> pMetaFile = - pDocShell->GetPreviewMetaFile(); + std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(); BitmapEx aBitmap; - if (pMetaFile && pMetaFile->CreateThumbnail(aBitmap)) + if (xMetaFile && xMetaFile->CreateThumbnail(aBitmap)) { SvMemoryStream aMemStream; WriteDIB(aBitmap.GetBitmap(), aMemStream, false, false); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 8e8452ea3b49..4c53a5098042 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -202,9 +202,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) if (!pDocSh->IsModified() && !pEncryptionDataItem && !Application::IsHeadlessModeEnabled()) { // not modified => the document matches what is in the shell - boost::shared_ptr<GDIMetaFile> pMetaFile = pDocSh->GetPreviewMetaFile(); + std::shared_ptr<GDIMetaFile> xMetaFile = pDocSh->GetPreviewMetaFile(); BitmapEx aResultBitmap; - if (pMetaFile->CreateThumbnail(aResultBitmap)) + if (xMetaFile->CreateThumbnail(aResultBitmap)) { SvMemoryStream aStream(65535, 65535); vcl::PNGWriter aWriter(aResultBitmap); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 9a97255b6a02..703e7b943105 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -41,17 +41,17 @@ void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* pObj ) { - ::boost::shared_ptr<GDIMetaFile> pFile = pObj + std::shared_ptr<GDIMetaFile> xFile = pObj ? pObj->GetPreviewMetaFile() - : ::boost::shared_ptr<GDIMetaFile>(); - pMetaFile = pFile; + : std::shared_ptr<GDIMetaFile>(); + xMetaFile = xFile; Invalidate(); } SfxPreviewBase_Impl::SfxPreviewBase_Impl( vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) - , pMetaFile() + , xMetaFile() { } @@ -112,7 +112,7 @@ void SfxPreviewWin_Impl::ImpPaint( void SfxPreviewWin_Impl::Paint( const Rectangle& rRect ) { - ImpPaint( rRect, pMetaFile.get(), this ); + ImpPaint( rRect, xMetaFile.get(), this ); } extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxPreviewWin(vcl::Window *pParent, VclBuilder::stringmap &) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 937a5e04ba46..933fd3047a91 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -108,13 +108,13 @@ bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight) return false; } -::boost::shared_ptr<GDIMetaFile> +std::shared_ptr<GDIMetaFile> SfxObjectShell::GetPreviewMetaFile( bool bFullContent ) const { return CreatePreviewMetaFile_Impl( bFullContent ); } -::boost::shared_ptr<GDIMetaFile> +std::shared_ptr<GDIMetaFile> SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const { // DoDraw can only be called when no printing is done, otherwise @@ -123,16 +123,16 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const if ( pFrame && pFrame->GetViewShell() && pFrame->GetViewShell()->GetPrinter() && pFrame->GetViewShell()->GetPrinter()->IsPrinting() ) - return ::boost::shared_ptr<GDIMetaFile>(); + return std::shared_ptr<GDIMetaFile>(); - ::boost::shared_ptr<GDIMetaFile> pFile(new GDIMetaFile); + std::shared_ptr<GDIMetaFile> xFile(new GDIMetaFile); VirtualDevice aDevice; aDevice.EnableOutput( false ); MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() ); aDevice.SetMapMode( aMode ); - pFile->SetPrefMapMode( aMode ); + xFile->SetPrefMapMode( aMode ); Size aTmpSize; sal_Int8 nAspect; @@ -147,11 +147,11 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const aTmpSize = ((SfxObjectShell*)this)->GetFirstPageSize(); } - pFile->SetPrefSize( aTmpSize ); + xFile->SetPrefSize( aTmpSize ); DBG_ASSERT( aTmpSize.Height()*aTmpSize.Width(), "size of first page is 0, override GetFirstPageSize or set vis-area!" ); - pFile->Record( &aDevice ); + xFile->Record( &aDevice ); LanguageType eLang; SvtCTLOptions aCTLOptions; @@ -168,9 +168,9 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const SAL_INFO( "sfx.doc", "PERFORMANCE SfxObjectShell::CreatePreviewMetaFile_Impl" ); ((SfxObjectShell*)this)->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), nAspect ); } - pFile->Stop(); + xFile->Stop(); - return pFile; + return xFile; } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index d763e69e2c38..59cb2e81ad45 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3571,10 +3571,10 @@ bool SfxObjectShell::WriteThumbnail(bool bEncrypted, bool bIsTemplate, const uno } else { - boost::shared_ptr<GDIMetaFile> pMetaFile = GetPreviewMetaFile(false); - if (pMetaFile) + std::shared_ptr<GDIMetaFile> xMetaFile = GetPreviewMetaFile(false); + if (xMetaFile) { - bResult = GraphicHelper::getThumbnailFormatFromGDI_Impl(pMetaFile.get(), xStream); + bResult = GraphicHelper::getThumbnailFormatFromGDI_Impl(xMetaFile.get(), xStream); } } } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 96ea1b99fe20..bcf9973acee9 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -216,7 +216,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument Reference< rdf::XDocumentMetadataAccess> m_xDocumentMetadata ; ::rtl::Reference< ::sfx2::DocumentUndoManager > m_pDocumentUndoManager ; Sequence< document::CmisProperty> m_cmisProperties ; - boost::shared_ptr<SfxGrabBagItem> m_pGrabBagItem ; + std::shared_ptr<SfxGrabBagItem> m_xGrabBagItem ; IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& rMutex, SfxObjectShell* pObjectShell ) : m_pObjectShell ( pObjectShell ) @@ -2010,15 +2010,15 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { SvMemoryStream aMemStm( 65535, 65535 ); aMemStm.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); - pMetaFile->Write( aMemStm ); + xMetaFile->Write( aMemStm ); aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ); } @@ -2030,15 +2030,15 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla { if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( true ); - if ( pMetaFile ) + if (xMetaFile) { SvMemoryStream aMemStm( 65535, 65535 ); aMemStm.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); - pMetaFile->Write( aMemStm ); + xMetaFile->Write( aMemStm ); aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ); } @@ -2050,32 +2050,32 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla { if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { - ::boost::shared_ptr<SvMemoryStream> pStream( + std::shared_ptr<SvMemoryStream> xStream( GraphicHelper::getFormatStrFromGDI_Impl( - pMetaFile.get(), CVT_EMF ) ); - if ( pStream ) + xMetaFile.get(), CVT_EMF ) ); + if (xStream) { - pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); - aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( pStream->GetData() ), - pStream->Seek( STREAM_SEEK_TO_END ) ); + xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ), + xStream->Seek( STREAM_SEEK_TO_END ) ); } } } else if ( GraphicHelper::supportsMetaFileHandle_Impl() && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { aAny <<= reinterpret_cast< const sal_uInt64 >( - GraphicHelper::getEnhMetaFileFromGDI_Impl( pMetaFile.get() ) ); + GraphicHelper::getEnhMetaFileFromGDI_Impl( xMetaFile.get() ) ); } } else @@ -2085,20 +2085,20 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla { if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { - ::boost::shared_ptr<SvMemoryStream> pStream( + std::shared_ptr<SvMemoryStream> xStream( GraphicHelper::getFormatStrFromGDI_Impl( - pMetaFile.get(), CVT_WMF ) ); + xMetaFile.get(), CVT_WMF ) ); - if ( pStream ) + if (xStream) { - pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); - aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( pStream->GetData() ), - pStream->Seek( STREAM_SEEK_TO_END ) ); + xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ), + xStream->Seek( STREAM_SEEK_TO_END ) ); } } } @@ -2107,15 +2107,15 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla { // means HGLOBAL handler to memory storage containing METAFILEPICT structure - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { - Size aMetaSize = pMetaFile->GetPrefSize(); + Size aMetaSize = xMetaFile->GetPrefSize(); aAny <<= reinterpret_cast< const sal_uInt64 >( GraphicHelper::getWinMetaFileFromGDI_Impl( - pMetaFile.get(), aMetaSize ) ); + xMetaFile.get(), aMetaSize ) ); } } else @@ -2125,20 +2125,20 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla { if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { - ::boost::shared_ptr<SvMemoryStream> pStream( + std::shared_ptr<SvMemoryStream> xStream( GraphicHelper::getFormatStrFromGDI_Impl( - pMetaFile.get(), CVT_BMP ) ); + xMetaFile.get(), CVT_BMP ) ); - if ( pStream ) + if (xStream) { - pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); - aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( pStream->GetData() ), - pStream->Seek( STREAM_SEEK_TO_END ) ); + xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ), + xStream->Seek( STREAM_SEEK_TO_END ) ); } } } @@ -2149,20 +2149,20 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla { if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = m_pData->m_pObjectShell->GetPreviewMetaFile( true ); - if ( pMetaFile ) + if (xMetaFile) { - ::boost::shared_ptr<SvMemoryStream> pStream( + std::shared_ptr<SvMemoryStream> xStream( GraphicHelper::getFormatStrFromGDI_Impl( - pMetaFile.get(), CVT_PNG ) ); + xMetaFile.get(), CVT_PNG ) ); - if ( pStream ) + if (xStream) { - pStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); - aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( pStream->GetData() ), - pStream->Seek( STREAM_SEEK_TO_END ) ); + xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT ); + aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ), + xStream->Seek( STREAM_SEEK_TO_END ) ); } } } @@ -3454,8 +3454,8 @@ bool SfxBaseModel::hasValidSignatures() const void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const { - if (m_pData->m_pGrabBagItem.get()) - m_pData->m_pGrabBagItem->QueryValue(rVal); + if (m_pData->m_xGrabBagItem.get()) + m_pData->m_xGrabBagItem->QueryValue(rVal); else { uno::Sequence<beans::PropertyValue> aValue(0); rVal = uno::makeAny(aValue); @@ -3464,10 +3464,10 @@ void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const void SfxBaseModel::setGrabBagItem(const com::sun::star::uno::Any& rVal) { - if (!m_pData->m_pGrabBagItem.get()) - m_pData->m_pGrabBagItem.reset(new SfxGrabBagItem); + if (!m_pData->m_xGrabBagItem.get()) + m_pData->m_xGrabBagItem.reset(new SfxGrabBagItem); - m_pData->m_pGrabBagItem->PutValue(rVal); + m_pData->m_xGrabBagItem->PutValue(rVal); } static void GetCommandFromSequence( OUString& rCommand, sal_Int32& nIndex, const Sequence< beans::PropertyValue >& rSeqPropValue ) diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index cbd4da7478a9..d343e7ef7723 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -29,7 +29,7 @@ class GDIMetaFile; class SfxPreviewBase_Impl : public vcl::Window { protected: - ::boost::shared_ptr<GDIMetaFile> pMetaFile; + std::shared_ptr<GDIMetaFile> xMetaFile; public: SfxPreviewBase_Impl(vcl::Window* pParent, WinBits nStyle); void SetObjectShell( SfxObjectShell* pObj ); diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 7804b6666b48..44d2165416e9 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -778,22 +778,22 @@ struct ParserContext }; -typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; +typedef std::shared_ptr< ParserContext > ParserContextSharedPtr; /** Generate parse-dependent-but-then-constant value */ class DoubleConstantFunctor { - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mxContext; public: DoubleConstantFunctor( const ParserContextSharedPtr& rContext ) : - mpContext( rContext ) + mxContext( rContext ) { } void operator()( double n ) const { - mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( n ) ) ); + mxContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( n ) ) ); } }; @@ -801,14 +801,14 @@ class EnumFunctor { const ExpressionFunct meFunct; double mnValue; - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mxContext; public: EnumFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ) , mnValue( 0 ) - , mpContext( rContext ) + , mxContext( rContext ) { } void operator()( StringIteratorT rFirst, StringIteratorT rSecond ) const @@ -819,17 +819,17 @@ public: case ENUM_FUNC_ADJUSTMENT : { OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); - mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new AdjustmentExpression( *mpContext->mpCustoShape, aVal.toInt32() ) ) ); + mxContext->maOperandStack.push( ExpressionNodeSharedPtr( new AdjustmentExpression( *mxContext->mpCustoShape, aVal.toInt32() ) ) ); } break; case ENUM_FUNC_EQUATION : { OUString aVal( rFirst + 1, rSecond - rFirst, RTL_TEXTENCODING_UTF8 ); - mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new EquationExpression( *mpContext->mpCustoShape, aVal.toInt32() ) ) ); + mxContext->maOperandStack.push( ExpressionNodeSharedPtr( new EquationExpression( *mxContext->mpCustoShape, aVal.toInt32() ) ) ); } break; default: - mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new EnumValueExpression( *mpContext->mpCustoShape, meFunct ) ) ); + mxContext->maOperandStack.push( ExpressionNodeSharedPtr( new EnumValueExpression( *mxContext->mpCustoShape, meFunct ) ) ); } } }; @@ -837,18 +837,18 @@ public: class UnaryFunctionFunctor { const ExpressionFunct meFunct; - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mxContext; public : UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ), - mpContext( rContext ) + mxContext( rContext ) { } void operator()( StringIteratorT, StringIteratorT ) const { - ParserContext::OperandStack& rNodeStack( mpContext->maOperandStack ); + ParserContext::OperandStack& rNodeStack( mxContext->maOperandStack ); if( rNodeStack.size() < 1 ) throw ParseError( "Not enough arguments for unary operator" ); @@ -874,19 +874,19 @@ public : class BinaryFunctionFunctor { const ExpressionFunct meFunct; - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mxContext; public: BinaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ), - mpContext( rContext ) + mxContext( rContext ) { } void operator()( StringIteratorT, StringIteratorT ) const { - ParserContext::OperandStack& rNodeStack( mpContext->maOperandStack ); + ParserContext::OperandStack& rNodeStack( mxContext->maOperandStack ); if( rNodeStack.size() < 2 ) throw ParseError( "Not enough arguments for binary operator" ); @@ -909,17 +909,17 @@ public: class IfFunctor { - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mxContext; public : IfFunctor( const ParserContextSharedPtr& rContext ) : - mpContext( rContext ) + mxContext( rContext ) { } void operator()( StringIteratorT, StringIteratorT ) const { - ParserContext::OperandStack& rNodeStack( mpContext->maOperandStack ); + ParserContext::OperandStack& rNodeStack( mxContext->maOperandStack ); if( rNodeStack.size() < 3 ) throw ParseError( "Not enough arguments for ternary operator" ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 26f6df234b64..321786584d3f 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -716,7 +716,7 @@ void SvxShowCharSet::ReleaseAccessible() if ( aFind == m_aItems.end() ) { OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?"); - boost::shared_ptr<svx::SvxShowCharSetItem> xItem(new svx::SvxShowCharSetItem(*this, + std::shared_ptr<svx::SvxShowCharSetItem> xItem(new svx::SvxShowCharSetItem(*this, m_pAccessible->getTable(), sal::static_int_cast< sal_uInt16 >(_nPos))); aFind = m_aItems.insert(ItemsMap::value_type(_nPos, xItem)).first; OUStringBuffer buf; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 4f244a40ed36..e2ae2864fce2 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/text/XNumberingTypeInfo.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -159,17 +159,17 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) eCoreUnit = SFX_MAPUNIT_100TH_MM; INetURLObject aFile( SvtPathOptions().GetPalettePath() ); aFile.Append( filename); - boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); - if( pIStm ) { + std::unique_ptr<SvStream> xIStm(::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); + if( xIStm ) { sal_uInt32 nVersion = 0; sal_Int32 nNumIndex = 0; - pIStm->ReadUInt32( nVersion ); + xIStm->ReadUInt32( nVersion ); if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version { - pIStm->ReadInt32( nNumIndex ); + xIStm->ReadInt32( nNumIndex ); sal_uInt16 mLevel = 0x1; while (nNumIndex>=0 && nNumIndex<DEFAULT_NUM_VALUSET_COUNT) { - SvxNumRule aNum(*pIStm); + SvxNumRule aNum(*xIStm); //bullet color in font properties is not stored correctly. Need set tranparency bits manually for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) { @@ -184,7 +184,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) } } RelplaceNumRule(aNum,nNumIndex,mLevel); - pIStm->ReadInt32( nNumIndex ); + xIStm->ReadInt32( nNumIndex ); } } } @@ -198,24 +198,24 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename) eCoreUnit = SFX_MAPUNIT_100TH_MM; INetURLObject aFile( SvtPathOptions().GetPalettePath() ); aFile.Append( filename); - boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE )); - if( pOStm ) { + std::unique_ptr<SvStream> xOStm(::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE )); + if( xOStm ) { sal_uInt32 nVersion; sal_Int32 nNumIndex; nVersion = DEFAULT_NUMBERING_CACHE_FORMAT_VERSION; - pOStm->WriteUInt32( nVersion ); + xOStm->WriteUInt32( nVersion ); for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ ) { if (IsCustomized(nItem)) { SvxNumRule aDefNumRule( NUM_BULLET_REL_SIZE|NUM_CONTINUOUS|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT,10, false, SVX_RULETYPE_NUMBERING,SvxNumberFormat::LABEL_ALIGNMENT); sal_uInt16 mLevel = 0x1; - pOStm->WriteInt32( nItem ); + xOStm->WriteInt32( nItem ); ApplyNumRule(aDefNumRule,nItem,mLevel,false,true); - aDefNumRule.Store(*pOStm); + aDefNumRule.Store(*xOStm); } } nNumIndex = -1; - pOStm->WriteInt32( nNumIndex ); //write end flag + xOStm->WriteInt32( nNumIndex ); //write end flag } eCoreUnit = eOldCoreUnit; } @@ -1311,7 +1311,7 @@ void NumberingTypeMgr::Init() pNumEntry->nIndexDefault = i; pNumEntry->pNumSetting = pNew; pNumEntry->sDescription = SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ); - pNumberSettingsArr->push_back(boost::shared_ptr<NumberSettings_Impl>(pNumEntry)); + pNumberSettingsArr->push_back(std::shared_ptr<NumberSettings_Impl>(pNumEntry)); } } catch(Exception&) @@ -1533,7 +1533,7 @@ void OutlineTypeMgr::Init() pNew->eNumAlign = aNumFmt.GetNumAdjust(); pNew->nNumAlignAt = aNumFmt.GetFirstLineIndent(); pNew->nNumIndentAt = aNumFmt.GetIndentAt(); - pItemArr->pNumSettingsArr->push_back(boost::shared_ptr<NumSettings_Impl>(pNew)); + pItemArr->pNumSettingsArr->push_back(std::shared_ptr<NumSettings_Impl>(pNew)); } } } diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 7899bcbc94ba..a860032b8e26 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -63,20 +63,20 @@ struct SvxModifyControl::ImplData SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), - mpImpl(new ImplData) + mxImpl(new ImplData) { //#ifndef MACOSX if ( rStb.GetDPIScaleFactor() > 1 ) { - for (int i = 0; i < mpImpl->MODIFICATION_STATE_SIZE; i++) + for (int i = 0; i < mxImpl->MODIFICATION_STATE_SIZE; i++) { - BitmapEx b = mpImpl->maImages[i].GetBitmapEx(); + BitmapEx b = mxImpl->maImages[i].GetBitmapEx(); b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(), BMP_SCALE_FAST); - mpImpl->maImages[i] = Image(b); + mxImpl->maImages[i] = Image(b); } } //#endif - mpImpl->maIdle.SetIdleHdl( LINK(this, SvxModifyControl, OnTimer) ); + mxImpl->maIdle.SetIdleHdl( LINK(this, SvxModifyControl, OnTimer) ); } @@ -89,12 +89,12 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" ); const SfxBoolItem* pItem = static_cast<const SfxBoolItem*>(pState); - mpImpl->maIdle.Stop(); + mxImpl->maIdle.Stop(); bool modified = pItem->GetValue(); - bool start = ( !modified && mpImpl->mnModState == ImplData::MODIFICATION_STATE_YES); // should timer be started and feedback image displayed ? + bool start = ( !modified && mxImpl->mnModState == ImplData::MODIFICATION_STATE_YES); // should timer be started and feedback image displayed ? - mpImpl->mnModState = (start ? ImplData::MODIFICATION_STATE_FEEDBACK : (modified ? ImplData::MODIFICATION_STATE_YES : ImplData::MODIFICATION_STATE_NO)); + mxImpl->mnModState = (start ? ImplData::MODIFICATION_STATE_FEEDBACK : (modified ? ImplData::MODIFICATION_STATE_YES : ImplData::MODIFICATION_STATE_NO)); _repaint(); @@ -102,7 +102,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(nResId)); if ( start ) - mpImpl->maIdle.Start(); + mxImpl->maIdle.Start(); } @@ -113,7 +113,7 @@ IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer ) return 0; pTimer->Stop(); - mpImpl->mnModState = ImplData::MODIFICATION_STATE_NO; + mxImpl->mnModState = ImplData::MODIFICATION_STATE_NO; _repaint(); @@ -154,14 +154,14 @@ void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt ) OutputDevice* pDev = rUsrEvt.GetDevice(); Rectangle aRect = rUsrEvt.GetRect(); - ImplData::ModificationState state = mpImpl->mnModState; - Point aPt = centerImage(aRect, mpImpl->maImages[state]); - pDev->DrawImage(aPt, mpImpl->maImages[state]); + ImplData::ModificationState state = mxImpl->mnModState; + Point aPt = centerImage(aRect, mxImpl->maImages[state]); + pDev->DrawImage(aPt, mxImpl->maImages[state]); } void SvxModifyControl::Click() { - if (mpImpl->mnModState != ImplData::MODIFICATION_STATE_YES) + if (mxImpl->mnModState != ImplData::MODIFICATION_STATE_YES) // document not modified. nothing to do here. return; diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx index a64f80cba7ea..800d694c1686 100644 --- a/svx/source/svdraw/selectioncontroller.cxx +++ b/svx/source/svdraw/selectioncontroller.cxx @@ -90,7 +90,7 @@ bool SelectionController::PasteObjModel( const SdrModel& /*rModel*/ ) return false; } -bool SelectionController::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& /*rFormatSet*/ ) +bool SelectionController::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& /*rFormatSet*/ ) { return false; } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index d3dcf9714d1c..67d9514e054d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -60,7 +60,7 @@ #include <sdr/overlay/overlaytools.hxx> #include <svx/sdr/table/tablecontroller.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> void SdrObjEditView::ImpClearVars() @@ -342,11 +342,11 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang { // completely reworked to use primitives; this ensures same look and functionality const drawinglayer::geometry::ViewInformation2D aViewInformation2D; - boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice( + boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice( rTargetDevice, aViewInformation2D)); - if(pProcessor) + if (xProcessor) { const bool bMerk(rTargetDevice.IsMapModeEnabled()); const basegfx::B2DRange aRange(aPixRect.Left(), aPixRect.Top(), aPixRect.Right(), aPixRect.Bottom()); @@ -365,7 +365,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang const drawinglayer::primitive2d::Primitive2DSequence aSequence(&xReference, 1); rTargetDevice.EnableMapMode(false); - pProcessor->process(aSequence); + xProcessor->process(aSequence); rTargetDevice.EnableMapMode(bMerk); } } @@ -1978,7 +1978,7 @@ static const sal_uInt16* GetFormatRangeImpl( bool bTextOnly ) return &gRanges[ bTextOnly ? 10 : 0]; } -bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ) +bool SdrObjEditView::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ) { if( mxSelectionController.is() && mxSelectionController->TakeFormatPaintBrush(rFormatSet) ) return true; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index c028a2a9d2dd..119ff78865f3 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -66,7 +66,7 @@ #include "tableundo.hxx" #include "tablelayouter.hxx" #include <vcl/msgbox.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using ::editeng::SvxBorderLine; using namespace ::sdr::table; @@ -393,7 +393,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) if( !mxTable.is() || !mxTableObj.is() || !mxTableObj->GetModel() ) return; - boost::scoped_ptr<SfxItemSet> pSet; + std::unique_ptr<SfxItemSet> xSet; bool bVertDone = false; @@ -414,16 +414,16 @@ void SvxTableController::GetState( SfxItemSet& rSet ) } else if(!bVertDone) { - if( !pSet ) + if (!xSet) { - pSet.reset(new SfxItemSet( mxTableObj->GetModel()->GetItemPool() )); - MergeAttrFromSelectedCells(*pSet, false); + xSet.reset(new SfxItemSet( mxTableObj->GetModel()->GetItemPool() )); + MergeAttrFromSelectedCells(*xSet, false); } SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK; - if( pSet->GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::DONTCARE ) - eAdj = static_cast<const SdrTextVertAdjustItem&>(pSet->Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); + if (xSet->GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::DONTCARE) + eAdj = static_cast<const SdrTextVertAdjustItem&>(xSet->Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); rSet.Put(SfxBoolItem(SID_TABLE_VERT_BOTTOM, eAdj == SDRTEXTVERTADJUST_BOTTOM)); rSet.Put(SfxBoolItem(SID_TABLE_VERT_CENTER, eAdj == SDRTEXTVERTADJUST_CENTER)); @@ -893,11 +893,11 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) aNewAttr.Put( aBoxInfoItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 ); + std::unique_ptr< SfxAbstractTabDialog > xDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 ); // Even Cancel Button is returning positive(101) value, - if( pDlg.get() && ( pDlg->Execute() == RET_OK ) ) + if (xDlg.get() && xDlg->Execute() == RET_OK) { - SfxItemSet aNewSet( *(pDlg->GetOutputItemSet ()) ); + SfxItemSet aNewSet(*(xDlg->GetOutputItemSet())); //Only properties that were unchanged by the dialog appear in this //itemset. We had constructed these two properties from other @@ -1199,7 +1199,7 @@ void SvxTableController::SplitMarkedCells() getSelectedCells( aStart, aEnd ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - boost::scoped_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( NULL, false, 99, 99 ) : 0 ); + std::unique_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( NULL, false, 99, 99 ) : 0 ); if( xDlg.get() && xDlg->Execute() ) { const sal_Int32 nCount = xDlg->GetCount() - 1; @@ -2647,7 +2647,7 @@ bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj ) return true; } -bool SvxTableController::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& /*rFormatSet*/ ) +bool SvxTableController::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& /*rFormatSet*/ ) { // SdrView::TakeFormatPaintBrush() is enough return false; diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 19bd256ece08..9c286f23c856 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -99,7 +99,7 @@ namespace svx } PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex ) - :m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) + :m_xData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) ) { } @@ -114,10 +114,10 @@ namespace svx ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); ENSURE_OR_THROW( !!_pProvider, "NULL factory not allowed." ); - OSL_ENSURE( m_pData->m_aProviders.find( _eProperty ) == m_pData->m_aProviders.end(), + OSL_ENSURE( m_xData->m_aProviders.find( _eProperty ) == m_xData->m_aProviders.end(), "PropertyChangeNotifier::registerProvider: factory for this ID already present!" ); - m_pData->m_aProviders[ _eProperty ] = _pProvider; + m_xData->m_aProviders[ _eProperty ] = _pProvider; } @@ -125,22 +125,22 @@ namespace svx { ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); - PropertyProviders::const_iterator provPos = m_pData->m_aProviders.find( _eProperty ); - OSL_ENSURE( provPos != m_pData->m_aProviders.end(), "PropertyChangeNotifier::notifyPropertyChange: no factory!" ); - if ( provPos == m_pData->m_aProviders.end() ) + PropertyProviders::const_iterator provPos = m_xData->m_aProviders.find( _eProperty ); + OSL_ENSURE( provPos != m_xData->m_aProviders.end(), "PropertyChangeNotifier::notifyPropertyChange: no factory!" ); + if ( provPos == m_xData->m_aProviders.end() ) return; OUString sPropertyName( provPos->second->getPropertyName() ); - ::cppu::OInterfaceContainerHelper* pPropListeners = m_pData->m_aPropertyChangeListeners.getContainer( sPropertyName ); - ::cppu::OInterfaceContainerHelper* pAllListeners = m_pData->m_aPropertyChangeListeners.getContainer( OUString() ); + ::cppu::OInterfaceContainerHelper* pPropListeners = m_xData->m_aPropertyChangeListeners.getContainer( sPropertyName ); + ::cppu::OInterfaceContainerHelper* pAllListeners = m_xData->m_aPropertyChangeListeners.getContainer( OUString() ); if ( !pPropListeners && !pAllListeners ) return; try { PropertyChangeEvent aEvent; - aEvent.Source = m_pData->m_rContext; + aEvent.Source = m_xData->m_rContext; // Handle/OldValue not supported aEvent.PropertyName = provPos->second->getPropertyName(); provPos->second->getCurrentValue( aEvent.NewValue ); @@ -159,21 +159,21 @@ namespace svx void PropertyChangeNotifier::addPropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { - m_pData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); + m_xData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener ); } void PropertyChangeNotifier::removePropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener ) { - m_pData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); + m_xData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener ); } void PropertyChangeNotifier::disposing() { EventObject aEvent; - aEvent.Source = m_pData->m_rContext; - m_pData->m_aPropertyChangeListeners.disposeAndClear( aEvent ); + aEvent.Source = m_xData->m_rContext; + m_xData->m_aPropertyChangeListeners.disposeAndClear( aEvent ); } diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index d3fb9fc9e727..3755950c665e 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -460,7 +460,7 @@ #include <comphelper/makesequence.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 4b42c1d1299a..d5872cbe230e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3406,10 +3406,10 @@ void WW8Export::PrepareStorage() { if ( SvtFilterOptions::Get().IsEnableWordPreview() ) { - ::boost::shared_ptr<GDIMetaFile> pMetaFile = + std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(false); uno::Sequence<sal_uInt8> metaFile( - sfx2::convertMetaFile(pMetaFile.get())); + sfx2::convertMetaFile(xMetaFile.get())); sfx2::SaveOlePropertySet(xDocProps, &GetWriter().GetStorage(), &metaFile); } else diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 1c3096cdc434..58d1c79be674 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -837,11 +837,11 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, // with a Frame, else if( bIsSimpleDrawingTextBox ) { - ::boost::shared_ptr<SvxMSDffShapeInfo> const pTmpRec( + std::shared_ptr<SvxMSDffShapeInfo> const xTmpRec( new SvxMSDffShapeInfo(0, pImpRec->nShapeId)); SvxMSDffShapeInfos_ById::const_iterator const it = - GetShapeInfos()->find(pTmpRec); + GetShapeInfos()->find(xTmpRec); if (it != GetShapeInfos()->end()) { SvxMSDffShapeInfo& rInfo = **it; diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx index e6d80e2b8dd5..3f125d3b1030 100644 --- a/sw/source/filter/ww8/ww8toolbar.hxx +++ b/sw/source/filter/ww8/ww8toolbar.hxx @@ -29,8 +29,8 @@ class SwCTBWrapper; class SwTBC : public TBBase { TBCHeader tbch; - boost::shared_ptr< sal_uInt32 > cid; // optional - boost::shared_ptr<TBCData> tbcd; + std::shared_ptr< sal_uInt32 > cid; // optional + std::shared_ptr<TBCData> tbcd; public: SwTBC(); @@ -126,7 +126,7 @@ class Customization : public TBBase sal_uInt16 reserved1; sal_uInt16 ctbds; SwCTBWrapper* pWrapper; - boost::shared_ptr< SwCTB > customizationDataCTB; + std::shared_ptr< SwCTB > customizationDataCTB; std::vector< TBDelta > customizationDataTBDelta; bool bIsDroppedMenuTB; bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index 8f0c4e2610e2..cd26bf9d9765 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <unotools/moduleoptions.hxx> -#include <comphelper/scoped_disposing_ptr.hxx> +#include <comphelper/unique_disposing_ptr.hxx> #include <comphelper/processfactory.hxx> #include <svx/fmobjfac.hxx> @@ -54,10 +54,10 @@ namespace { //Holds a SwDLL and release it on exit, or dispose of the //default XComponent, whichever comes first - class SwDLLInstance : public comphelper::scoped_disposing_solar_mutex_reset_ptr<SwDLL> + class SwDLLInstance : public comphelper::unique_disposing_solar_mutex_reset_ptr<SwDLL> { public: - SwDLLInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr<SwDLL>(uno::Reference<lang::XComponent>( frame::Desktop::create(comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW), new SwDLL) + SwDLLInstance() : comphelper::unique_disposing_solar_mutex_reset_ptr<SwDLL>(uno::Reference<lang::XComponent>( frame::Desktop::create(comphelper::getProcessComponentContext()), uno::UNO_QUERY_THROW), new SwDLL) { } }; diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx index 75c10dd4c095..ceb4c2e50467 100644 --- a/xmloff/inc/RDFaImportHelper.hxx +++ b/xmloff/inc/RDFaImportHelper.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX #define INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX +#include <memory> #include <vector> -#include <boost/shared_ptr.hpp> - #include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> @@ -59,7 +58,7 @@ public: ~RDFaImportHelper(); /** Parse RDFa attributes */ - ::boost::shared_ptr<ParsedRDFaAttributes> ParseRDFa( + std::shared_ptr<ParsedRDFaAttributes> ParseRDFa( OUString const & i_rAbout, OUString const & i_rProperty, OUString const & i_rContent, @@ -69,7 +68,7 @@ public: void AddRDFa( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> const & i_xObject, - ::boost::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes); + std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes); /** Parse and add a RDFa statement; parameters are XML attribute values */ void ParseAndAddRDFa( diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index cf195df204ab..64304271ca04 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/lang/XServiceName.hpp> #include <comphelper/processfactory.hxx> +#include <algorithm> using namespace com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 5b801560e6e9..0cf3061586d0 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -137,12 +137,12 @@ struct ParsedRDFaAttributes struct RDFaEntry { uno::Reference<rdf::XMetadatable> m_xObject; - ::boost::shared_ptr<ParsedRDFaAttributes> m_pRDFaAttributes; + std::shared_ptr<ParsedRDFaAttributes> m_xRDFaAttributes; RDFaEntry(uno::Reference<rdf::XMetadatable> const & i_xObject, - ::boost::shared_ptr<ParsedRDFaAttributes> const& i_pRDFaAttributes) + std::shared_ptr<ParsedRDFaAttributes> const& i_pRDFaAttributes) : m_xObject(i_xObject) - , m_pRDFaAttributes(i_pRDFaAttributes) + , m_xRDFaAttributes(i_pRDFaAttributes) { } }; @@ -331,7 +331,7 @@ void RDFaInserter::InsertRDFaEntry( if (!i_rEntry.m_xObject.is()) return; const uno::Reference< rdf::XResource > xSubject( - MakeResource( i_rEntry.m_pRDFaAttributes->m_About ) ); + MakeResource( i_rEntry.m_xRDFaAttributes->m_About ) ); if (!xSubject.is()) { return; // invalid @@ -339,15 +339,15 @@ void RDFaInserter::InsertRDFaEntry( ::std::vector< uno::Reference< rdf::XURI > > predicates; - predicates.reserve(i_rEntry.m_pRDFaAttributes->m_Properties.size()); + predicates.reserve(i_rEntry.m_xRDFaAttributes->m_Properties.size()); ::std::remove_copy_if( ::boost::make_transform_iterator( - i_rEntry.m_pRDFaAttributes->m_Properties.begin(), + i_rEntry.m_xRDFaAttributes->m_Properties.begin(), ::boost::bind(&RDFaInserter::MakeURI, this, _1)), // argh, this must be the same type :( ::boost::make_transform_iterator( - i_rEntry.m_pRDFaAttributes->m_Properties.end(), + i_rEntry.m_xRDFaAttributes->m_Properties.end(), ::boost::bind(&RDFaInserter::MakeURI, this, _1)), ::std::back_inserter(predicates), ref_is_null() ); @@ -364,9 +364,9 @@ void RDFaInserter::InsertRDFaEntry( } uno::Reference<rdf::XURI> xDatatype; - if (!i_rEntry.m_pRDFaAttributes->m_Datatype.isEmpty()) + if (!i_rEntry.m_xRDFaAttributes->m_Datatype.isEmpty()) { - xDatatype = MakeURI( i_rEntry.m_pRDFaAttributes->m_Datatype ); + xDatatype = MakeURI( i_rEntry.m_xRDFaAttributes->m_Datatype ); } try @@ -376,7 +376,7 @@ void RDFaInserter::InsertRDFaEntry( // to prevent collision between generated ids and ids in the file m_xRepository->setStatementRDFa(xSubject, comphelper::containerToSequence(predicates), i_rEntry.m_xObject, - i_rEntry.m_pRDFaAttributes->m_Content, xDatatype); + i_rEntry.m_xRDFaAttributes->m_Content, xDatatype); } catch (uno::Exception &) { @@ -393,7 +393,7 @@ RDFaImportHelper::~RDFaImportHelper() { } -::boost::shared_ptr<ParsedRDFaAttributes> +std::shared_ptr<ParsedRDFaAttributes> RDFaImportHelper::ParseRDFa( OUString const & i_rAbout, OUString const & i_rProperty, @@ -403,30 +403,30 @@ RDFaImportHelper::ParseRDFa( if (i_rProperty.isEmpty()) { SAL_INFO("xmloff.core", "AddRDFa: invalid input: xhtml:property empty"); - return ::boost::shared_ptr<ParsedRDFaAttributes>(); + return std::shared_ptr<ParsedRDFaAttributes>(); } // must parse CURIEs here: need namespace declaration context RDFaReader reader(GetImport()); const OUString about( reader.ReadURIOrSafeCURIE(i_rAbout) ); if (about.isEmpty()) { - return ::boost::shared_ptr<ParsedRDFaAttributes>(); + return std::shared_ptr<ParsedRDFaAttributes>(); } const ::std::vector< OUString > properties( reader.ReadCURIEs(i_rProperty) ); if (!properties.size()) { - return ::boost::shared_ptr<ParsedRDFaAttributes>(); + return std::shared_ptr<ParsedRDFaAttributes>(); } const OUString datatype( !i_rDatatype.isEmpty() ? reader.ReadCURIE(i_rDatatype) : OUString() ); - return ::boost::shared_ptr<ParsedRDFaAttributes>( + return std::shared_ptr<ParsedRDFaAttributes>( new ParsedRDFaAttributes(about, properties, i_rContent, datatype)); } void RDFaImportHelper::AddRDFa( uno::Reference<rdf::XMetadatable> const & i_xObject, - ::boost::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes) + std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes) { if (!i_xObject.is()) { @@ -449,7 +449,7 @@ RDFaImportHelper::ParseAndAddRDFa( OUString const & i_rContent, OUString const & i_rDatatype) { - ::boost::shared_ptr<ParsedRDFaAttributes> pAttributes( + std::shared_ptr<ParsedRDFaAttributes> pAttributes( ParseRDFa(i_rAbout, i_rProperty, i_rContent, i_rDatatype) ); if (pAttributes.get()) { diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 405c9db021a8..ab86020132be 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -200,8 +200,8 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) if( !mbExportTables ) return; - boost::shared_ptr< XMLTableInfo > pTableInfo( new XMLTableInfo() ); - maTableInfoMap[xColumnRowRange] = pTableInfo; + std::shared_ptr< XMLTableInfo > xTableInfo( new XMLTableInfo() ); + maTableInfoMap[xColumnRowRange] = xTableInfo; try { @@ -216,7 +216,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) { const OUString sStyleName( mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_COLUMN, xPropStates) ); Reference< XInterface > xKey( xPropSet, UNO_QUERY ); - pTableInfo->maColumnStyleMap[xKey] = sStyleName; + xTableInfo->maColumnStyleMap[xKey] = sStyleName; } } catch(const Exception&) @@ -226,7 +226,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) Reference< XIndexAccess > xIndexAccessRows( xColumnRowRange->getRows(), UNO_QUERY_THROW ); const sal_Int32 nRowCount = xIndexAccessRows->getCount(); - pTableInfo->maDefaultRowCellStyles.resize(nRowCount); + xTableInfo->maDefaultRowCellStyles.resize(nRowCount); StringStatisticHelper aStringStatistic; @@ -239,7 +239,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) { const OUString sStyleName( mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_ROW, xRowPropStates) ); Reference< XInterface > xKey( xPropSet, UNO_QUERY ); - pTableInfo->maRowStyleMap[xKey] = sStyleName; + xTableInfo->maRowStyleMap[xKey] = sStyleName; } // get the current row @@ -270,7 +270,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) if( !sStyleName.isEmpty() ) { Reference< XInterface > xKey( xCellSet, UNO_QUERY ); - pTableInfo->maCellStyleMap[xKey] = sStyleName; + xTableInfo->maCellStyleMap[xKey] = sStyleName; } // create auto style for text @@ -283,7 +283,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) OUString sDefaultCellStyle; if( aStringStatistic.getModeString( sDefaultCellStyle ) > 1 ) - pTableInfo->maDefaultRowCellStyles[nRow] = sDefaultCellStyle; + xTableInfo->maDefaultRowCellStyles[nRow] = sDefaultCellStyle; aStringStatistic.clear(); } @@ -300,12 +300,12 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) void XMLTableExport::exportTable( const Reference < XColumnRowRange >& xColumnRowRange ) { - if( !mbExportTables ) - return; + if( !mbExportTables ) + return; - try + try { - boost::shared_ptr< XMLTableInfo > pTableInfo( maTableInfoMap[xColumnRowRange] ); + std::shared_ptr< XMLTableInfo > xTableInfo( maTableInfoMap[xColumnRowRange] ); // get row and column count Reference< XIndexAccess > xIndexAccess( xColumnRowRange->getRows(), UNO_QUERY_THROW ); @@ -317,7 +317,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) SvXMLElementExport tableElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, true, true ); // export table columns - ExportTableColumns( xIndexAccessCols, pTableInfo ); + ExportTableColumns( xIndexAccessCols, xTableInfo ); // start iterating rows and columns for ( sal_Int32 rowIndex = 0; rowIndex < rowCount; rowIndex++ ) @@ -328,14 +328,14 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) OUString sDefaultCellStyle; // table:style-name - if( pTableInfo.get() ) + if( xTableInfo.get() ) { Reference< XInterface > xKey( xCellRange, UNO_QUERY ); - const OUString sStyleName( pTableInfo->maRowStyleMap[xKey] ); + const OUString sStyleName( xTableInfo->maRowStyleMap[xKey] ); if( !sStyleName.isEmpty() ) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sStyleName ); - sDefaultCellStyle = pTableInfo->maDefaultRowCellStyles[rowIndex]; + sDefaultCellStyle = xTableInfo->maDefaultRowCellStyles[rowIndex]; if( !sDefaultCellStyle.isEmpty() ) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, sDefaultCellStyle ); } @@ -352,7 +352,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) Reference< XMergeableCell > xMergeableCell( xCell, UNO_QUERY_THROW ); // export cell - ExportCell( xCell, pTableInfo, sDefaultCellStyle ); + ExportCell( xCell, xTableInfo, sDefaultCellStyle ); } } } @@ -364,7 +364,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) // Export the table columns - void XMLTableExport::ExportTableColumns( const Reference < XIndexAccess >& xtableColumnsIndexAccess, const boost::shared_ptr< XMLTableInfo >& pTableInfo ) + void XMLTableExport::ExportTableColumns( const Reference < XIndexAccess >& xtableColumnsIndexAccess, const std::shared_ptr< XMLTableInfo >& rTableInfo ) { const sal_Int32 nColumnCount = xtableColumnsIndexAccess->getCount(); for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) @@ -373,10 +373,10 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) if ( xColumnProperties.is() ) { // table:style-name - if( pTableInfo.get() ) + if( rTableInfo.get() ) { Reference< XInterface > xKey( xColumnProperties, UNO_QUERY ); - const OUString sStyleName( pTableInfo->maColumnStyleMap[xKey] ); + const OUString sStyleName( rTableInfo->maColumnStyleMap[xKey] ); if( !sStyleName.isEmpty() ) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sStyleName ); } @@ -391,19 +391,19 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) // ODF export for a table cell. - void XMLTableExport::ExportCell( const Reference < XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& rDefaultCellStyle ) + void XMLTableExport::ExportCell( const Reference < XCell >& xCell, const std::shared_ptr< XMLTableInfo >& rTableInfo, const OUString& rDefaultCellStyle ) { bool bIsMerged = false; sal_Int32 nRowSpan = 0; sal_Int32 nColSpan = 0; - try + try { - if( pTableInfo.get() ) + if( rTableInfo.get() ) { // table:style-name Reference< XInterface > xKey( xCell, UNO_QUERY ); - const OUString sStyleName( pTableInfo->maCellStyleMap[xKey] ); + const OUString sStyleName( rTableInfo->maCellStyleMap[xKey] ); if( !sStyleName.isEmpty() && (sStyleName != rDefaultCellStyle) ) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sStyleName ); } diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index dc47fde7db86..729014afff5a 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -41,7 +41,7 @@ #include <osl/diagnose.h> -#include <boost/shared_ptr.hpp> +#include <memory> using namespace ::xmloff::token; using namespace ::com::sun::star::beans; @@ -86,7 +86,7 @@ struct MergeInfo : mnStartColumn( nStartColumn ), mnStartRow( nStartRow ), mnEndColumn( nStartColumn + nColumnSpan - 1 ), mnEndRow( nStartRow + nRowSpan - 1 ) {}; }; -typedef std::vector< boost::shared_ptr< MergeInfo > > MergeInfoVector; +typedef std::vector< std::shared_ptr< MergeInfo > > MergeInfoVector; class XMLTableImportContext : public SvXMLImportContext { @@ -113,7 +113,7 @@ public: Reference< XTableColumns > mxColumns; Reference< XTableRows > mxRows; - std::vector< boost::shared_ptr< ColumnInfo > > maColumnInfos; + std::vector< std::shared_ptr< ColumnInfo > > maColumnInfos; sal_Int32 mnCurrentRow; sal_Int32 mnCurrentColumn; @@ -214,7 +214,7 @@ SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_uInt16 nPrfx, void XMLTableImport::addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate ) { - boost::shared_ptr< XMLTableTemplate > xPtr( new XMLTableTemplate ); + std::shared_ptr< XMLTableTemplate > xPtr( new XMLTableTemplate ); xPtr->swap( xTableTemplate ); maTableTemplates[rsStyleName] = xPtr; } @@ -238,7 +238,7 @@ void XMLTableImport::finishStyles() const OUString sTemplateName( (*aTemplateIter).first ); Reference< XNameReplace > xTemplate( xFactory->createInstance(), UNO_QUERY_THROW ); - boost::shared_ptr< XMLTableTemplate > xT( (*aTemplateIter).second ); + std::shared_ptr< XMLTableTemplate > xT( (*aTemplateIter).second ); for( XMLTableTemplate::iterator aStyleIter( xT->begin() ); aStyleIter != xT->end(); ++aStyleIter ) try { @@ -292,7 +292,7 @@ SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, co { if( mxColumns.is() && (mnCurrentRow == -1) ) try { - boost::shared_ptr< ColumnInfo > xInfo ( new ColumnInfo ); + std::shared_ptr< ColumnInfo > xInfo ( new ColumnInfo ); sal_Int32 nRepeated = 1; @@ -362,7 +362,7 @@ void XMLTableImportContext::InitColumns() for( sal_Int32 nCol = 0; nCol < nCount2; nCol++ ) { - boost::shared_ptr< ColumnInfo > xInfo( maColumnInfos[nCol] ); + std::shared_ptr< ColumnInfo > xInfo( maColumnInfos[nCol] ); if( pAutoStyles && !xInfo->msStyleName.isEmpty() ) { @@ -469,7 +469,7 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, cons const sal_Int32 nColumnSpan = pCellContext->getColumnSpan(); const sal_Int32 nRowSpan = pCellContext->getRowSpan(); if( (nColumnSpan > 1) || (nRowSpan > 1) ) - maMergeInfos.push_back( boost::shared_ptr< MergeInfo >( new MergeInfo( mnCurrentColumn, mnCurrentRow, nColumnSpan, nRowSpan ) ) ); + maMergeInfos.push_back( std::shared_ptr< MergeInfo >( new MergeInfo( mnCurrentColumn, mnCurrentRow, nColumnSpan, nRowSpan ) ) ); const sal_Int32 nRepeated = pCellContext->getRepeated(); if( nRepeated > 1 ) @@ -519,7 +519,7 @@ void XMLTableImportContext::EndElement() MergeInfoVector::iterator aIter( maMergeInfos.begin() ); while( aIter != maMergeInfos.end() ) { - boost::shared_ptr< MergeInfo > xInfo( (*aIter++) ); + std::shared_ptr< MergeInfo > xInfo( (*aIter++) ); if( xInfo.get() ) try { diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index 9b514a0b5a4c..f244d0a54c6f 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -164,11 +164,11 @@ struct XMLTextImportHelper::BackpatcherImpl m_pSequenceNameBackpatcher; }; -::boost::shared_ptr<XMLTextImportHelper::BackpatcherImpl> +std::shared_ptr<XMLTextImportHelper::BackpatcherImpl> XMLTextImportHelper::MakeBackpatcherImpl() { // n.b.: the shared_ptr stores the dtor! - return ::boost::shared_ptr<BackpatcherImpl>(new BackpatcherImpl); + return std::shared_ptr<BackpatcherImpl>(new BackpatcherImpl); } static OUString GetSequenceNumber() @@ -192,33 +192,33 @@ static OUString GetSequenceNumber() XMLPropertyBackpatcher<sal_Int16>& XMLTextImportHelper::GetFootnoteBP() { - if (!m_pBackpatcherImpl->m_pFootnoteBackpatcher.get()) + if (!m_xBackpatcherImpl->m_pFootnoteBackpatcher.get()) { - m_pBackpatcherImpl->m_pFootnoteBackpatcher.reset( + m_xBackpatcherImpl->m_pFootnoteBackpatcher.reset( new XMLPropertyBackpatcher<sal_Int16>(GetSequenceNumber())); } - return *m_pBackpatcherImpl->m_pFootnoteBackpatcher; + return *m_xBackpatcherImpl->m_pFootnoteBackpatcher; } XMLPropertyBackpatcher<sal_Int16>& XMLTextImportHelper::GetSequenceIdBP() { - if (!m_pBackpatcherImpl->m_pSequenceIdBackpatcher.get()) + if (!m_xBackpatcherImpl->m_pSequenceIdBackpatcher.get()) { - m_pBackpatcherImpl->m_pSequenceIdBackpatcher.reset( + m_xBackpatcherImpl->m_pSequenceIdBackpatcher.reset( new XMLPropertyBackpatcher<sal_Int16>(GetSequenceNumber())); } - return *m_pBackpatcherImpl->m_pSequenceIdBackpatcher; + return *m_xBackpatcherImpl->m_pSequenceIdBackpatcher; } XMLPropertyBackpatcher<OUString>& XMLTextImportHelper::GetSequenceNameBP() { static const char s_SourceName[] = "SourceName"; - if (!m_pBackpatcherImpl->m_pSequenceNameBackpatcher.get()) + if (!m_xBackpatcherImpl->m_pSequenceNameBackpatcher.get()) { - m_pBackpatcherImpl->m_pSequenceNameBackpatcher.reset( + m_xBackpatcherImpl->m_pSequenceNameBackpatcher.reset( new XMLPropertyBackpatcher<OUString>(s_SourceName)); } - return *m_pBackpatcherImpl->m_pSequenceNameBackpatcher; + return *m_xBackpatcherImpl->m_pSequenceNameBackpatcher; } void XMLTextImportHelper::InsertFootnoteID( diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index ba4b2d822ed0..f0d34582f180 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -233,12 +233,12 @@ void XMLTextMarkImportContext::EndElement() case TypeBookmarkStart: // save XTextRange for later construction of bookmark { - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > - pRDFaAttributes; + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > + xRDFaAttributes; if (m_bHaveAbout && (TypeBookmarkStart == static_cast<lcl_MarkType>(nTmp))) { - pRDFaAttributes = + xRDFaAttributes = GetImport().GetRDFaImportHelper().ParseRDFa( m_sAbout, m_sProperty, m_sContent, m_sDatatype); @@ -246,7 +246,7 @@ void XMLTextMarkImportContext::EndElement() m_rHelper.InsertBookmarkStartRange( m_sBookmarkName, m_rHelper.GetCursorAsRange()->getStart(), - m_sXmlId, pRDFaAttributes); + m_sXmlId, xRDFaAttributes); } break; @@ -255,11 +255,11 @@ void XMLTextMarkImportContext::EndElement() { // get old range, and construct Reference<XTextRange> xStartRange; - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > - pRDFaAttributes; + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > + xRDFaAttributes; if (m_rHelper.FindAndRemoveBookmarkStartRange( m_sBookmarkName, xStartRange, - m_sXmlId, pRDFaAttributes)) + m_sXmlId, xRDFaAttributes)) { Reference<XTextRange> xEndRange( m_rHelper.GetCursorAsRange()->getStart()); @@ -313,12 +313,12 @@ void XMLTextMarkImportContext::EndElement() m_sBookmarkName, xInsertionCursor, m_sXmlId); - if (pRDFaAttributes) + if (xRDFaAttributes) { const Reference<rdf::XMetadatable> xMeta(xContent, UNO_QUERY); GetImport().GetRDFaImportHelper().AddRDFa( - xMeta, pRDFaAttributes); + xMeta, xRDFaAttributes); } } diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index de4fc70b22a9..d5c6fe378d9e 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -525,7 +525,7 @@ struct XMLTextImportHelper::Impl // start range, xml:id, RDFa stuff typedef ::boost::tuple< uno::Reference<text::XTextRange>, OUString, - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > > + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > > BookmarkMapEntry_t; /// start ranges for open bookmarks ::std::map< OUString, BookmarkMapEntry_t > m_BookmarkStartRanges; @@ -879,7 +879,7 @@ XMLTextImportHelper::XMLTextImportHelper( bool const bOrganizerMode) : m_xImpl( new Impl(rModel, rImport, bInsertMode, bStylesOnlyMode, bProgress, bBlockMode, bOrganizerMode) ) - , m_pBackpatcherImpl( MakeBackpatcherImpl() ) + , m_xBackpatcherImpl( MakeBackpatcherImpl() ) { static const char s_PropNameDefaultListId[] = "DefaultListId"; @@ -2485,7 +2485,7 @@ void XMLTextImportHelper::InsertBookmarkStartRange( const OUString & sName, const Reference<XTextRange> & rRange, OUString const& i_rXmlId, - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes) + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes) { m_xImpl->m_BookmarkStartRanges[sName] = ::boost::make_tuple(rRange, i_rXmlId, i_rpRDFaAttributes); @@ -2496,7 +2496,7 @@ bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange( const OUString & sName, Reference<XTextRange> & o_rRange, OUString & o_rXmlId, - ::boost::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes) + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes) { if (m_xImpl->m_BookmarkStartRanges.count(sName)) { |