User: rt Date: 2008-01-30 08:48:06+0000 Modified: dba/dbaccess/source/ui/inc/WCPage.hxx
Log: INTEGRATION: CWS dba24d (1.7.28); FILE MERGED 2007/11/26 12:05:06 fs 1.7.28.2: #i81658# fix setting the PK after the wizard dialog has been created 2007/11/08 14:21:04 fs 1.7.28.1: #i81658# re-factoring of the Copy Table wizard 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&r2=1.8 Delta lines: +10 -11 --------------------- --- WCPage.hxx 2007-09-26 14:50:29+0000 1.7 +++ WCPage.hxx 2008-01-30 08:48:04+0000 1.8 @@ -35,12 +35,8 @@ #ifndef DBAUI_WIZARD_CPAGE_HXX #define DBAUI_WIZARD_CPAGE_HXX -#ifndef DBAUI_WIZ_TABBPAGE_HXX #include "WTabPage.hxx" -#endif -#ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX -#include "WCopyTable.hxx" -#endif + #ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" #endif @@ -78,12 +74,11 @@ CheckBox m_aCB_PrimaryColumn; FixedText m_aFT_KeyName; Edit m_edKeyName; - OCopyTableWizard::Wizard_Create_Style m_eOldStyle; + sal_Int16 m_nOldOperation; OWizColumnSelect* m_pPage2; OWizNormalExtend* m_pPage3; - BOOL m_bIsViewAllowed; BOOL m_bPKeyAllowed; @@ -102,7 +97,7 @@ virtual BOOL LeavePage(); virtual String GetTitle() const ; - OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsView );//, OCopyTableWizard::Wizard_Create_Style nLastAction ); + OCopyTable( Window * pParent ); virtual ~OCopyTable(); inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); } @@ -111,9 +106,13 @@ inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); } String GetKeyName() const { return m_edKeyName.GetText(); } - //--------dyf add 2007/7/10 - void setCreateStyleAction();//const OCopyTableWizard::Wizard_Create_Style& _eStyle - //--------add end + void setCreateStyleAction(); + void disallowViews() + { + m_aRB_View.Disable(); + } + + void setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _rSuggestedName ); }; } #endif // DBAUI_WIZARD_CPAGE_HXX --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
