User: hr      
Date: 06/06/19 20:25:28

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

Log:
 INTEGRATION: CWS warnings01 (1.35.74); FILE MERGED
 2006/05/23 23:59:44 sb 1.35.74.3: RESYNC: (1.36-1.37); FILE MERGED
 2006/04/07 20:55:09 sb 1.35.74.2: RESYNC: (1.35-1.36); FILE MERGED
 2006/03/24 15:36:25 fs 1.35.74.1: #i57457# warning-free code (unxlngi6/.pro + 
unxsoli4.pro)

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&r2=1.38
Delta lines:  +4 -5
-------------------
--- JoinController.cxx  19 Apr 2006 13:24:00 -0000      1.37
+++ JoinController.cxx  20 Jun 2006 03:25:26 -0000      1.38
@@ -159,11 +159,12 @@
 using namespace ::dbaui;
 using namespace ::comphelper;
 
-DBG_NAME(OJoinController); 
+DBG_NAME(OJoinController)
 // 
-----------------------------------------------------------------------------
-OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM) 
: OJoinController_BASE(_rM)
-       ,m_bViewsAllowed(sal_True)
+OJoinController::OJoinController(const Reference< XMultiServiceFactory >& _rM)
+    :OJoinController_BASE(_rM)
        ,m_pAddTabDlg(NULL)
+       ,m_bViewsAllowed(sal_True)
 {
        DBG_CTOR(OJoinController,NULL); 
 }
@@ -266,7 +267,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
@@ -279,7 +279,6 @@
                        getJoinView()->setReadOnly(!isEditable());
                        InvalidateAll();
                        return;
-                       break;
                case ID_BROWSER_ADDTABLE:
                        if(!m_pAddTabDlg)
                                m_pAddTabDlg = 
getJoinView()->getAddTableDialog();




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

Reply via email to