User: vg      
Date: 05/03/10 08:55:19

Modified:
 /dba/dbaccess/source/ui/uno/
  composerdialogs.cxx

Log:
 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

File Changes:

Directory: /dba/dbaccess/source/ui/uno/
=======================================

File [changed]: composerdialogs.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/composerdialogs.cxx?r1=1.2&r2=1.3
Delta lines:  +9 -6
-------------------
--- composerdialogs.cxx 5 Jan 2005 12:37:55 -0000       1.2
+++ composerdialogs.cxx 10 Mar 2005 16:55:16 -0000      1.3
@@ -145,9 +145,12 @@
                try
                {
                        // the connection the row set is working with
+            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() )




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to