diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:50:08 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:50:08 +0000 |
| commit | 708ccf3d7a24fc511a6d914e9d7f70cea5528b26 (patch) | |
| tree | a274220185e86bbf817abdb684b4c6535f7943bc /extensions | |
| parent | 0a0eb02a34545d7fb66f3e5719c2b671ccdc9eb2 (diff) | |
INTEGRATION: CWS dba201b (1.6.470); FILE MERGED
2005/09/21 06:44:45 oj 1.6.470.2: RESYNC: (1.6-1.7); FILE MERGED
2005/07/11 13:37:25 fs 1.6.470.1: merging CWS dba201 into dba201b
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/abpilot/unodialogabp.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 2f1e636ade35..8c2030998aea 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unodialogabp.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:10:42 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:50:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,12 +45,16 @@ #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> #endif +#ifndef _SV_MSGBOX_HXX +#include <vcl/msgbox.hxx> +#endif extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno() { static ::abp::OMultiInstanceAutoRegistration< ::abp::OABSPilotUno > aAutoRegistration; } +#define PROPERTY_ID_DATASOURCENAME 3 //......................................................................... namespace abp { @@ -68,6 +72,8 @@ namespace abp OABSPilotUno::OABSPilotUno(const Reference< XMultiServiceFactory >& _rxORB) :OGenericUnoDialog(_rxORB) { + registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , + &m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) ); } //-------------------------------------------------------------------------- @@ -190,6 +196,15 @@ namespace abp lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } + // ----------------------------------------------------------------------------- + void OABSPilotUno::executedDialog(sal_Int16 _nExecutionResult) + { + if ( _nExecutionResult == RET_OK ) + { + const AddressSettings& aSettings = static_cast<OAddessBookSourcePilot*>(m_pDialog)->getSettings(); + m_sDataSourceName = aSettings.bRegisterDataSource ? aSettings.sRegisteredDataSourceName : aSettings.sDataSourceName; + } + } //......................................................................... } // namespace abp |