boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

4 files changed, 10 insertions, 10 deletions

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