ScGridWindow: scoped_ptr -> unique_ptr

Change-Id: I6a888b58668ccb64c5a9c3270d06c3b9bcf8ce64

4 files changed, 17 insertions, 21 deletions

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 395c204f2a59..fa0d2c029274 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <vector>
@@ -105,7 +104,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou
     ::sdr::overlay::OverlayObjectList*              mpOOHeader;
     ::sdr::overlay::OverlayObjectList*              mpOOShrink;
 
-    boost::scoped_ptr<Rectangle> mpAutoFillRect;
+    std::unique_ptr<Rectangle> mpAutoFillRect;
 
     struct MouseEventState;
 
@@ -128,7 +127,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou
 
     VisibleRange maVisibleRange;
 
-    boost::scoped_ptr<sc::SpellCheckContext> mpSpellCheckCxt;
+    std::unique_ptr<sc::SpellCheckContext> mpSpellCheckCxt;
 
     ScViewData*             pViewData;
     ScSplitPos              eWhich;
@@ -139,9 +138,9 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou
 
     std::unique_ptr<ScFilterListBox> mpFilterBox;
     std::unique_ptr<FloatingWindow> mpFilterFloat;
-    boost::scoped_ptr<ScCheckListMenuWindow> mpAutoFilterPopup;
-    boost::scoped_ptr<ScCheckListMenuWindow> mpDPFieldPopup;
-    boost::scoped_ptr<ScDPFieldButton>       mpFilterButton;
+    std::unique_ptr<ScCheckListMenuWindow> mpAutoFilterPopup;
+    std::unique_ptr<ScCheckListMenuWindow> mpDPFieldPopup;
+    std::unique_ptr<ScDPFieldButton> mpFilterButton;
 
     sal_uInt16              nCursorHideCount;
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2e75e69ecf83..a88333b3ea8d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -135,7 +135,6 @@
 #include <svx/sdr/overlay/overlayselection.hxx>
 
 #include <vector>
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
 using namespace css;
@@ -443,9 +442,9 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos
             pNoteMarker( NULL ),
             mpFilterBox(),
             mpFilterFloat(),
-            mpAutoFilterPopup(NULL),
-            mpDPFieldPopup(NULL),
-            mpFilterButton(NULL),
+            mpAutoFilterPopup(),
+            mpDPFieldPopup(),
+            mpFilterButton(),
             nCursorHideCount( 0 ),
             nButtonDown( 0 ),
             nMouseStatus( SC_GM_NONE ),
@@ -1264,7 +1263,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec
             const ScValidationData* pData = pDoc->GetValidationEntry( nIndex );
             if (pData)
             {
-                boost::scoped_ptr<ScTypedStrData> pNew;
+                std::unique_ptr<ScTypedStrData> pNew;
                 OUString aDocStr = pDoc->GetString(nCol, nRow, nTab);
                 if ( pDoc->HasValueData( nCol, nRow, nTab ) )
                 {
@@ -5264,7 +5263,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
         aPaperSize.Width() = nThisColLogic;
     pEngine->SetPaperSize( aPaperSize );
 
-    boost::scoped_ptr<EditTextObject> pTextObj;
+    std::unique_ptr<EditTextObject> pTextObj;
     if (aCell.meType == CELLTYPE_EDIT)
     {
         if (aCell.mpEditText)
@@ -5507,7 +5506,7 @@ bool ScGridWindow::ContinueOnlineSpelling()
     while (pCell && nCol < mpSpellCheckCxt->maPos.mnCol)
         pCell = aIter.GetNext(nCol, nRow);
 
-    boost::scoped_ptr<ScTabEditEngine> pEngine;
+    std::unique_ptr<ScTabEditEngine> pEngine;
 
     // Check only up to 256 cells at a time.
     size_t nTotalCellCount = 0;
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index b98dadb4c88b..4a66bbf6c216 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -48,7 +48,6 @@
 
 #include <unordered_map>
 #include <vector>
-#include <boost/scoped_ptr.hpp>
 
 using namespace css;
 using namespace css::sheet;
@@ -209,8 +208,9 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent&
             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
             OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-            boost::scoped_ptr<AbstractScPivotFilterDlg> pDlg(pFact->CreateScPivotFilterDlg(
-                pViewData->GetViewShell()->GetDialogParent(), aArgSet, nSrcTab));
+            const std::unique_ptr<AbstractScPivotFilterDlg> pDlg(
+                pFact->CreateScPivotFilterDlg(
+                    pViewData->GetViewShell()->GetDialogParent(), aArgSet, nSrcTab));
             OSL_ENSURE(pDlg, "Dialog create fail!");
             if ( pDlg->Execute() == RET_OK )
             {
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index c291370ca257..dc747e67bfa1 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -66,8 +66,6 @@
 #include <vcl/virdev.hxx>
 #include <svx/sdrpaintwindow.hxx>
 
-#include <boost/scoped_ptr.hpp>
-
 static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible )
 {
     if ( rRect.Top()    < rVisible.Top()-1 )    rRect.Top()    = rVisible.Top()-1;
@@ -484,7 +482,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     aOutputData.SetMirrorWidth( nMirrorWidth ); // needed for RTL
     aOutputData.SetSpellCheckContext(mpSpellCheckCxt.get());
 
-    boost::scoped_ptr< VirtualDevice > xFmtVirtDev;
+    std::unique_ptr<VirtualDevice> xFmtVirtDev;
     bool bLogicText = bTextWysiwyg; // call DrawStrings in logic MapMode?
 
     if ( bTextWysiwyg )
@@ -1011,7 +1009,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
         }
 
         vcl::Font aFont;
-        boost::scoped_ptr<ScEditEngineDefaulter> pEditEng;
+        std::unique_ptr<ScEditEngineDefaulter> pEditEng;
         const ScPatternAttr& rDefPattern = static_cast<const ScPatternAttr&>(pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN));
         if ( nPageScript == SCRIPTTYPE_LATIN )
         {
@@ -1203,7 +1201,7 @@ void ScGridWindow::DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo
     SCSIZE nQuery;
     SCTAB           nTab = pViewData->GetTabNo();
     ScDBData*       pDBData = NULL;
-    boost::scoped_ptr<ScQueryParam> pQueryParam;
+    std::unique_ptr<ScQueryParam> pQueryParam;
 
     RowInfo*        pRowInfo = rTabInfo.mpRowInfo;
     sal_uInt16          nArrCount = rTabInfo.mnArrCount;