User: rt Date: 2007/04/26 01:00:52 Modified: dba/dbaccess/source/ui/dlg/paramdialog.cxx
Log: INTEGRATION: CWS residcleanup (1.15.80); FILE MERGED 2007/02/26 22:58:49 pl 1.15.80.1: #i74635# no more ResMgr default File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: paramdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/paramdialog.cxx?r1=1.15&r2=1.16 Delta lines: +8 -8 ------------------- --- paramdialog.cxx 17 Sep 2006 07:11:07 -0000 1.15 +++ paramdialog.cxx 26 Apr 2007 08:00:50 -0000 1.16 @@ -99,13 +99,13 @@ //------------------------------------------------------------------------------ #define INIT_MEMBERS() \ :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ - ,m_aNamesFrame (this, ResId(FL_PARAMS)) \ - ,m_aAllParams (this, ResId(LB_ALLPARAMS)) \ - ,m_aValueFrame (this, ResId(FT_VALUE)) \ - ,m_aParam (this, ResId(ET_PARAM)) \ - ,m_aTravelNext (this, ResId(BT_TRAVELNEXT)) \ - ,m_aOKBtn (this, ResId(BT_OK)) \ - ,m_aCancelBtn (this, ResId(BT_CANCEL)) \ + ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ + ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ + ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ + ,m_aParam (this, ModuleRes(ET_PARAM)) \ + ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ + ,m_aOKBtn (this, ModuleRes(BT_OK)) \ + ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ ,m_xConnection(_rxConnection) \ ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ @@ -260,7 +260,7 @@ String sMessage; { LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG); - sMessage = String(ResId(STR_COULD_NOT_CONVERT_PARAM)); + sMessage = String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM)); } sMessage.SearchAndReplaceAll(String::CreateFromAscii("$name$"), sName.getStr()); ErrorBox(NULL, WB_OK, sMessage).Execute(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
