Merge remote-tracking branch 'origin/feature/vclptr'

Resolve several thousand lines of conflicts.

Conflicts:
accessibility/source/extended/accessiblelistbox.cxx
accessibility/source/standard/vclxaccessiblecombobox.cxx
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
accessibility/source/standard/vclxaccessiblelistbox.cxx
accessibility/source/standard/vclxaccessibletextfield.cxx
basctl/source/basicide/basidesh.cxx
cui/source/inc/chardlg.hxx
cui/source/tabpages/tpbitmap.cxx
dbaccess/source/ui/dlg/UserAdmin.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
extensions/source/propctrlr/propertyeditor.hxx
extensions/source/scanner/sanedlg.cxx
filter/source/pdf/impdialog.cxx
include/sfx2/mgetempl.hxx
include/sfx2/sidebar/SidebarToolBox.hxx
include/sfx2/viewsh.hxx
include/svtools/brwbox.hxx
include/svtools/filectrl.hxx
include/svtools/scrwin.hxx
include/svx/dlgctrl.hxx
include/svx/sidebar/Popup.hxx
include/svx/sidebar/PopupContainer.hxx
include/svx/sidebar/PopupControl.hxx
include/svx/sidebar/SidebarDialControl.hxx
include/svx/sidebar/ValueSetWithTextControl.hxx
sc/source/ui/condformat/condformatdlgentry.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/sidebar/CellBorderStyleControl.hxx
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/inc/DrawViewShell.hxx
sd/source/ui/inc/Ruler.hxx
sd/source/ui/inc/SlideSorter.hxx
sd/source/ui/inc/ViewTabBar.hxx
sd/source/ui/inc/Window.hxx
sd/source/ui/inc/morphdlg.hxx
sd/source/ui/inc/sdpreslt.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/LayoutMenu.hxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
sd/source/ui/sidebar/NavigatorWrapper.hxx
sd/source/ui/sidebar/PanelBase.hxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
sd/source/ui/slideshow/showwindow.hxx
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drviewsa.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/opengrf.cxx
sfx2/source/control/thumbnailviewacc.hxx
sfx2/source/dialog/securitypage.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/doc/docinsert.cxx
sfx2/source/doc/guisaveas.cxx
sfx2/source/inc/alienwarn.hxx
sfx2/source/sidebar/Deck.cxx
sfx2/source/sidebar/Deck.hxx
sfx2/source/sidebar/DeckTitleBar.cxx
sfx2/source/sidebar/DeckTitleBar.hxx
sfx2/source/sidebar/MenuButton.cxx
sfx2/source/sidebar/MenuButton.hxx
sfx2/source/sidebar/Panel.cxx
sfx2/source/sidebar/Panel.hxx
sfx2/source/sidebar/PanelTitleBar.hxx
sfx2/source/sidebar/SidebarDockingWindow.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
sfx2/source/sidebar/TabBar.hxx
sfx2/source/sidebar/TabItem.cxx
sfx2/source/sidebar/TabItem.hxx
sfx2/source/sidebar/TitleBar.hxx
sfx2/source/toolbox/imgmgr.cxx
starmath/inc/edit.hxx
starmath/inc/smmod.hxx
starmath/qa/cppunit/test_starmath.cxx
starmath/source/edit.cxx
starmath/source/smmod.cxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/simptabl.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/valueimp.hxx
svx/inc/GalleryControl.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/dialog/swframeexample.cxx
svx/source/fmcomp/fmgridif.cxx
svx/source/gallery2/GalleryControl.cxx
svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/area/AreaPropertyPanel.hxx
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/line/LinePropertyPanel.hxx
svx/source/sidebar/line/LineWidthControl.cxx
svx/source/sidebar/line/LineWidthControl.hxx
svx/source/sidebar/line/LineWidthValueSet.hxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
svx/source/sidebar/possize/SidebarDialControl.cxx
svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/tools/PopupContainer.cxx
svx/source/sidebar/tools/PopupControl.cxx
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
svx/source/svdraw/svdfmtf.hxx
svx/source/svdraw/svdibrow.cxx
svx/source/tbxctrls/colrctrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
sw/source/ui/dbui/mmaddressblockpage.cxx
sw/source/ui/dialog/uiregionsw.cxx
sw/source/ui/index/cnttab.cxx
sw/source/uibase/inc/drpcps.hxx
sw/source/uibase/sidebar/PageColumnControl.hxx
sw/source/uibase/sidebar/PageMarginControl.hxx
sw/source/uibase/sidebar/PageOrientationControl.hxx
sw/source/uibase/sidebar/PagePropertyPanel.hxx
sw/source/uibase/sidebar/PageSizeControl.hxx
sw/source/uibase/uiview/view2.cxx
sw/source/uibase/utlui/navipi.cxx
vcl/inc/svdata.hxx
vcl/source/control/combobox.cxx
vcl/source/control/lstbox.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/winproc.cxx

Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95

