User: obo Date: 2006/10/12 06:41:06 Modified: dba/dbaccess/source/ui/misc/WCopyTable.cxx
Log: INTEGRATION: CWS sb59 (1.48.2); FILE MERGED 2006/08/29 11:44:30 sb 1.48.2.1: #i67487# Made code warning-free (wntmsci10). File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.49&r2=1.50 Delta lines: +7 -5 ------------------- --- WCopyTable.cxx 17 Sep 2006 07:14:48 -0000 1.49 +++ WCopyTable.cxx 12 Oct 2006 13:41:03 -0000 1.50 @@ -275,9 +275,11 @@ OCopyTableWizard::~OCopyTableWizard() { DBG_DTOR(OCopyTableWizard,NULL); - TabPage *pPage=0; - while((pPage = GetPage(0))) + for ( ;; ) { + TabPage *pPage = GetPage(0); + if ( pPage == NULL ) + break; RemovePage( pPage ); delete pPage; } @@ -442,7 +444,7 @@ if ( bOnFirstPage && !bCheckOk ) { showColumnTypeNotSupported(m_vSourceVec[nBreakPos-1]->first); - OWizTypeSelect* pPage = reinterpret_cast<OWizTypeSelect*>(GetPage(3)); + OWizTypeSelect* pPage = static_cast<OWizTypeSelect*>(GetPage(3)); if ( pPage ) { pPage->setDisplayRow(nBreakPos); @@ -478,7 +480,7 @@ { case RET_YES: { - OCopyTable* pPage = reinterpret_cast<OCopyTable*>(GetPage(0)); + OCopyTable* pPage = static_cast<OCopyTable*>(GetPage(0)); m_bCreatePrimaryColumn = sal_True; m_aKeyName = pPage->GetKeyName(); sal_Int32 nBreakPos2 = 0; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
