You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2014/04/10 17:33:21 UTC
svn commit: r1586340 - in /openoffice/trunk/main/svtools/source/uno/wizard:
unowizard.cxx wizardshell.cxx wizardshell.hxx
Author: arielch
Date: Thu Apr 10 15:33:21 2014
New Revision: 1586340
URL: http://svn.apache.org/r1586340
Log:
i124629 - UNO Wizard - avoid crash by removing unneeded reference
Modified:
openoffice/trunk/main/svtools/source/uno/wizard/unowizard.cxx
openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.cxx
openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.hxx
Modified: openoffice/trunk/main/svtools/source/uno/wizard/unowizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/uno/wizard/unowizard.cxx?rev=1586340&r1=1586339&r2=1586340&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/uno/wizard/unowizard.cxx (original)
+++ openoffice/trunk/main/svtools/source/uno/wizard/unowizard.cxx Thu Apr 10 15:33:21 2014
@@ -228,7 +228,7 @@ namespace svt { namespace uno
//--------------------------------------------------------------------
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;
Modified: openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.cxx?rev=1586340&r1=1586339&r2=1586340&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.cxx (original)
+++ openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.cxx Thu Apr 10 15:33:21 2014
@@ -72,14 +72,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 )
Modified: openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.hxx?rev=1586340&r1=1586339&r2=1586340&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.hxx (original)
+++ openoffice/trunk/main/svtools/source/uno/wizard/wizardshell.hxx Thu Apr 10 15:33:21 2014
@@ -51,7 +51,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
);
@@ -70,10 +69,6 @@ namespace svt { namespace uno
virtual IWizardPageController*
getPageController( TabPage* _pCurrentPage ) const;
- // 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
@@ -131,7 +126,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;