diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:42:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:42:15 +0000 |
| commit | 3a5161c37b42e071a09e00b8742f3e6335711f65 (patch) | |
| tree | eaf4875b4001f8a4584424b346439e04dfefc894 /extensions/source/dbpilots/commonpagesdbp.cxx | |
| parent | 60fca5d89aa6e545b01185dc3a8fb375ee3efda0 (diff) | |
INTEGRATION: CWS dba20 (1.9.20); FILE MERGED
2004/12/03 09:50:08 oj 1.9.20.2: #i37019# take care for embedded forms
2004/12/03 09:09:38 oj 1.9.20.1: #i37954# show UIName for filter
Diffstat (limited to 'extensions/source/dbpilots/commonpagesdbp.cxx')
| -rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index d1f88f0f26b1..7500a7ded261 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: commonpagesdbp.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: pjunck $ $Date: 2004-10-22 12:25:31 $ + * last change: $Author: obo $ $Date: 2005-01-05 12:42:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -242,17 +242,22 @@ namespace dbp const OControlWizardContext& rContext = getContext(); try { - Reference< XConnection > xOldConn = getFormConnection(); + Reference< XConnection > xOldConn; + if ( !rContext.bEmbedded ) + { + xOldConn = getFormConnection(); - ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); + ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); + rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("DataSourceName"), makeAny( sDataSource ) ); + } ::rtl::OUString sCommand = m_aTable.GetSelectEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_Int32 >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("DataSourceName"), makeAny( sDataSource ) ); rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("Command"), makeAny( sCommand ) ); rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("CommandType"), makeAny( nCommandType ) ); - setFormConnection( xOldConn, sal_False ); + if ( !rContext.bEmbedded ) + setFormConnection( xOldConn, sal_False ); if (!updateContext()) return sal_False; @@ -276,7 +281,7 @@ namespace dbp OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); if ( pFilter ) { - aFileDlg.AddFilter(pFilter->GetFilterName(),pFilter->GetDefaultExtension()); + aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); } if (0 == aFileDlg.Execute()) |