Tag: cws_src680_qiq
User: fs      
Date: 2006/06/27 05:51:38

Modified:
   dba/dbaccess/source/ui/querydesign/JoinController.cxx

Log:
 RESYNC: (1.37-1.38); FILE MERGED

File Changes:

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

File [changed]: JoinController.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinController.cxx?r1=1.37.10.3&r2=1.37.10.4
Delta lines:  +7 -8
-------------------
--- JoinController.cxx  19 Jun 2006 09:25:10 -0000      1.37.10.3
+++ JoinController.cxx  27 Jun 2006 12:51:35 -0000      1.37.10.4
@@ -246,10 +246,11 @@
 // = OJoinController
 // 
=============================================================================
 
-DBG_NAME(OJoinController); 
+DBG_NAME(OJoinController)
 // 
-----------------------------------------------------------------------------
-OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM) 
: OJoinController_BASE(_rM)
-       ,m_pAddTableDialog( NULL )
+OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM)
+    :OJoinController_BASE(_rM)
+    ,m_pAddTableDialog(NULL)
 {
        DBG_CTOR(OJoinController,NULL); 
 }
@@ -377,7 +378,6 @@
                                        case RET_CANCEL:
                                                // don't change anything here 
so return
                                                return;
-                                               break;
                                        case RET_NO:
                                                reset();
                                                setModified(sal_False);         
// and we are not modified yet
@@ -390,7 +390,6 @@
                        getJoinView()->setReadOnly(!isEditable());
                        InvalidateAll();
                        return;
-                       break;
                case ID_BROWSER_ADDTABLE:
                        if ( !m_pAddTableDialog )
                                m_pAddTableDialog = new OAddTableDlg( 
getView(), impl_getDialogContext() );




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

Reply via email to