boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

Author: Caolán McNamara

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>

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 @@ class Dll
 
 // 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

cppcanvas/qa/extras/emfplus/emfplus.cxx

@@ -57,9 +57,9 @@ class Test : public UnoApiTest
         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)

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>

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)))
         {
         }
     };

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 )

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,25 +257,25 @@ 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++ )
             {
                 if ( IsProperty( i ) )
                 {
                     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,29 +315,29 @@ 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() );
                             }
                         }
                     }
                     else
                     {
                         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