boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

4 files changed, 68 insertions, 68 deletions

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 )