[Libreoffice-commits] core.git: svtools/source

[Ariel Constenla-Haile]

 svtools/source/uno/wizard/unowizard.cxx   |    2 +-
 svtools/source/uno/wizard/wizardshell.cxx |    7 ++-----
 svtools/source/uno/wizard/wizardshell.hxx |    6 ------
 3 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 78d015849cda869e1ed5411a9cc1db912eab2f57
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Thu Apr 10 15:33:21 2014 +0000

    Resolves: #i124629# UNO Wizard - avoid crash by removing unneeded reference
    
    (cherry picked from commit 6a820f13a5cadc3d6d8c7bac1e4042adcee379ac)
    
    Conflicts:
    	svtools/source/uno/wizard/wizardshell.cxx
    
    Change-Id: I2d67451c6fb536149603777a84d9b73494b6ed84

diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index e337261..3e3e851 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -270,7 +270,7 @@ namespace {
 
     Dialog* Wizard::createDialog( Window* i_pParent )
     {
-        WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
+        WizardShell* pDialog( new WizardShell( i_pParent, m_xController, m_aWizardSteps ) );
         pDialog->SetHelpId(  lcl_getHelpId( m_sHelpURL ) );
         pDialog->setTitleBase( m_sTitle );
         return pDialog;
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index e25f27f..35b00e6 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -62,16 +62,13 @@ namespace svt { namespace uno
 
 
     //= WizardShell
-
-
-    WizardShell::WizardShell( Window* i_pParent, const Reference< XWizard >& i_rWizard, const Reference< XWizardController >& i_rController,
+    WizardShell::WizardShell( Window* i_pParent, const Reference< XWizardController >& i_rController,
             const Sequence< Sequence< sal_Int16 > >& i_rPaths )
         :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
-        ,m_xWizard( i_rWizard )
         ,m_xController( i_rController )
         ,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) )
     {
-        ENSURE_OR_THROW( m_xWizard.is() && m_xController.is(), "invalid wizard/controller" );
+        ENSURE_OR_THROW( m_xController.is(), "invalid controller" );
 
         // declare the paths
         for ( sal_Int32 i=0; i<i_rPaths.getLength(); ++i )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index b882cdf..07a33ae 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -45,7 +45,6 @@ namespace svt { namespace uno
     public:
         WizardShell(
             Window* _pParent,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >& i_rWizard,
             const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths
         );
@@ -64,10 +63,6 @@ namespace svt { namespace uno
         virtual IWizardPageController*
                             getPageController( TabPage* _pCurrentPage ) const SAL_OVERRIDE;
 
-        // attribute access
-        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >&
-            getWizard() const { return m_xWizard; }
-
         static sal_Int16 convertCommitReasonToTravelType( const CommitPageReason i_eReason );
 
         // operations
@@ -125,7 +120,6 @@ namespace svt { namespace uno
     private:
         typedef ::std::map< TabPage*, PWizardPageController > Page2ControllerMap;
 
-        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >            m_xWizard;
         const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >  m_xController;
         const sal_Int16                                                                             m_nFirstPageID;
         Page2ControllerMap                                                                          m_aPageControllers;