Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-26 12:05:09+0000
Modified:
   dba/dbaccess/source/ui/inc/WCPage.hxx
   dba/dbaccess/source/ui/misc/WCPage.cxx
   dba/dbaccess/source/ui/misc/WCopyTable.cxx

Log:
 #i81658# fix setting the PK after the wizard dialog has been created

File Changes:

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

File [changed]: WCPage.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/WCPage.hxx?r1=1.7.28.1&r2=1.7.28.2
Delta lines:  +4 -2
-------------------
--- WCPage.hxx  2007-11-08 14:21:04+0000        1.7.28.1
+++ WCPage.hxx  2007-11-26 12:05:06+0000        1.7.28.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WCPage.hxx,v $
  *
- *  $Revision: 1.7.28.1 $
+ *  $Revision: 1.7.28.2 $
  *
- *  last change: $Author: fs $ $Date: 2007/11/08 14:21:04 $
+ *  last change: $Author: fs $ $Date: 2007/11/26 12:05:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -111,6 +111,8 @@
         {
             m_aRB_View.Disable();
         }
+
+        void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& 
_rSuggestedName );
        };
 }
 #endif // DBAUI_WIZARD_CPAGE_HXX

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

File [changed]: WCPage.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCPage.cxx?r1=1.31.28.2&r2=1.31.28.3
Delta lines:  +13 -2
--------------------
--- WCPage.cxx  2007-11-15 10:05:57+0000        1.31.28.2
+++ WCPage.cxx  2007-11-26 12:05:07+0000        1.31.28.3
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WCPage.cxx,v $
  *
- *  $Revision: 1.31.28.2 $
+ *  $Revision: 1.31.28.3 $
  *
- *  last change: $Author: fs $ $Date: 2007/11/15 10:05:57 $
+ *  last change: $Author: fs $ $Date: 2007/11/26 12:05:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -373,6 +373,17 @@
        return sal_True;
 }
 // 
-----------------------------------------------------------------------------
+void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& 
_rSuggestedName )
+{
+    bool bCreatePK = m_bPKeyAllowed && _bDoCreate;
+    m_aCB_PrimaryColumn.Check( bCreatePK );
+    m_edKeyName.SetText( _rSuggestedName );
+
+    m_aFT_KeyName.Enable( bCreatePK );
+       m_edKeyName.Enable( bCreatePK );
+}
+
+// 
-----------------------------------------------------------------------------
 //---dyf add 2006/7/10
 void OCopyTable::setCreateStyleAction()
 {

File [changed]: WCopyTable.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.53.28.6&r2=1.53.28.7
Delta lines:  +7 -2
-------------------
--- WCopyTable.cxx      2007-11-19 09:49:10+0000        1.53.28.6
+++ WCopyTable.cxx      2007-11-26 12:05:07+0000        1.53.28.7
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: WCopyTable.cxx,v $
  *
- *  $Revision: 1.53.28.6 $
+ *  $Revision: 1.53.28.7 $
  *
- *  last change: $Author: fs $ $Date: 2007/11/19 09:49:10 $
+ *  last change: $Author: fs $ $Date: 2007/11/26 12:05:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -921,6 +921,11 @@
 {
     m_bCreatePrimaryKeyColumn = _bDoCreate;
     m_aKeyName = _rSuggestedName;
+
+    OCopyTable* pSettingsPage = dynamic_cast< OCopyTable* >( GetPage( 0 ) );
+    OSL_ENSURE( pSettingsPage, "OCopyTableWizard::setCreatePrimaryKey: page 
should have been added in the ctor!" );
+    if ( pSettingsPage )
+        pSettingsPage->setCreatePrimaryKey( _bDoCreate, _rSuggestedName );
 }
 
 // -----------------------------------------------------------------------




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

Reply via email to