diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-10-29 11:35:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-10-29 11:35:03 +0000 |
| commit | 282a7d79302657cd7046620115f966ef620d5b17 (patch) | |
| tree | 3d6f6c453196ed5c30d7684420ac1c032df8f308 /sw/source/ui/uno | |
| parent | c91e5d874c96cfc6e1955339476fa520ffe39296 (diff) | |
CWS-TOOLING: integrate CWS os120
Diffstat (limited to 'sw/source/ui/uno')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 2a3cac763af8..09ced94e2bb3 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unomailmerge.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.26.206.1 $ * * This file is part of OpenOffice.org. * @@ -674,6 +674,8 @@ uno::Any SAL_CALL SwXMailMerge::execute( Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY ); if (xRowSet.is()) xRowSet->execute(); // build ResultSet from properties + if( !xCurConnection.is() ) + xCurConnection.set( xRowSetPropSet->getPropertyValue( C2U( "ActiveConnection" )), UNO_QUERY ); xCurResultSet = Reference< sdbc::XResultSet >( xRowSet, UNO_QUERY ); DBG_ASSERT( xCurResultSet.is(), "failed to build ResultSet" ); } |