boost->std

Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853

8 files changed, 79 insertions, 79 deletions

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