Use scoped_ptr for this.

Change-Id: Ibb3e96ceee80294c343b2a80befabbe938838784

3 files changed, 10 insertions, 12 deletions

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0c008514cbc5..4042d99ba347 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -163,7 +163,7 @@ private:
 
     SCTAB           nTab;
     ScDocument*     pDocument;
-    utl::TextSearch*    pSearchText;
+    boost::scoped_ptr<utl::TextSearch> mpSearchText;
 
     mutable OUString aUpperName;             // #i62977# filled only on demand, reset in SetName
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index e6033373765d..497947650e04 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -246,7 +246,6 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName,
     nTableAreaY( 0 ),
     nTab( nNewTab ),
     pDocument( pDoc ),
-    pSearchText ( NULL ),
     pSortCollator( NULL ),
     pRepeatColRange( NULL ),
     pRepeatRowRange( NULL ),
@@ -333,7 +332,6 @@ ScTable::~ScTable()
     delete pRowFlags;
     delete pSheetEvents;
     delete pOutlineTable;
-    delete pSearchText;
     delete pRepeatColRange;
     delete pRepeatRowRange;
     delete pScenarioRanges;
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 8c82c702f975..1826a27d5054 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -101,18 +101,18 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
     sal_Int32 nStart = 0;
     sal_Int32 nEnd = aString.getLength();
     ::com::sun::star::util::SearchResult aSearchResult;
-    if (pSearchText)
+    if (mpSearchText)
     {
         if ( bDoBack )
         {
            sal_Int32 nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-            bFound = pSearchText->SearchBackward(aString, &nStart, &nEnd, &aSearchResult);
+            bFound = mpSearchText->SearchBackward(aString, &nStart, &nEnd, &aSearchResult);
             // change results to definition before 614:
             --nEnd;
         }
         else
         {
-            bFound = pSearchText->SearchForward(aString, &nStart, &nEnd, &aSearchResult);
+            bFound = mpSearchText->SearchForward(aString, &nStart, &nEnd, &aSearchResult);
             // change results to definition before 614:
             --nEnd;
         }
@@ -156,7 +156,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
             OUString sReplStr = rSearchItem.GetReplaceString();
             if (rSearchItem.GetRegExp())
             {
-                pSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult );
+                mpSearchText->ReplaceBackReferences( sReplStr, aString, aSearchResult );
                 OUStringBuffer aStrBuffer(aString);
                 aStrBuffer.remove(nStart, nEnd-nStart+1);
                 aStrBuffer.insert(nStart, sReplStr);
@@ -190,13 +190,13 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
                 else if (bDoBack)
                 {
                     sal_Int32 nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-                    bRepeat = pSearchText->SearchBackward(aString, &nStart, &nEnd, &aSearchResult);
+                    bRepeat = mpSearchText->SearchBackward(aString, &nStart, &nEnd, &aSearchResult);
                     // change results to definition before 614:
                     --nEnd;
                 }
                 else
                 {
-                    bRepeat = pSearchText->SearchForward(aString, &nStart, &nEnd, &aSearchResult);
+                    bRepeat = mpSearchText->SearchForward(aString, &nStart, &nEnd, &aSearchResult);
                     // change results to definition before 614:
                     --nEnd;
                 }
@@ -743,7 +743,7 @@ bool ScTable::SearchAndReplace(
             ( com::sun::star::i18n::TransliterationModules_IGNORE_CASE |
               com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH );
 
-    pSearchText = new utl::TextSearch( aSearchOptions );
+    mpSearchText.reset(new utl::TextSearch(aSearchOptions));
 
     bool bFound = false;
     if (nCommand == SVX_SEARCHCMD_FIND)
@@ -755,8 +755,8 @@ bool ScTable::SearchAndReplace(
     else if (nCommand == SVX_SEARCHCMD_REPLACE_ALL)
         bFound = ReplaceAll(rSearchItem, rMark, rMatchedRanges, rUndoStr, pUndoDoc);
 
-    delete pSearchText;
-    pSearchText = NULL;
+    mpSearchText.reset();
+
     return bFound;
 }