diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:28:00 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:28:00 +0000 |
| commit | dc8f0897a42d897a2e46a151d3e9d3564e909c0b (patch) | |
| tree | 8f6e5555c1a02f7868c233cacaefade080ba1ee1 /svtools/source/uno | |
| parent | 3bfddc384f9115376c1c8d188a6ab537e7a4dfde (diff) | |
INTEGRATION: CWS formdesign01 (1.4.238); FILE MERGED
2003/11/27 09:53:29 fs 1.4.238.1: during #22878#: also allow NamedValues for initialization
Diffstat (limited to 'svtools/source/uno')
| -rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index fecd37b713fc..0dad857dba70 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -2,9 +2,9 @@ * * $RCSfile: genericunodialog.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-27 14:39:46 $ + * last change: $Author: obo $ $Date: 2004-03-19 12:28:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,10 @@ #include <vcl/msgbox.hxx> #endif +#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_ +#include <com/sun/star/beans/NamedValue.hpp> +#endif + // --- needed because of the solar mutex #ifndef _VOS_MUTEX_HXX_ #include <vos/mutex.hxx> @@ -337,15 +341,20 @@ void SAL_CALL OGenericUnoDialog::endExecute( ) throw(RuntimeException) void OGenericUnoDialog::implInitialize(const Any& _rValue) { ::osl::MutexGuard aGuard(m_aMutex); - PropertyValue aProperty; - if (_rValue >>= aProperty) + try { - try + PropertyValue aProperty; + NamedValue aValue; + if ( _rValue >>= aProperty ) + { + setPropertyValue( aProperty.Name, aProperty.Value ); + } + else if ( _rValue >>= aValue ) { - setPropertyValue(aProperty.Name, aProperty.Value); + setPropertyValue( aValue.Name, aValue.Value ); } - catch(Exception&) { } } + catch(Exception&) { } } //------------------------------------------------------------------------- |