diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 15:55:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 15:55:16 +0000 |
| commit | 427334391f661ab49e7856b56a3120332bd1a82c (patch) | |
| tree | 102cb18e444b60acc5563594965c3031a9d3c247 /dbaccess/source/ui/uno/composerdialogs.cxx | |
| parent | c0cb9228b7f87e8ea2bf73a73cb4fd2968e67116 (diff) | |
INTEGRATION: CWS dba24 (1.2.20); FILE MERGED
2005/02/10 12:54:34 fs 1.2.20.1: #i42407# care for forms embedded in DB documents
Diffstat (limited to 'dbaccess/source/ui/uno/composerdialogs.cxx')
| -rw-r--r-- | dbaccess/source/ui/uno/composerdialogs.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 0be315fc40c9..816fa1adf35d 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: composerdialogs.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2005-01-05 12:37:55 $ + * last change: $Author: vg $ $Date: 2005-03-10 16:55:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,9 +145,12 @@ namespace dbaui try { // the connection the row set is working with - Reference< XPropertySet > xRowsetProps( m_xRowSet, UNO_QUERY ); - if ( xRowsetProps.is() ) - xRowsetProps->getPropertyValue( PROPERTY_ACTIVECONNECTION ) >>= xConnection; + if ( !::dbtools::isEmbeddedInDatabase( m_xRowSet, xConnection ) ) + { + Reference< XPropertySet > xRowsetProps( m_xRowSet, UNO_QUERY ); + if ( xRowsetProps.is() ) + xRowsetProps->getPropertyValue( PROPERTY_ACTIVECONNECTION ) >>= xConnection; + } // fallback: if there is a connection and thus a row set, but no composer, create one if ( xConnection.is() && !m_xComposer.is() ) |