diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 13:45:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 13:45:44 +0000 |
| commit | 048866055eb7c7f3de8338eac301b1614f59a515 (patch) | |
| tree | 4dcce6d846973b3fddd992103ed6af5e3b8fc7c1 /svx/source/form/fmshimp.cxx | |
| parent | dcfea2057c10ba9c0b97c8266267e5d09b9a145a (diff) | |
INTEGRATION: CWS docking4 (1.57.10); FILE MERGED
2004/11/02 15:02:40 ssa 1.57.10.2: RESYNC: (1.57-1.58); FILE MERGED
2004/09/30 10:42:06 fs 1.57.10.1: removed unneeded parameter from CreateFmSearchDialog, which caused trouble during #i33338#
Diffstat (limited to 'svx/source/form/fmshimp.cxx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2c97ef97eb14..7b78283a2999 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmshimp.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: obo $ $Date: 2004-11-16 11:24:36 $ + * last change: $Author: obo $ $Date: 2004-11-16 14:45:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1540,15 +1540,19 @@ void FmXFormShell::ExecuteSearch() // ausgeraeumt sind, sollte hier ein SM_USETHREAD rein, denn die Suche in einem eigenen Thread ist doch etwas fluessiger // sollte allerdings irgendwie von dem unterliegenden Cursor abhaengig gemacht werden, DAO zum Beispiel ist nicht thread-sicher SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 - AbstractFmSearchDialog* dlg = pFact->CreateFmSearchDialog(&m_pShell->GetViewShell()->GetViewFrame()->GetWindow(), strInitialText, strRealContexts, nInitialContext, LINK(this, FmXFormShell, OnSearchContextRequest),ResId(RID_SVXDLG_SEARCHFORM),SM_ALLOWSCHEDULE); - DBG_ASSERT(dlg, "Dialogdiet fail!");//CHINA001 - dlg->SetActiveField(strActiveField);//CHINA001 dlg.SetActiveField(strActiveField); - - dlg->SetFoundHandler(LINK(this, FmXFormShell, OnFoundData));//CHINA001 dlg.SetFoundHandler(LINK(this, FmXFormShell, OnFoundData)); - dlg->SetCanceledNotFoundHdl(LINK(this, FmXFormShell, OnCanceledNotFound));//CHINA001 dlg.SetCanceledNotFoundHdl(LINK(this, FmXFormShell, OnCanceledNotFound)); - dlg->Execute();//CHINA001 dlg.Execute(); - delete dlg; //add CHINA001 + AbstractFmSearchDialog* pDialog = NULL; + if ( pFact ) + pDialog = pFact->CreateFmSearchDialog( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow(), strInitialText, strRealContexts, nInitialContext, LINK( this, FmXFormShell, OnSearchContextRequest ), SM_ALLOWSCHEDULE ); + DBG_ASSERT( pDialog, "FmXFormShell::ExecuteSearch: could not create the search dialog!" ); + if ( pDialog ) + { + pDialog->SetActiveField( strActiveField ); + pDialog->SetFoundHandler( LINK( this, FmXFormShell, OnFoundData ) ); + pDialog->SetCanceledNotFoundHdl( LINK( this, FmXFormShell, OnCanceledNotFound ) ); + pDialog->Execute(); + delete pDialog; + } + // GridControls wieder restaurieren LoopGrids(GA_ENABLE_SYNC | GA_DISABLE_ROCTRLR); |