Skip to content

C
core
Kaydet (Commit) 82fa1361 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

No need for additional pDlg variable 

Change-Id: I161b49ee5c72c13372ca95ce9f9cc87d886354ae
üst 052f2542
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
sw/source/uibase/fldui/fldwrap.cxx
Dosyayı görüntüle @ 82fa1361
...@@ -81,11 +81,10 @@ SwFieldDlgWrapper::SwFieldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, ...@@ -81,11 +81,10 @@ SwFieldDlgWrapper::SwFieldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId,
{ {
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!"); assert(pFact && "SwAbstractDialogFactory fail!");
VclPtr<AbstractSwFieldDlg> pDlg = pFact->CreateSwFieldDlg(pB, this, _pParent); pDlgInterface = pFact->CreateSwFieldDlg(pB, this, _pParent);
assert(pDlg && "Dialog creation failed!"); assert(pDlgInterface && "Dialog creation failed!");
pDlgInterface = pDlg; SetWindow( pDlgInterface->GetWindow() );
SetWindow( pDlg->GetWindow() ); pDlgInterface->Start();
pDlg->Start();
} }
// newly initialise dialog after Doc switch // newly initialise dialog after Doc switch
...@@ -124,14 +123,13 @@ SwFieldDataOnlyDlgWrapper::SwFieldDataOnlyDlgWrapper( vcl::Window* _pParent, sal ...@@ -124,14 +123,13 @@ SwFieldDataOnlyDlgWrapper::SwFieldDataOnlyDlgWrapper( vcl::Window* _pParent, sal
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
VclPtr<AbstractSwFieldDlg> pDlg = pFact->CreateSwFieldDlg(pB, this, _pParent); pDlgInterface = pFact->CreateSwFieldDlg(pB, this, _pParent);
OSL_ENSURE(pDlg, "Dialog creation failed!"); OSL_ENSURE(pDlgInterface, "Dialog creation failed!");
pDlgInterface = pDlg;
SetWindow( pDlg->GetWindow() ); SetWindow( pDlgInterface->GetWindow() );
pDlg->ActivateDatabasePage(); pDlgInterface->ActivateDatabasePage();
pDlg->Start(); pDlgInterface->Start();
pDlg->Initialize( pInfo ); pDlgInterface->Initialize( pInfo );
} }
// re-init after doc activation // re-init after doc activation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment