boost::foo_ptr->std::foo_ptr

Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a

6 files changed, 58 insertions, 58 deletions

diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index acf89b5f4fb4..b5adc8962ec4 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -45,7 +45,7 @@ namespace svtools {
 
 ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits):
     Window(pParent, WB_DIALOGCONTROL), m_pEditWin(this, nBits),
-    m_pInfoTable(new SvtDocInfoTable_Impl),
+    m_xInfoTable(new SvtDocInfoTable_Impl),
     m_aLanguageTag(SvtPathOptions().GetLanguageTag()) // detect application language
 {
     m_pEditWin.SetLeftMargin(10);
@@ -147,7 +147,7 @@ void ODocumentInfoPreview::insertEntry(
 void ODocumentInfoPreview::insertNonempty(long id, OUString const & value)
 {
     if (!value.isEmpty()) {
-        insertEntry(m_pInfoTable->GetString(id), value);
+        insertEntry(m_xInfoTable->GetString(id), value);
     }
 }
 
@@ -163,7 +163,7 @@ void ODocumentInfoPreview::insertDateTime(
         OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT));
         buf.append(", ");
         buf.append(rLocaleWrapper.getTime(aToolsDT));
-        insertEntry(m_pInfoTable->GetString(id), buf.makeStringAndClear());
+        insertEntry(m_xInfoTable->GetString(id), buf.makeStringAndClear());
     }
 }
 
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index c599a3985520..9a448e458df1 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -569,8 +569,8 @@ typedef std::map<sal_uInt16, SvxIconChoiceCtrlEntryPtrVec> IconChoiceMap;
 class IcnCursor_Impl
 {
     SvxIconChoiceCtrl_Impl* pView;
-    boost::scoped_ptr<IconChoiceMap> pColumns;
-    boost::scoped_ptr<IconChoiceMap> pRows;
+    std::unique_ptr<IconChoiceMap> xColumns;
+    std::unique_ptr<IconChoiceMap> xRows;
     long                    nCols;
     long                    nRows;
     short                   nDeltaWidth;
@@ -578,7 +578,7 @@ class IcnCursor_Impl
     SvxIconChoiceCtrlEntry* pCurEntry;
     void                    SetDeltas();
     void                    ImplCreate();
-    void                    Create() {  if( !pColumns ) ImplCreate(); }
+    void                    Create() {  if( !xColumns ) ImplCreate(); }
 
     sal_uInt16              GetSortListPos(
                                 SvxIconChoiceCtrlEntryPtrVec& rList,
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index badf45c83df5..88d6f0ad7714 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -62,12 +62,12 @@ sal_uInt16 IcnCursor_Impl::GetSortListPos( SvxIconChoiceCtrlEntryPtrVec& rList,
 void IcnCursor_Impl::ImplCreate()
 {
     pView->CheckBoundingRects();
-    DBG_ASSERT(pColumns==0&&pRows==0,"ImplCreate: Not cleared");
+    DBG_ASSERT(xColumns==0&&xRows==0,"ImplCreate: Not cleared");
 
     SetDeltas();
 
-    pColumns.reset(new IconChoiceMap);
-    pRows.reset(new IconChoiceMap);
+    xColumns.reset(new IconChoiceMap);
+    xRows.reset(new IconChoiceMap);
 
     size_t nCount = pView->aEntries.size();
     for( size_t nCur = 0; nCur < nCount; nCur++ )
@@ -84,11 +84,11 @@ void IcnCursor_Impl::ImplCreate()
         if( nX >= nCols )
             nX = sal::static_int_cast< short >(nCols - 1);
 
-        SvxIconChoiceCtrlEntryPtrVec& rColEntry = (*pColumns)[nX];
+        SvxIconChoiceCtrlEntryPtrVec& rColEntry = (*xColumns)[nX];
         sal_uInt16 nIns = GetSortListPos( rColEntry, rRect.Top(), sal_True );
         rColEntry.insert( rColEntry.begin() + nIns, pEntry );
 
-        SvxIconChoiceCtrlEntryPtrVec& rRowEntry = (*pRows)[nY];
+        SvxIconChoiceCtrlEntryPtrVec& rRowEntry = (*xRows)[nY];
         nIns = GetSortListPos( rRowEntry, rRect.Left(), sal_False );
         rRowEntry.insert( rRowEntry.begin() + nIns, pEntry );
 
@@ -102,10 +102,10 @@ void IcnCursor_Impl::ImplCreate()
 
 void IcnCursor_Impl::Clear()
 {
-    if( pColumns )
+    if( xColumns )
     {
-        pColumns.reset();
-        pRows.reset();
+        xColumns.reset();
+        xRows.reset();
         pCurEntry = 0;
         nDeltaWidth = 0;
         nDeltaHeight = 0;
@@ -116,8 +116,8 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchCol(sal_uInt16 nCol, sal_uInt16 nT
     sal_uInt16, bool bDown, bool bSimple )
 {
     DBG_ASSERT(pCurEntry, "SearchCol: No reference entry");
-    IconChoiceMap::iterator mapIt = pColumns->find( nCol );
-    if ( mapIt == pColumns->end() )
+    IconChoiceMap::iterator mapIt = xColumns->find( nCol );
+    if ( mapIt == xColumns->end() )
         return 0;
     SvxIconChoiceCtrlEntryPtrVec const & rList = mapIt->second;
     const sal_uInt16 nCount = rList.size();
@@ -195,8 +195,8 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow, sal_uInt16 nL
     sal_uInt16, bool bRight, bool bSimple )
 {
     DBG_ASSERT(pCurEntry,"SearchRow: No reference entry");
-    IconChoiceMap::iterator mapIt = pRows->find( nRow );
-    if ( mapIt == pRows->end() )
+    IconChoiceMap::iterator mapIt = xRows->find( nRow );
+    if ( mapIt == xRows->end() )
         return 0;
     SvxIconChoiceCtrlEntryPtrVec const & rList = mapIt->second;
     const sal_uInt16 nCount = rList.size();
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index e97386c17822..44d507cd9d5a 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -857,9 +857,9 @@ void Ruler::ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom
             if (RULER_INDENT_BORDER != nIndentStyle)
             {
                 bool bIsHit = false;
-                if(mpCurrentHitTest.get() != NULL && mpCurrentHitTest->eType == RULER_TYPE_INDENT)
+                if(mxCurrentHitTest.get() != NULL && mxCurrentHitTest->eType == RULER_TYPE_INDENT)
                 {
-                    bIsHit = mpCurrentHitTest->nAryPos == j;
+                    bIsHit = mxCurrentHitTest->nAryPos == j;
                 }
                 else if(mbDrag && meDragType == RULER_TYPE_INDENT)
                 {
@@ -2083,36 +2083,36 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
 {
     PointerStyle ePtrStyle = POINTER_ARROW;
 
-    mpCurrentHitTest.reset(new RulerSelection);
+    mxCurrentHitTest.reset(new RulerSelection);
 
     maHoverSelection.eType = RULER_TYPE_DONTKNOW;
 
-    if (ImplHitTest( rMEvt.GetPosPixel(), mpCurrentHitTest.get() ))
+    if (ImplHitTest( rMEvt.GetPosPixel(), mxCurrentHitTest.get() ))
     {
-        maHoverSelection = *mpCurrentHitTest.get();
+        maHoverSelection = *mxCurrentHitTest.get();
 
-        if (mpCurrentHitTest->bSize)
+        if (mxCurrentHitTest->bSize)
         {
             if (mnWinStyle & WB_HORZ)
             {
-                if (mpCurrentHitTest->mnDragSize == RULER_DRAGSIZE_1)
+                if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_1)
                     ePtrStyle = POINTER_TAB_SELECT_W;
-                else if (mpCurrentHitTest->mnDragSize == RULER_DRAGSIZE_2)
+                else if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_2)
                     ePtrStyle = POINTER_TAB_SELECT_E;
                 else
                     ePtrStyle = POINTER_ESIZE;
             }
             else
             {
-                if (mpCurrentHitTest->mnDragSize == RULER_DRAGSIZE_1)
+                if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_1)
                     ePtrStyle = POINTER_WINDOW_NSIZE;
-                else if (mpCurrentHitTest->mnDragSize == RULER_DRAGSIZE_2)
+                else if (mxCurrentHitTest->mnDragSize == RULER_DRAGSIZE_2)
                     ePtrStyle = POINTER_WINDOW_SSIZE;
                 else
                     ePtrStyle = POINTER_SSIZE;
             }
         }
-        else if (mpCurrentHitTest->bSizeBar)
+        else if (mxCurrentHitTest->bSizeBar)
         {
             if (mnWinStyle & WB_HORZ)
                 ePtrStyle = POINTER_HSIZEBAR;
@@ -2121,7 +2121,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
         }
     }
 
-    if(mpPreviousHitTest.get() != NULL && mpPreviousHitTest->eType != mpCurrentHitTest->eType)
+    if(mxPreviousHitTest.get() != NULL && mxPreviousHitTest->eType != mxCurrentHitTest->eType)
     {
         mbFormat = true;
     }
@@ -2133,7 +2133,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
         Paint(Rectangle());
         mnUpdateFlags &= ~RULER_UPDATE_DRAW;
     }
-    mpPreviousHitTest.swap(mpCurrentHitTest);
+    mxPreviousHitTest.swap(mxCurrentHitTest);
 }
 
 void Ruler::Tracking( const TrackingEvent& rTEvt )
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 6a41e0b7e14e..67d28733fb80 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -58,7 +58,7 @@ enum
 void ValueSet::ImplInit()
 {
     mpNoneItem.reset(NULL);
-    mpScrollBar.reset(NULL);
+    mxScrollBar.reset(NULL);
 
     mnItemWidth         = 0;
     mnItemHeight        = 0;
@@ -197,16 +197,16 @@ void ValueSet::ImplInitScrollBar()
 {
     if ( GetStyle() & WB_VSCROLL )
     {
-        if ( !mpScrollBar.get() )
+        if ( !mxScrollBar.get() )
         {
-            mpScrollBar.reset(new ScrollBar( this, WB_VSCROLL | WB_DRAG ));
-            mpScrollBar->SetScrollHdl( LINK( this, ValueSet, ImplScrollHdl ) );
+            mxScrollBar.reset(new ScrollBar( this, WB_VSCROLL | WB_DRAG ));
+            mxScrollBar->SetScrollHdl( LINK( this, ValueSet, ImplScrollHdl ) );
         }
         else
         {
             // adapt the width because of the changed settings
             long nScrBarWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
-            mpScrollBar->setPosSizePixel( 0, 0, nScrBarWidth, 0, WINDOW_POSSIZE_WIDTH );
+            mxScrollBar->setPosSizePixel( 0, 0, nScrBarWidth, 0, WINDOW_POSSIZE_WIDTH );
         }
     }
 }
@@ -344,17 +344,17 @@ void ValueSet::Format()
     long        nOff;
     long        nNoneHeight;
     long        nNoneSpace;
-    boost::scoped_ptr<ScrollBar> pDeletedScrollBar(NULL);
+    std::unique_ptr<ScrollBar> xDeletedScrollBar;
 
     // consider the scrolling
     if ( nStyle & WB_VSCROLL )
         ImplInitScrollBar();
     else
     {
-        if ( mpScrollBar.get() )
+        if ( mxScrollBar.get() )
         {
             // delete ScrollBar not until later, to prevent recursive calls
-            pDeletedScrollBar.swap(mpScrollBar);
+            xDeletedScrollBar.swap(mxScrollBar);
         }
     }
 
@@ -403,8 +403,8 @@ void ValueSet::Format()
 
     // calculate ScrollBar width
     long nScrBarWidth = 0;
-    if (mpScrollBar.get())
-        nScrBarWidth = mpScrollBar->GetSizePixel().Width()+SCRBAR_OFFSET;
+    if (mxScrollBar.get())
+        nScrBarWidth = mxScrollBar->GetSizePixel().Width()+SCRBAR_OFFSET;
 
     // calculate number of columns
     if (!mnUserCols)
@@ -511,8 +511,8 @@ void ValueSet::Format()
             mItemList[i]->mbVisible = false;
         }
 
-        if ( mpScrollBar.get() )
-            mpScrollBar->Hide();
+        if ( mxScrollBar.get() )
+            mxScrollBar->Hide();
     }
     else
     {
@@ -644,7 +644,7 @@ void ValueSet::Format()
         }
 
         // arrange ScrollBar, set values and show it
-        if ( mpScrollBar.get() )
+        if ( mxScrollBar.get() )
         {
             Point   aPos( aWinSize.Width() - nScrBarWidth + SCRBAR_OFFSET, 0 );
             Size    aSize( nScrBarWidth - SCRBAR_OFFSET, aWinSize.Height() );
@@ -654,15 +654,15 @@ void ValueSet::Format()
                 aPos.Y() = nStartY + nNoneHeight + 1;
                 aSize.Height() = ((mnItemHeight + mnSpacing) * mnVisLines) - 2 - mnSpacing;
             }
-            mpScrollBar->SetPosSizePixel( aPos, aSize );
-            mpScrollBar->SetRangeMax( mnLines );
-            mpScrollBar->SetVisibleSize( mnVisLines );
-            mpScrollBar->SetThumbPos( (long)mnFirstLine );
+            mxScrollBar->SetPosSizePixel( aPos, aSize );
+            mxScrollBar->SetRangeMax( mnLines );
+            mxScrollBar->SetVisibleSize( mnVisLines );
+            mxScrollBar->SetThumbPos( (long)mnFirstLine );
             long nPageSize = mnVisLines;
             if ( nPageSize < 1 )
                 nPageSize = 1;
-            mpScrollBar->SetPageSize( nPageSize );
-            mpScrollBar->Show();
+            mxScrollBar->SetPageSize( nPageSize );
+            mxScrollBar->Show();
         }
     }
 
@@ -933,10 +933,10 @@ void ValueSet::ImplDraw()
     Point   aDefPos;
     Size    aSize = maVirDev.GetOutputSizePixel();
 
-    if ( mpScrollBar.get() && mpScrollBar->IsVisible() )
+    if ( mxScrollBar.get() && mxScrollBar->IsVisible() )
     {
-        Point   aScrPos = mpScrollBar->GetPosPixel();
-        Size    aScrSize = mpScrollBar->GetSizePixel();
+        Point   aScrPos = mxScrollBar->GetPosPixel();
+        Size    aScrSize = mxScrollBar->GetSizePixel();
         Point   aTempPos( 0, aScrPos.Y() );
         Size    aTempSize( aSize.Width(), aScrPos.Y() );
 
@@ -1402,7 +1402,7 @@ void ValueSet::Command( const CommandEvent& rCommandEvent )
          rCommandEvent.GetCommand() == COMMAND_STARTAUTOSCROLL ||
          rCommandEvent.GetCommand() == COMMAND_AUTOSCROLL )
     {
-        if ( HandleScrollCommand( rCommandEvent, NULL, mpScrollBar.get() ) )
+        if ( HandleScrollCommand( rCommandEvent, NULL, mxScrollBar.get() ) )
             return;
     }
 
@@ -2252,7 +2252,7 @@ long ValueSet::GetScrollWidth() const
     if ( GetStyle() & WB_VSCROLL )
     {
         const_cast<ValueSet*>(this)->ImplInitScrollBar();
-        return mpScrollBar->GetSizePixel().Width() + SCRBAR_OFFSET;
+        return mxScrollBar->GetSizePixel().Width() + SCRBAR_OFFSET;
     }
     else
         return 0;
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 566bc59da172..aa6277a81c07 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -138,7 +138,7 @@ PopupWindowController::PopupWindowController( const Reference< uno::XComponentCo
                                               const Reference< frame::XFrame >& xFrame,
                                               const OUString& aCommandURL )
 : svt::ToolboxController( rxContext, xFrame, aCommandURL )
-, mpImpl( new PopupWindowControllerImpl() )
+, mxImpl( new PopupWindowControllerImpl() )
 {
 }
 
@@ -223,8 +223,8 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() th
         vcl::Window* pWin = createPopupWindow( pItemWindow ? pItemWindow : pToolBox );
         if( pWin )
         {
-               pWin->EnableDocking(true);
-            mpImpl->SetPopupWindow(pWin,pToolBox);
+            pWin->EnableDocking(true);
+            mxImpl->SetPopupWindow(pWin,pToolBox);
             vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin,
                                                            FLOATWIN_POPUPMODE_GRABFOCUS |
                                                            FLOATWIN_POPUPMODE_NOFOCUSCLOSE |