[Libreoffice-commits] .: 2 commits - extensions/source

[Caolán McNamara]

 extensions/source/abpilot/abspilot.cxx     |    5 +++++
 extensions/source/abpilot/abspilot.hxx     |    2 ++
 extensions/source/abpilot/unodialogabp.hxx |    4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit c8f15a768dd4d71acfb65c3af4995e2a991b8087
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 23 17:19:17 2012 +0000

    call FreeResource like the other RoadmapWizard users

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 9f08d05..0024596 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -135,6 +135,11 @@ namespace abp
         typeSelectionChanged( m_aSettings.eType );
     }
 
+    OAddessBookSourcePilot::~OAddessBookSourcePilot()
+    {
+        FreeResource();
+    }
+
     //---------------------------------------------------------------------
     String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
     {
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index a813670..9c751c5 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -59,6 +59,8 @@ namespace abp
         OAddessBookSourcePilot(
             Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
+        /// dtor
+        ~OAddessBookSourcePilot();
 
         /// get the service factory which was used to create the dialog
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
commit 17d933c97d9b80830b2152906ab0f82b9b21ba1c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 23 17:17:45 2012 +0000

    ctor OModuleResourceClient first so OModuleResourceClient dtor is last
    
    which means that we don't crash in --enable-dbgutil on cancel
    of the addressbook dialog

diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index aa320b0..3674d95 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -49,10 +49,10 @@ namespace abp
     typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno > OABSPilotUno_PBase;
     /// the UNO wrapper for the address book source pilot
     class OABSPilotUno
-            :public OABSPilotUno_DBase
+            :public OModuleResourceClient
+            ,public OABSPilotUno_DBase
             ,public OABSPilotUno_JBase
             ,public OABSPilotUno_PBase
-            ,public OModuleResourceClient
     {
         ::rtl::OUString m_sDataSourceName;
         OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);