15 files changed, 111 insertions, 48 deletions

diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 1cf24b87a2ac..bb9e12a31d8d 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -64,7 +64,19 @@ namespace abp
 
     FinalPage::~FinalPage()
     {
+        disposeOnce();
+    }
+
+    void FinalPage::dispose()
+    {
         delete m_pLocationController;
+        m_pLocation.clear();
+        m_pBrowse.clear();
+        m_pRegisterName.clear();
+        m_pNameLabel.clear();
+        m_pName.clear();
+        m_pDuplicateNameError.clear();
+        AddressBookSourcePage::dispose();
     }
 
     bool FinalPage::isValidName() const
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 821f39f62525..eedeac43b25d 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -26,6 +26,7 @@
 #include <svtools/urlcontrol.hxx>
 #include <svx/databaselocationinput.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/vclptr.hxx>
 
 
 namespace abp
@@ -38,12 +39,12 @@ namespace abp
     class FinalPage : public AddressBookSourcePage
     {
     protected:
-        ::svt::OFileURLControl*  m_pLocation;
-        PushButton*     m_pBrowse;
-        CheckBox*       m_pRegisterName;
-        FixedText*      m_pNameLabel;
-        Edit*           m_pName;
-        FixedText*      m_pDuplicateNameError;
+        VclPtr<::svt::OFileURLControl>  m_pLocation;
+        VclPtr<PushButton>       m_pBrowse;
+        VclPtr<CheckBox>         m_pRegisterName;
+        VclPtr<FixedText>        m_pNameLabel;
+        VclPtr<Edit>             m_pName;
+        VclPtr<FixedText>        m_pDuplicateNameError;
 
         ::svx::DatabaseLocationInputController*
                         m_pLocationController;
@@ -53,6 +54,7 @@ namespace abp
     public:
         FinalPage( OAddessBookSourcePilot* _pParent );
         virtual ~FinalPage();
+        virtual void dispose() SAL_OVERRIDE;
 
     protected:
         // OWizardPage overridables
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 45abc6bf7036..f06fa97156f9 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -130,11 +130,6 @@ namespace abp
         SetHelpId(HID_ABSPILOT);
     }
 
-    OAddessBookSourcePilot::~OAddessBookSourcePilot()
-    {
-    }
-
-
     OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
     {
         sal_uInt16 nResId = 0;
@@ -413,24 +408,24 @@ namespace abp
     }
 
 
