INTEGRATION: CWS asyncdialogs (1.2.34); FILE MERGED
2006/09/20 10:50:05 pb 1.2.34.4: RESYNC: (1.4-1.5); FILE MERGED 2006/07/12 14:13:32 pb 1.2.34.3: RESYNC: (1.3-1.4); FILE MERGED 2005/12/01 12:59:05 kso 1.2.34.2: RESYNC: (1.2-1.3); FILE MERGED 2005/11/01 14:24:43 kso 1.2.34.1: #i57125# - dialog adaptions for Threading Framework.
This commit is contained in:
parent
2df53f6482
commit
7487227f63
1 changed files with 13 additions and 8 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: commonpicker.cxx,v $
|
||||
*
|
||||
* $Revision: 1.5 $
|
||||
* $Revision: 1.6 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2006-09-16 17:50:25 $
|
||||
* last change: $Author: vg $ $Date: 2006-11-22 10:14:59 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -135,6 +135,16 @@ namespace svt
|
|||
throw DisposedException();
|
||||
}
|
||||
|
||||
void OCommonPicker::prepareDialog()
|
||||
{
|
||||
if ( !getDialog() )
|
||||
createPicker();
|
||||
|
||||
// set the title
|
||||
if ( m_aTitle.getLength() > 0 )
|
||||
getDialog()->SetText( m_aTitle );
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
void SAL_CALL OCommonPicker::disposing()
|
||||
{
|
||||
|
@ -377,12 +387,7 @@ namespace svt
|
|||
{
|
||||
::vos::OGuard aGuard( Application::GetSolarMutex() );
|
||||
|
||||
if ( !getDialog() )
|
||||
createPicker();
|
||||
|
||||
// set the title
|
||||
if ( m_aTitle.getLength() > 0 )
|
||||
getDialog()->SetText( m_aTitle );
|
||||
prepareDialog();
|
||||
|
||||
{
|
||||
::osl::MutexGuard aOwnGuard( m_aMutex );
|
||||
|
|
Loading…
Reference in a new issue