User: obo     
Date: 06/01/19 07:45:48

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

Log:
 INTEGRATION: CWS dba202e (1.5.56); FILE MERGED
 2005/12/08 14:10:57 fs 1.5.56.1: #121295# RowsetOrderDialog::executedDialog: 
recognize a NULL dialog

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.5&r2=1.6
Delta lines:  +5 -4
-------------------
--- composerdialogs.cxx 23 Sep 2005 12:47:12 -0000      1.5
+++ composerdialogs.cxx 19 Jan 2006 15:45:45 -0000      1.6
@@ -213,12 +213,13 @@
     {
                ComposerDialog::executedDialog( _nExecutionResult );
 
-               if ( _nExecutionResult && m_pDialog )
+        if ( !m_pDialog )
+            return;
+
+        if ( _nExecutionResult )
                        static_cast< DlgOrderCrit* >( m_pDialog 
)->BuildOrderPart();
                else if ( m_xComposer.is() )
-               {
                        m_xComposer->setOrder( static_cast< DlgOrderCrit* >( 
m_pDialog )->GetOrignalOrder() );
-               }
     }
 
 //.........................................................................




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

Reply via email to