chart52: merge with DEV300_m100

8 files changed, 18 insertions, 18 deletions

diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
index c015ad25cf38..380b9571509f 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -184,7 +184,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
     class ModuleRes : public ::ResId
     {
     public:
-        ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
     };
 
     //==========================================================================
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
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
index 4a29f7c68e7e..89db7be31eb4 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
@@ -126,8 +126,8 @@ namespace adabasui
         String              m_sDbConfig;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>      m_xCreateCatalog;
         com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xORB;
-        BOOL                m_bRestore;
-        INT8                m_nSetBitmap;
+        sal_Bool                m_bRestore;
+        sal_Int8                m_nSetBitmap;
 
         ::std::auto_ptr<WaitObject>         m_aCreatorWait;
         ::std::auto_ptr<ODatabaseCreator>   m_aCreatorThread;
@@ -150,7 +150,7 @@ namespace adabasui
         OAdabasNewDbDlg(Window* pParent,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog,
                         const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB,
-                        BOOL _bRestore=FALSE);
+                        sal_Bool _bRestore=sal_False);
         virtual ~OAdabasNewDbDlg();
 
         ::rtl::OUString GetDatabaseName()       const { return m_ET_DATABASENAME.GetText(); }
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index 6e2369498137..c0418e7bf02d 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -43,7 +43,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     String getScriptTypeDisplayName( const ScriptType _eType )
     {
-        USHORT nResId( 0 );
+        sal_uInt16 nResId( 0 );
 
         switch ( _eType )
         {
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 5ee29ff5d35f..5eff6ce1ba04 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -213,10 +213,10 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    BOOL MacroMigrationDialog::Close()
+    sal_Bool MacroMigrationDialog::Close()
     {
         if ( m_pData->bMigrationIsRunning )
-            return FALSE;
+            return sal_False;
         return MacroMigrationDialog_Base::Close();
     }
 
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index d2af622316da..323a2422ecd0 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -71,7 +71,7 @@ namespace dbmm
         virtual sal_Bool        onFinish();
 
         // Dialog overridables
-        virtual BOOL    Close();
+        virtual sal_Bool    Close();
         virtual short   Execute();
 
     private:
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index d2a97b995ffc..ad573438ba36 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -397,7 +397,7 @@ namespace dbmm
         }
 
         //----------------------------------------------------------------
-        void lcl_describeErrors( ::rtl::OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const USHORT _nHeadingResId )
+        void lcl_describeErrors( ::rtl::OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
         {
             _rBuffer.appendAscii( "=== " );
             _rBuffer.append     ( String( MacroMigrationResId( _nHeadingResId ) ) );
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index e94f15dbdfbe..d0afc7de090c 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -87,7 +87,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     inline void RangeProgressBar::SetValue( sal_uInt32 _nValue )
     {
-        ProgressBar::SetValue( (USHORT)( 100.0 * _nValue / m_nRange ) );
+        ProgressBar::SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) );
     }
 
     //--------------------------------------------------------------------