Tag: cws_dev300_odbmacros3 User: fs Date: 2008-05-08 10:10:12+0000 Modified: dba/dbaccess/source/ext/macromigration/macromigrationpages.cxx dba/dbaccess/source/ext/macromigration/macromigrationpages.hxx
Log: adjusted text on the summary page in case of no/success File Changes: Directory: /dba/dbaccess/source/ext/macromigration/ =================================================== File [changed]: macromigrationpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationpages.cxx?r1=1.3.2.2&r2=1.3.2.3 Delta lines: +7 -2 ------------------- --- macromigrationpages.cxx 2008-04-30 09:23:55+0000 1.3.2.2 +++ macromigrationpages.cxx 2008-05-08 10:10:10+0000 1.3.2.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macromigrationpages.cxx,v $ - * $Revision: 1.3.2.2 $ + * $Revision: 1.3.2.3 $ * * This file is part of OpenOffice.org. * @@ -316,6 +316,8 @@ :MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_SUMMARY ) ) ,m_aChangesLabel( this, MacroMigrationResId( FT_CHANGES_LABEL ) ) ,m_aChanges ( this, MacroMigrationResId( ED_CHANGES ) ) + ,m_aSuccessful ( MacroMigrationResId( STR_SUCCESSFUL ) ) + ,m_aUnsuccessful( MacroMigrationResId( STR_UNSUCCESSFUL ) ) { FreeResource(); } @@ -327,9 +329,12 @@ } //-------------------------------------------------------------------- - void ResultPage::displaySummary( const String& _rSummary ) + void ResultPage::displayMigrationLog( const bool _bSuccessful, const String& _rSummary ) { + m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful ); m_aChanges.SetText( _rSummary ); + + // TODO: resize m_aChangesLabel and m_aChances as needed for the label text to fit } //........................................................................ File [changed]: macromigrationpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationpages.hxx?r1=1.3.2.1&r2=1.3.2.2 Delta lines: +4 -2 ------------------- --- macromigrationpages.hxx 2008-04-30 09:23:55+0000 1.3.2.1 +++ macromigrationpages.hxx 2008-05-08 10:10:10+0000 1.3.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macromigrationpages.hxx,v $ - * $Revision: 1.3.2.1 $ + * $Revision: 1.3.2.2 $ * * This file is part of OpenOffice.org. * @@ -168,11 +168,13 @@ static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); - void displaySummary( const String& _rSummary ); + void displayMigrationLog( const bool _bSuccessful, const String& _rLog ); private: FixedText m_aChangesLabel; MultiLineEdit m_aChanges; + String m_aSuccessful; + String m_aUnsuccessful; }; //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
