diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:23:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:23:46 +0000 |
| commit | 131907eb5288944ecad9ab21a22c9d420f9676b9 (patch) | |
| tree | ce4ed6f8268c2997665a07b1ad73c90d2110a518 /svx/source/form/fmpgeimp.cxx | |
| parent | 4e601890a14baa307948bc9250692a93c18d944f (diff) | |
INTEGRATION: CWS dba30d (1.35.28); FILE MERGED
2008/05/28 13:55:54 fs 1.35.28.1: #ii89229
Diffstat (limited to 'svx/source/form/fmpgeimp.cxx')
| -rw-r--r-- | svx/source/form/fmpgeimp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 1d470c003217..53a953cc0129 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmpgeimp.cxx,v $ - * $Revision: 1.35 $ + * $Revision: 1.36 $ * * This file is part of OpenOffice.org. * @@ -407,9 +407,10 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( xDSProps->getPropertyValue(FM_PROP_NAME) >>= sLookupName; xFormProps->getPropertyValue(FM_PROP_DATASOURCE) >>= sFormDataSourceName; + // if there's no DataSourceName set at the form, check whether we can deduce one from its + // ActiveConnection if (0 == sFormDataSourceName.getLength()) { - // check if it has an active connection Reference< XConnection > xFormConnection; xFormProps->getPropertyValue( FM_PROP_ACTIVE_CONNECTION ) >>= xFormConnection; if ( !xFormConnection.is() ) @@ -420,7 +421,6 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( if (xConnAsChild.is()) { Reference< XDataSource > xFormDS(xConnAsChild->getParent(), UNO_QUERY); - // the data source which created the connection if (xFormDS.is()) { xDSProps = xDSProps.query(xFormDS); |