[dba-cvs] CVS update [cws_src680_oj14]: /dba/dbaccess/source/ui/dlg/paramdialog.cxx

[oj]

Tag: cws_src680_oj14
User: oj      
Date: 2007-06-04 18:28:40+0000
Log:
 RESYNC: (1.15-1.16); FILE MERGED

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.11.4.5&r2=1.11.4.6
Delta lines:  +8 -8
-------------------
--- paramdialog.cxx     2006-11-07 09:24:29+0000        1.11.4.5
+++ paramdialog.cxx     2007-06-04 18:28:37+0000        1.11.4.6
@@ -102,13 +102,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() )  
\
@@ -263,7 +263,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]