diff options
author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
---|---|---|
committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
commit | 8b35f0adebc482200cc5ff6622f81c9cc4067035 (patch) | |
tree | 3db8f52e1af776a06fe97549877caa0ace10e406 /dbaccess/source/ext/adabas/AdabasNewDb.cxx | |
parent | f720ab73332799d3a19fd5f077ca05c93c0ebcf7 (diff) | |
parent | b1708ffb49872b51c2b7d82380efeb1282d73b1c (diff) |
chart52: merge with DEV300_m100
Diffstat (limited to 'dbaccess/source/ext/adabas/AdabasNewDb.cxx')
-rw-r--r-- | dbaccess/source/ext/adabas/AdabasNewDb.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index d4a68435a548..4bbc9d12cca7 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -176,7 +176,7 @@ DBG_NAME( OAdabasNewDbDlg ) OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, const Reference<XCreateCatalog>& _rxCreateCatalog, const Reference< XMultiServiceFactory >& _rxORB, - BOOL _bRestore) + sal_Bool _bRestore) :ModalDialog( pParent, ModuleRes( DLG_ADABAS_NEWDB )) ,m_FT_DATABASENAME( this, ModuleRes( FT_DATABASENAME ) ) ,m_ET_DATABASENAME( this, ModuleRes( ET_DATABASENAME ) ) @@ -269,7 +269,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_DOMAIN_USR.Enable(FALSE); + m_ET_DOMAIN_USR.Enable(sal_False); // m_ET_SYSUSR.setUpperCase(); // m_ET_CONUSR.setUpperCase(); @@ -399,7 +399,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_CONUSR.SetText(String::CreateFromAscii("CONTROL")); m_PB_OK.SetClickHdl(LINK(this,OAdabasNewDbDlg,ImplOKHdl)); - m_PB_OK.Enable(FALSE); + m_PB_OK.Enable(sal_False); m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); @@ -485,7 +485,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) } - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; { // we need url @@ -509,13 +509,13 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) else if(m_ET_SYSUSR.GetText() == m_ET_CONUSR.GetText()) aErrorMessage = String(ModuleRes(STR_NO_SAME_USER)); else - bOk = TRUE; + bOk = sal_True; if (!bOk) { ErrorBox(this, WB_OK, aErrorMessage).Execute(); - return FALSE; + return sal_False; } sal_Int32 nPos = 0; @@ -560,7 +560,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) m_aCreatorThread->setTerminateHandler(LINK(this,OAdabasNewDbDlg,TerminateHdl)); m_aCreatorThread->create(); - return TRUE; + return sal_True; } //------------------------------------------------------------------------- IMPL_LINK( OAdabasNewDbDlg, TerminateHdl, void*, /*NOTUSABLE*/ ) @@ -747,7 +747,7 @@ IMPL_LINK( OAdabasNewDbDlg, PwdClickHdl, Button *, pButton ) //------------------------------------------------------------------------ void OAdabasNewDbDlg::CheckBitmaps() { - INT16 i=0; + sal_Int16 i=0; if(m_ConPwd.Len() && m_ET_CONUSR.GetText().Len()) i++,m_BMP_CON.SetImage(ModuleRes(((m_nSetBitmap & 2) == 2) ? DEFAULT_BLUE : CHECK_GREEN)); else |