vcl cleanup post re-base.

Change-Id: I2500a2079cd029505f404f34c9b3d9ec1961afbd

6 files changed, 9 insertions, 11 deletions

diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 65baa304b245..cdc80d9cd31c 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -628,7 +628,6 @@ protected:
 
 public:
     explicit                DateField( vcl::Window* pParent, WinBits nWinStyle );
-    virtual                 ~DateField();
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
     virtual bool            Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
@@ -662,7 +661,6 @@ protected:
 
 public:
     explicit                TimeField( vcl::Window* pParent, WinBits nWinStyle );
-    virtual                 ~TimeField();
 
     virtual bool            PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
     virtual bool            Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 2216348cb599..2ed5bf777c91 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2084,8 +2084,8 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingHeight( SvxIconChoiceCtrlEntry* pEntry
     if( nHeight > nMaxBoundHeight )
     {
         const_cast<SvxIconChoiceCtrl_Impl*>(this)->nMaxBoundHeight = nHeight;
-        const_cast<SvxIconChoiceCtrl_Impl*>(this)->aHorSBar.SetLineSize( GetScrollBarLineSize() );
-        const_cast<SvxIconChoiceCtrl_Impl*>(this)->aVerSBar.SetLineSize( GetScrollBarLineSize() );
+        const_cast<SvxIconChoiceCtrl_Impl*>(this)->aHorSBar->SetLineSize( GetScrollBarLineSize() );
+        const_cast<SvxIconChoiceCtrl_Impl*>(this)->aVerSBar->SetLineSize( GetScrollBarLineSize() );
     }
     return nHeight;
 }
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 98a0b95a495e..844585bcbded 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -135,7 +135,7 @@ void ValueSet::dispose()
         xComponent->dispose();
 
     ImplDeleteItems();
-    mpScrollBar.disposeAndClear();
+    mxScrollBar.disposeAndClear();
     Control::dispose();
 }
 
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index b421606c5a24..a3578fbd4afd 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -833,7 +833,7 @@ void DbgGUIStart()
 
     if ( pData )
     {
-        ScopedVclPtrInstance< DbgDialog > pDialog;
+        ScopedVclPtrInstance< DbgDialog > xDialog;
         // we switch off dialog tests for the debug dialog
         sal_uLong nOldFlags = pData->nTestFlags;
         pData->nTestFlags &= ~DBG_TEST_DIALOG;
diff --git a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx
index dee313f526ee..5bb12eaf2eca 100644
--- a/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/gdi/cairo_gtk3_cairo.hxx
@@ -37,7 +37,7 @@ namespace cairo {
         virtual CairoSurfaceSharedPtr getCairoSurface() const SAL_OVERRIDE { return mpSurface; }
         virtual SurfaceSharedPtr getSimilar(int nContentType, int width, int height) const SAL_OVERRIDE;
 
-        virtual boost::shared_ptr<VirtualDevice> createVirtualDevice() const SAL_OVERRIDE;
+        virtual VclPtr<VirtualDevice> createVirtualDevice() const SAL_OVERRIDE;
 
         virtual void flush() const SAL_OVERRIDE;
 
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d2170b34c1a4..4220b7f081c2 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1456,9 +1456,9 @@ class DemoWidgets : public WorkWindow
 public:
     DemoWidgets() :
         WorkWindow(NULL, WB_STDWORK),
-        mpBox(new VclVBox(this, false, 3)),
-        mpToolbox(new ToolBox(mpBox)),
-        mpButton(new PushButton(mpBox))
+        mpBox(VclPtrInstance<VclVBox>(this, false, 3)),
+        mpToolbox(VclPtrInstance<ToolBox>(mpBox)),
+        mpButton(VclPtrInstance<PushButton>(mpBox))
     {
         SetText("VCL widget demo");
 
@@ -1486,7 +1486,7 @@ public:
     {
         mpBox.disposeAndClear();
         mpToolbox.disposeAndClear();
-        mpPushButton.disposeAndClear();
+        mpButton.disposeAndClear();
         WorkWindow::dispose();
     }
     virtual void Paint(const Rectangle&) SAL_OVERRIDE