boost::foo_ptr->std::foo_ptr

Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a

3 files changed, 18 insertions, 18 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();