-    OWizardPage* OAddessBookSourcePilot::createPage(WizardState _nState)
+    VclPtr<TabPage> OAddessBookSourcePilot::createPage(WizardState _nState)
     {
         switch (_nState)
         {
             case STATE_SELECT_ABTYPE:
-                return new TypeSelectionPage( this );
+                return VclPtr<TypeSelectionPage>::Create( this );
 
             case STATE_INVOKE_ADMIN_DIALOG:
-                return new AdminDialogInvokationPage( this );
+                return VclPtr<AdminDialogInvokationPage>::Create( this );
 
             case STATE_TABLE_SELECTION:
-                return new TableSelectionPage( this );
+                return VclPtr<TableSelectionPage>::Create( this );
 
             case STATE_MANUAL_FIELD_MAPPING:
-                return new FieldMappingPage( this );
+                return VclPtr<FieldMappingPage>::Create( this );
 
             case STATE_FINAL_CONFIRM:
-                return new FinalPage( this );
+                return VclPtr<FinalPage>::Create( this );
 
             default:
                 OSL_FAIL("OAddessBookSourcePilot::createPage: invalid state!");
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index de7a5895b627..5b24ff244e45 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -49,8 +49,6 @@ namespace abp
         OAddessBookSourcePilot(
             vcl::Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
-        /// dtor
-        virtual ~OAddessBookSourcePilot();
 
         /// get the service factory which was used to create the dialog
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
@@ -69,7 +67,7 @@ namespace abp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE;
+        virtual VclPtr<TabPage>     createPage( WizardState _nState ) SAL_OVERRIDE;
         virtual void                enterState( WizardState _nState ) SAL_OVERRIDE;
         virtual bool                prepareLeaveCurrentState( CommitPageReason _eReason ) SAL_OVERRIDE;
         virtual bool                onFinish() SAL_OVERRIDE;
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index 486223ca30c0..9dc5d3b0cb8a 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
 
@@ -36,7 +37,7 @@ namespace abp
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
                         m_xContext;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource;
-        vcl::Window*         m_pMessageParent;
+        VclPtr<vcl::Window>         m_pMessageParent;
 
     public:
         OAdminDialogInvokation(
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index a92e90d7eb1e..57bb822c076f 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -34,7 +34,16 @@ namespace abp
         get(m_pErrorMessage, "warning");
         m_pInvokeAdminDialog->SetClickHdl( LINK(this, AdminDialogInvokationPage, OnInvokeAdminDialog) );
     }
-
+    AdminDialogInvokationPage::~AdminDialogInvokationPage()
+    {
+        disposeOnce();
+    }
+    void AdminDialogInvokationPage::dispose()
+    {
+        m_pInvokeAdminDialog.clear();
+        m_pErrorMessage.clear();
+        AddressBookSourcePage::dispose();
+    }
     void AdminDialogInvokationPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 4b264274f290..7e2e7efce8c2 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -29,14 +29,15 @@ namespace abp
     class AdminDialogInvokationPage : public AddressBookSourcePage
     {
     protected:
-        PushButton* m_pInvokeAdminDialog;
-        FixedText*  m_pErrorMessage;
+        VclPtr<PushButton> m_pInvokeAdminDialog;
+        VclPtr<FixedText>  m_pErrorMessage;
 
         bool        m_bSuccessfullyExecutedDialog;
 
     public:
         AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent );
-
+        virtual ~AdminDialogInvokationPage();
+        virtual void dispose() SAL_OVERRIDE;
     protected:
         // TabDialog overridables
         virtual void        ActivatePage() SAL_OVERRIDE;
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index c30bf82265c6..9ad8a3b0f11d 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -37,6 +37,18 @@ namespace abp
         m_pInvokeDialog->SetClickHdl( LINK( this, FieldMappingPage, OnInvokeDialog ) );
     }
 
+    FieldMappingPage::~FieldMappingPage()
+    {
+        disposeOnce();
+    }
+
+    void FieldMappingPage::dispose()
+    {
+        m_pInvokeDialog.clear();
+        m_pHint.clear();
+        AddressBookSourcePage::dispose();
+    }
+
     void FieldMappingPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 35ce8a2fcc3b..6adaf511800a 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGPAGE_HXX
 
 #include "abspage.hxx"
+#include <vcl/vclptr.hxx>
 
 
 namespace abp
@@ -33,12 +34,13 @@ namespace abp
     class FieldMappingPage : public AddressBookSourcePage
     {
     protected:
-        PushButton*     m_pInvokeDialog;
-        FixedText*      m_pHint;
+        VclPtr<PushButton>     m_pInvokeDialog;
+        VclPtr<FixedText>      m_pHint;
 
     public:
         FieldMappingPage( OAddessBookSourcePilot* _pParent );
-
+        virtual ~FieldMappingPage();
+        virtual void dispose() SAL_OVERRIDE;
     protected:
         // OWizardPage overridables
         virtual void        initializePage() SAL_OVERRIDE;
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index 61ac27d8f1ce..537ef7b2b73e 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -41,6 +41,16 @@ namespace abp
         m_pTableList->SetDoubleClickHdl( LINK( this, TableSelectionPage, OnTableDoubleClicked ) );
     }
 
+    TableSelectionPage::~TableSelectionPage()
+    {
+        disposeOnce();
+    }
+
+    void TableSelectionPage::dispose()
+    {
+        m_pTableList.clear();
+        AddressBookSourcePage::dispose();
+    }
 
     void TableSelectionPage::ActivatePage()
     {
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index c9fcd755920d..7abcf547af45 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -22,6 +22,7 @@
 
 #include "abspage.hxx"
 #include <vcl/lstbox.hxx>
+#include <vcl/vclptr.hxx>
 
 
 namespace abp
@@ -34,11 +35,12 @@ namespace abp
     class TableSelectionPage : public AddressBookSourcePage
     {
     protected:
-        ListBox*        m_pTableList;
+        VclPtr<ListBox>        m_pTableList;
 
     public:
         TableSelectionPage( OAddessBookSourcePilot* _pParent );
-
+        virtual ~TableSelectionPage();
+        virtual void dispose() SAL_OVERRIDE;
     protected:
         // OWizardPage overridables
         virtual void        initializePage() SAL_OVERRIDE;
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 79361869e8b7..f732eff901b4 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -151,11 +151,28 @@ namespace abp
 
     TypeSelectionPage::~TypeSelectionPage()
     {
+        disposeOnce();
+    }
+
+    void TypeSelectionPage::dispose()
+    {
         for ( ::std::vector< ButtonItem >::iterator loop = m_aAllTypes.begin();
               loop != m_aAllTypes.end(); ++loop )
         {
             loop->m_bVisible = false;
         }
+        m_pEvolution.clear();
+        m_pEvolutionGroupwise.clear();
+        m_pEvolutionLdap.clear();
+        m_pMORK.clear();
+        m_pThunderbird.clear();
+        m_pKab.clear();
+        m_pMacab.clear();
+        m_pLDAP.clear();
+        m_pOutlook.clear();
+        m_pOE.clear();
+        m_pOther.clear();
+        AddressBookSourcePage::dispose();
     }
 
 
@@ -226,8 +243,8 @@ namespace abp
 
         if (AST_INVALID == getSelectedType( ))
         {
-            MessageDialog aError(this, ModuleRes(RID_STR_NEEDTYPESELECTION));
-            aError.Execute();
+            ScopedVclPtrInstance< MessageDialog > aError(this, ModuleRes(RID_STR_NEEDTYPESELECTION));
+            aError->Execute();
             return false;
         }
 
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 2e4437e285f8..b7c628f884c1 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -23,6 +23,7 @@
 #include "abspage.hxx"
 #include "addresssettings.hxx"
 #include <vcl/edit.hxx>
+#include <vcl/vclptr.hxx>
 
 
 namespace abp
@@ -35,20 +36,20 @@ namespace abp
     class TypeSelectionPage : public AddressBookSourcePage
     {
     protected:
-        RadioButton* m_pEvolution;
-        RadioButton* m_pEvolutionGroupwise;
-        RadioButton* m_pEvolutionLdap;
-        RadioButton* m_pMORK;
-        RadioButton* m_pThunderbird;
-        RadioButton* m_pKab;
-        RadioButton* m_pMacab;
-        RadioButton* m_pLDAP;
-        RadioButton* m_pOutlook;
-        RadioButton* m_pOE;
-        RadioButton* m_pOther;
+        VclPtr<RadioButton> m_pEvolution;
+        VclPtr<RadioButton> m_pEvolutionGroupwise;
+        VclPtr<RadioButton> m_pEvolutionLdap;
+        VclPtr<RadioButton> m_pMORK;
+        VclPtr<RadioButton> m_pThunderbird;
+        VclPtr<RadioButton> m_pKab;
+        VclPtr<RadioButton> m_pMacab;
+        VclPtr<RadioButton> m_pLDAP;
+        VclPtr<RadioButton> m_pOutlook;
+        VclPtr<RadioButton> m_pOE;
+        VclPtr<RadioButton> m_pOther;
 
         struct ButtonItem {
-            RadioButton *m_pItem;
+            VclPtr<RadioButton> m_pItem;
             AddressSourceType m_eType;
             bool         m_bVisible;
 
@@ -66,6 +67,7 @@ namespace abp
     public:
         TypeSelectionPage( OAddessBookSourcePilot* _pParent );
         virtual ~TypeSelectionPage();
+        virtual void        dispose() SAL_OVERRIDE;
 
         // retrieves the currently selected type
         AddressSourceType   getSelectedType() const;
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index f8afef08c385..fdf27d8a7609 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -152,9 +152,9 @@ namespace abp
     }
 
 
-    Dialog* OABSPilotUno::createDialog(vcl::Window* _pParent)
+    VclPtr<Dialog> OABSPilotUno::createDialog(vcl::Window* _pParent)
     {
-        return new OAddessBookSourcePilot(_pParent, m_aContext );
+        return VclPtr<OAddessBookSourcePilot>::Create(_pParent, m_aContext );
     }
 
 
@@ -179,7 +179,7 @@ namespace abp
     {
         if ( _nExecutionResult == RET_OK )
         {
-            const AddressSettings& aSettings = static_cast<OAddessBookSourcePilot*>(m_pDialog)->getSettings();
+            const AddressSettings& aSettings = static_cast<OAddessBookSourcePilot*>(m_pDialog.get())->getSettings();
             m_sDataSourceName = aSettings.bRegisterDataSource ? aSettings.sRegisteredDataSourceName : aSettings.sDataSourceName;
         }
     }
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index b444095823a5..efd84acdfb11 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -84,7 +84,7 @@ namespace abp
         using OABSPilotUno_DBase::execute;
     protected:
     // OGenericUnoDialog overridables
-        virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE;
         virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE;
     };