diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2007-04-26 06:30:11 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2007-04-26 06:30:11 +0000 |
commit | 311fff4600a23159b283c5ef22f0f4bba64da21f (patch) | |
tree | 77bc7dc5a789d0710cd2cd739f36f21e406384a3 /svx/source/dialog/docrecovery.cxx | |
parent | INTEGRATION: CWS residcleanup (1.8.262); FILE MERGED (diff) | |
download | core-311fff4600a23159b283c5ef22f0f4bba64da21f.tar.gz core-311fff4600a23159b283c5ef22f0f4bba64da21f.zip |
INTEGRATION: CWS residcleanup (1.16.118); FILE MERGED
2007/02/21 22:04:06 pl 1.16.118.1: #i74635# get rid of global ResMgr
Diffstat (limited to 'svx/source/dialog/docrecovery.cxx')
-rw-r--r-- | svx/source/dialog/docrecovery.cxx | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index c008d3d63ff8..df1541c01b13 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docrecovery.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: ihi $ $Date: 2006-12-20 17:52:05 $ + * last change: $Author: rt $ $Date: 2007-04-26 07:30:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -780,14 +780,14 @@ void SAL_CALL PluginProgress::reset() SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) ) - , m_aTitleWin ( this , ResId ( WIN_SAVE_TITLE ) ) - , m_aTitleFT ( this , ResId ( FT_SAVE_TITLE ) ) - , m_aTitleFL ( this , ResId ( FL_SAVE_TITLE ) ) - , m_aDescrFT ( this , ResId ( FT_SAVE_DESCR ) ) - , m_aFileListFT ( this , ResId ( FT_SAVE_FILELIST ) ) - , m_aFileListLB ( this , ResId ( LB_SAVE_FILELIST ) ) - , m_aBottomFL ( this , ResId ( FL_SAVE_BOTTOM ) ) - , m_aOkBtn ( this , ResId ( BT_SAVE_OK ) ) + , m_aTitleWin ( this , SVX_RES ( WIN_SAVE_TITLE ) ) + , m_aTitleFT ( this , SVX_RES ( FT_SAVE_TITLE ) ) + , m_aTitleFL ( this , SVX_RES ( FL_SAVE_TITLE ) ) + , m_aDescrFT ( this , SVX_RES ( FT_SAVE_DESCR ) ) + , m_aFileListFT ( this , SVX_RES ( FT_SAVE_FILELIST ) ) + , m_aFileListLB ( this , SVX_RES ( LB_SAVE_FILELIST ) ) + , m_aBottomFL ( this , SVX_RES ( FL_SAVE_BOTTOM ) ) + , m_aOkBtn ( this , SVX_RES ( BT_SAVE_OK ) ) , m_pCore ( pCore ) { FreeResource(); @@ -872,9 +872,9 @@ void SaveDialog::setDefButton() SaveProgressDialog::SaveProgressDialog(Window* pParent, RecoveryCore* pCore ) : ModalDialog ( pParent , SVX_RES( RID_SVX_MDLG_DOCRECOVERY_PROGR ) ) - , m_aHintFT ( this , ResId ( FT_SAVEPROGR_HINT ) ) - , m_aProgrFT ( this , ResId ( FT_SAVEPROGR_PROGR ) ) - , m_aProgrParent( this , ResId ( WIN_SAVEPROGR_PROGR ) ) + , m_aHintFT ( this , SVX_RES ( FT_SAVEPROGR_HINT ) ) + , m_aProgrFT ( this , SVX_RES ( FT_SAVEPROGR_PROGR ) ) + , m_aProgrParent( this , SVX_RES ( WIN_SAVEPROGR_PROGR ) ) , m_pCore ( pCore ) { FreeResource(); @@ -1012,17 +1012,17 @@ void RecovDocListEntry::Paint(const Point& aPos , RecovDocList::RecovDocList( Window* pParent, const ResId& rResId ) : SvxSimpleTable ( pParent, rResId ) - , m_aGreenCheckImg ( ResId(IMG_GREENCHECK ) ) - , m_aYellowCheckImg ( ResId(IMG_YELLOWCHECK ) ) - , m_aRedCrossImg ( ResId(IMG_REDCROSS ) ) - , m_aGreenCheckImgHC ( ResId(IMG_GREENCHECK_HC ) ) - , m_aYellowCheckImgHC ( ResId(IMG_YELLOWCHECK_HC ) ) - , m_aRedCrossImgHC ( ResId(IMG_REDCROSS_HC ) ) - , m_aSuccessRecovStr ( ResId(STR_SUCCESSRECOV ) ) - , m_aOrigDocRecovStr ( ResId(STR_ORIGDOCRECOV ) ) - , m_aRecovFailedStr ( ResId(STR_RECOVFAILED ) ) - , m_aRecovInProgrStr ( ResId(STR_RECOVINPROGR ) ) - , m_aNotRecovYetStr ( ResId(STR_NOTRECOVYET ) ) + , m_aGreenCheckImg ( ResId(IMG_GREENCHECK,*rResId.GetResMgr() ) ) + , m_aYellowCheckImg ( ResId(IMG_YELLOWCHECK,*rResId.GetResMgr() ) ) + , m_aRedCrossImg ( ResId(IMG_REDCROSS,*rResId.GetResMgr() ) ) + , m_aGreenCheckImgHC ( ResId(IMG_GREENCHECK_HC,*rResId.GetResMgr() ) ) + , m_aYellowCheckImgHC ( ResId(IMG_YELLOWCHECK_HC,*rResId.GetResMgr() ) ) + , m_aRedCrossImgHC ( ResId(IMG_REDCROSS_HC,*rResId.GetResMgr() ) ) + , m_aSuccessRecovStr ( ResId(STR_SUCCESSRECOV,*rResId.GetResMgr() ) ) + , m_aOrigDocRecovStr ( ResId(STR_ORIGDOCRECOV,*rResId.GetResMgr() ) ) + , m_aRecovFailedStr ( ResId(STR_RECOVFAILED,*rResId.GetResMgr() ) ) + , m_aRecovInProgrStr ( ResId(STR_RECOVINPROGR,*rResId.GetResMgr() ) ) + , m_aNotRecovYetStr ( ResId(STR_NOTRECOVYET,*rResId.GetResMgr() ) ) { //SetEntryHeight( short( maGreenCheckImg.GetSizePixel().Height() ) ); } @@ -1061,22 +1061,22 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent , SVX_RES( RID_SVXPAGE_DOCRECOVERY_RECOVER ) ) - , m_aTitleWin ( this , ResId ( WIN_RECOV_TITLE ) ) - , m_aTitleFT ( this , ResId ( FT_RECOV_TITLE ) ) - , m_aTitleFL ( this , ResId ( FL_RECOV_TITLE ) ) - , m_aDescrFT ( this , ResId ( FT_RECOV_DESCR ) ) - , m_aProgressFT ( this , ResId ( FT_RECOV_PROGR ) ) - , m_aProgrParent ( this , ResId ( WIN_RECOV_PROGR ) ) - , m_aFileListFT ( this , ResId ( FT_RECOV_FILELIST ) ) - , m_aFileListLB ( this , ResId ( LB_RECOV_FILELIST ) ) - , m_aBottomFL ( this , ResId ( FL_RECOV_BOTTOM ) ) - , m_aNextBtn ( this , ResId ( BTN_RECOV_NEXT ) ) - , m_aCancelBtn ( this , ResId ( BTN_RECOV_CANCEL ) ) - , m_aNextStr ( ResId ( STR_RECOVERY_NEXT ) ) - , m_aTitleRecoveryInProgress( ResId ( STR_RECOVERY_INPROGRESS ) ) - , m_aTitleRecoveryReport( ResId ( STR_RECOVERY_REPORT ) ) - , m_aRecoveryOnlyFinish ( ResId ( STR_RECOVERYONLY_FINISH ) ) - , m_aRecoveryOnlyFinishDescr( ResId ( STR_RECOVERYONLY_FINISH_DESCR ) ) + , m_aTitleWin ( this , SVX_RES ( WIN_RECOV_TITLE ) ) + , m_aTitleFT ( this , SVX_RES ( FT_RECOV_TITLE ) ) + , m_aTitleFL ( this , SVX_RES ( FL_RECOV_TITLE ) ) + , m_aDescrFT ( this , SVX_RES ( FT_RECOV_DESCR ) ) + , m_aProgressFT ( this , SVX_RES ( FT_RECOV_PROGR ) ) + , m_aProgrParent ( this , SVX_RES ( WIN_RECOV_PROGR ) ) + , m_aFileListFT ( this , SVX_RES ( FT_RECOV_FILELIST ) ) + , m_aFileListLB ( this , SVX_RES ( LB_RECOV_FILELIST ) ) + , m_aBottomFL ( this , SVX_RES ( FL_RECOV_BOTTOM ) ) + , m_aNextBtn ( this , SVX_RES ( BTN_RECOV_NEXT ) ) + , m_aCancelBtn ( this , SVX_RES ( BTN_RECOV_CANCEL ) ) + , m_aNextStr ( SVX_RES ( STR_RECOVERY_NEXT ) ) + , m_aTitleRecoveryInProgress( SVX_RES ( STR_RECOVERY_INPROGRESS ) ) + , m_aTitleRecoveryReport( SVX_RES ( STR_RECOVERY_REPORT ) ) + , m_aRecoveryOnlyFinish ( SVX_RES ( STR_RECOVERYONLY_FINISH ) ) + , m_aRecoveryOnlyFinishDescr( SVX_RES ( STR_RECOVERYONLY_FINISH_DESCR ) ) , m_pDefButton ( NULL ) , m_pCore ( pCore ) , m_eRecoveryState (RecoveryDialog::E_RECOVERY_PREPARED) @@ -1088,7 +1088,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent, { static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 }; m_aFileListLB.SetTabs( &nTabs[0] ); - m_aFileListLB.InsertHeaderEntry( String( ResId( STR_HEADERBAR ) ) ); + m_aFileListLB.InsertHeaderEntry( String( SVX_RES( STR_HEADERBAR ) ) ); FreeResource(); @@ -1458,15 +1458,15 @@ BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent , RecoveryCore* pCore , sal_Bool bBeforeRecovery) : ModalDialog ( pParent, SVX_RES( RID_SVX_MDLG_DOCRECOVERY_BROKEN ) ) - , m_aDescrFT ( this , ResId( FT_BROKEN_DESCR ) ) - , m_aFileListFT ( this , ResId( FT_BROKEN_FILELIST ) ) - , m_aFileListLB ( this , ResId( LB_BROKEN_FILELIST ) ) - , m_aSaveDirFT ( this , ResId( FT_BROKEN_SAVEDIR ) ) - , m_aSaveDirED ( this , ResId( ED_BROKEN_SAVEDIR ) ) - , m_aSaveDirBtn ( this , ResId( BTN_BROKEN_SAVEDIR ) ) - , m_aBottomFL ( this , ResId( FL_BROKEN_BOTTOM ) ) - , m_aOkBtn ( this , ResId( BTN_BROKEN_OK ) ) - , m_aCancelBtn ( this , ResId( BTN_BROKEN_CANCEL ) ) + , m_aDescrFT ( this , SVX_RES( FT_BROKEN_DESCR ) ) + , m_aFileListFT ( this , SVX_RES( FT_BROKEN_FILELIST ) ) + , m_aFileListLB ( this , SVX_RES( LB_BROKEN_FILELIST ) ) + , m_aSaveDirFT ( this , SVX_RES( FT_BROKEN_SAVEDIR ) ) + , m_aSaveDirED ( this , SVX_RES( ED_BROKEN_SAVEDIR ) ) + , m_aSaveDirBtn ( this , SVX_RES( BTN_BROKEN_SAVEDIR ) ) + , m_aBottomFL ( this , SVX_RES( FL_BROKEN_BOTTOM ) ) + , m_aOkBtn ( this , SVX_RES( BTN_BROKEN_OK ) ) + , m_aCancelBtn ( this , SVX_RES( BTN_BROKEN_CANCEL ) ) , m_pCore ( pCore ) , m_bBeforeRecovery (bBeforeRecovery) , m_bExecutionNeeded(sal_False) @@ -1593,14 +1593,14 @@ void BrokenRecoveryDialog::impl_askForSavePath() ErrorRepWelcomeDialog::ErrorRepWelcomeDialog( Window* _pParent, sal_Bool _bAllowBack ) :IExtendedTabPage ( _pParent, SVX_RES( RID_SVXPAGE_ERR_REP_WELCOME ) ) - ,maTitleWin ( this, ResId( WIN_RECOV_TITLE ) ) - ,maTitleFT ( this, ResId( FT_RECOV_TITLE ) ) - ,maTitleFL ( this, ResId( FL_RECOV_TITLE ) ) - ,maDescrFT ( this, ResId( FT_RECOV_DESCR ) ) - ,maBottomFL ( this, ResId( FL_RECOV_BOTTOM ) ) - ,maPrevBtn ( this, ResId( BTN_RECOV_PREV ) ) - ,maNextBtn ( this, ResId( BTN_RECOV_NEXT ) ) - ,maCancelBtn ( this, ResId( BTN_RECOV_CANCEL ) ) + ,maTitleWin ( this, SVX_RES( WIN_RECOV_TITLE ) ) + ,maTitleFT ( this, SVX_RES( FT_RECOV_TITLE ) ) + ,maTitleFL ( this, SVX_RES( FL_RECOV_TITLE ) ) + ,maDescrFT ( this, SVX_RES( FT_RECOV_DESCR ) ) + ,maBottomFL ( this, SVX_RES( FL_RECOV_BOTTOM ) ) + ,maPrevBtn ( this, SVX_RES( BTN_RECOV_PREV ) ) + ,maNextBtn ( this, SVX_RES( BTN_RECOV_NEXT ) ) + ,maCancelBtn ( this, SVX_RES( BTN_RECOV_CANCEL ) ) { FreeResource(); @@ -1700,25 +1700,25 @@ void BrokenRecoveryDialog::impl_askForSavePath() ErrorRepSendDialog::ErrorRepSendDialog( Window* _pParent ) :IExtendedTabPage ( _pParent, SVX_RES( RID_SVXPAGE_ERR_REP_SEND ) ) - ,maTitleWin ( this, ResId( WIN_RECOV_TITLE ) ) - ,maTitleFT ( this, ResId( FT_RECOV_TITLE ) ) - ,maTitleFL ( this, ResId( FL_RECOV_TITLE ) ) - ,maDescrFT ( this, ResId( FT_RECOV_DESCR ) ) - - ,maDocTypeFT ( this, ResId( FT_ERRSEND_DOCTYPE ) ) - ,maDocTypeED ( this, ResId( ED_ERRSEND_DOCTYPE ) ) - ,maUsingFT ( this, ResId( FT_ERRSEND_USING ) ) - ,maUsingML ( this, ResId( ML_ERRSEND_USING ) ) - ,maShowRepBtn ( this, ResId( BTN_ERRSEND_SHOWREP ) ) - ,maOptBtn ( this, ResId( BTN_ERRSEND_OPT ) ) - ,maContactCB ( this, ResId( CB_ERRSEND_CONTACT ) ) - ,maEMailAddrFT ( this, ResId( FT_ERRSEND_EMAILADDR ) ) - ,maEMailAddrED ( this, ResId( ED_ERRSEND_EMAILADDR ) ) - - ,maBottomFL ( this, ResId( FL_RECOV_BOTTOM ) ) - ,maPrevBtn ( this, ResId( BTN_RECOV_PREV ) ) - ,maNextBtn ( this, ResId( BTN_RECOV_NEXT ) ) - ,maCancelBtn ( this, ResId( BTN_RECOV_CANCEL ) ) + ,maTitleWin ( this, SVX_RES( WIN_RECOV_TITLE ) ) + ,maTitleFT ( this, SVX_RES( FT_RECOV_TITLE ) ) + ,maTitleFL ( this, SVX_RES( FL_RECOV_TITLE ) ) + ,maDescrFT ( this, SVX_RES( FT_RECOV_DESCR ) ) + + ,maDocTypeFT ( this, SVX_RES( FT_ERRSEND_DOCTYPE ) ) + ,maDocTypeED ( this, SVX_RES( ED_ERRSEND_DOCTYPE ) ) + ,maUsingFT ( this, SVX_RES( FT_ERRSEND_USING ) ) + ,maUsingML ( this, SVX_RES( ML_ERRSEND_USING ) ) + ,maShowRepBtn ( this, SVX_RES( BTN_ERRSEND_SHOWREP ) ) + ,maOptBtn ( this, SVX_RES( BTN_ERRSEND_OPT ) ) + ,maContactCB ( this, SVX_RES( CB_ERRSEND_CONTACT ) ) + ,maEMailAddrFT ( this, SVX_RES( FT_ERRSEND_EMAILADDR ) ) + ,maEMailAddrED ( this, SVX_RES( ED_ERRSEND_EMAILADDR ) ) + + ,maBottomFL ( this, SVX_RES( FL_RECOV_BOTTOM ) ) + ,maPrevBtn ( this, SVX_RES( BTN_RECOV_PREV ) ) + ,maNextBtn ( this, SVX_RES( BTN_RECOV_NEXT ) ) + ,maCancelBtn ( this, SVX_RES( BTN_RECOV_CANCEL ) ) { FreeResource(); @@ -1889,18 +1889,18 @@ void BrokenRecoveryDialog::impl_askForSavePath() ErrorRepOptionsDialog::ErrorRepOptionsDialog( Window* _pParent, ErrorRepParams& _rParams ) :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_ERR_REP_OPTIONS ) ) - ,maProxyFL( this, ResId( FL_ERROPT_PROXY ) ) - ,maSystemBtn( this, ResId( BTN_ERROPT_SYSTEM ) ) - ,maDirectBtn( this, ResId( BTN_ERROPT_DIRECT ) ) - ,maManualBtn( this, ResId( BTN_ERROPT_MANUAL ) ) - ,maProxyServerFT( this, ResId( FT_ERROPT_PROXYSERVER ) ) - ,maProxyServerEd( this, ResId( ED_ERROPT_PROXYSERVER ) ) - ,maProxyPortFT( this, ResId( FT_ERROPT_PROXYPORT ) ) - ,maProxyPortEd( this, ResId( ED_ERROPT_PROXYPORT ) ) - ,maDescriptionFT( this, ResId( FT_ERROPT_DESCRIPTION ) ) - ,maButtonsFL( this, ResId( FL_ERROPT_BUTTONS ) ) - ,maOKBtn( this, ResId( BTN_ERROPT_OK ) ) - ,maCancelBtn( this, ResId( BTN_ERROPT_CANCEL ) ) + ,maProxyFL( this, SVX_RES( FL_ERROPT_PROXY ) ) + ,maSystemBtn( this, SVX_RES( BTN_ERROPT_SYSTEM ) ) + ,maDirectBtn( this, SVX_RES( BTN_ERROPT_DIRECT ) ) + ,maManualBtn( this, SVX_RES( BTN_ERROPT_MANUAL ) ) + ,maProxyServerFT( this, SVX_RES( FT_ERROPT_PROXYSERVER ) ) + ,maProxyServerEd( this, SVX_RES( ED_ERROPT_PROXYSERVER ) ) + ,maProxyPortFT( this, SVX_RES( FT_ERROPT_PROXYPORT ) ) + ,maProxyPortEd( this, SVX_RES( ED_ERROPT_PROXYPORT ) ) + ,maDescriptionFT( this, SVX_RES( FT_ERROPT_DESCRIPTION ) ) + ,maButtonsFL( this, SVX_RES( FL_ERROPT_BUTTONS ) ) + ,maOKBtn( this, SVX_RES( BTN_ERROPT_OK ) ) + ,maCancelBtn( this, SVX_RES( BTN_ERROPT_CANCEL ) ) ,mrParams( _rParams ) { FreeResource(); @@ -2113,8 +2113,8 @@ void BrokenRecoveryDialog::impl_askForSavePath() ErrorRepPreviewDialog::ErrorRepPreviewDialog( Window* _pParent ) :ModalDialog ( _pParent, SVX_RES( RID_SVX_MDLG_ERR_REP_PREVIEW ) ) - ,maContentML( this, ResId( ML_ERRPREVIEW_CONTENT ) ) - ,maOKBtn( this, ResId( BTN_ERRPREVIEW_OK ) ) + ,maContentML( this, SVX_RES( ML_ERRPREVIEW_CONTENT ) ) + ,maOKBtn( this, SVX_RES( BTN_ERRPREVIEW_OK ) ) { FreeResource(); |