rebase to DEV300_m100

7 files changed, 62 insertions, 120 deletions

diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 0a6e36219ed3..9b5b6eae07f4 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -391,7 +391,7 @@ namespace svx
             {
                 Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() );
                 _pContainer->CopyAny(
-                    sal::static_int_cast< USHORT >( getDescriptorFormatId() ),
+                    sal::static_int_cast< sal_uInt16 >( getDescriptorFormatId() ),
                     aContent );
             }
         }
@@ -497,7 +497,7 @@ namespace svx
     // -----------------------------------------------------------------------------
     sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
     {
-        ULONG nFormat = SotExchange::GetFormat(rFlavor);
+        sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
         switch (nFormat)
         {
             case SOT_FORMATSTR_ID_DBACCESS_TABLE:
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 618c2135652a..b974fe3ff5f3 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -988,7 +988,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
         if ( eInspectorAction != eNone )
         {
             FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
-            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? FALSE : TRUE );
+            SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
 
             pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON,
                                       &aIFaceItem, &aShowItem, 0L );
@@ -1061,7 +1061,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
             if  ( 1 == GetSelectColumnCount() || IsDesignMode() )
             {
                 sal_uInt16 nSelId = GetColumnId(
-                    sal::static_int_cast< USHORT >( FirstSelectedColumn() ) );
+                    sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) );
                 ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
 
                 Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
@@ -1273,7 +1273,7 @@ void FmGridControl::DeleteSelectedRows()
 
         // now delete the row
         Sequence <sal_Int32> aDeletedRows;
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
         try
         {
             aDeletedRows = xDeleteThem->deleteRows(aBookmarks);
@@ -1281,7 +1281,7 @@ void FmGridControl::DeleteSelectedRows()
         catch(SQLException&)
         {
         }
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 
         // how many rows are deleted?
         sal_Int32 nDeletedRows = 0;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index d6a530db85e3..47aeceda995b 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1974,10 +1974,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) )
     {
-        INetURLObject aHID( ::comphelper::getString(Value) );
-        DBG_ASSERT( aHID.GetProtocol() == INET_PROT_HID, "Wrong HelpURL!" );
+        ::rtl::OUString sHelpURL;
+        OSL_VERIFY( Value >>= sHelpURL );
+        INetURLObject aHID( sHelpURL );
         if ( aHID.GetProtocol() == INET_PROT_HID )
-              pGrid->SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
+            sHelpURL = aHID.GetURLPath();
+        pGrid->SetHelpId( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) )
     {
@@ -2073,25 +2075,28 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_HASNAVIGATION ) )
     {
-        if (Value.getValueType() == ::getBooleanCppuType())
-            pGrid->EnableNavigationBar(*(sal_Bool*)Value.getValue());
+        sal_Bool bValue( sal_True );
+        OSL_VERIFY( Value >>= bValue );
+        pGrid->EnableNavigationBar( bValue );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_RECORDMARKER ) )
     {
-        if (Value.getValueType() == ::getBooleanCppuType())
-            pGrid->EnableHandle(*(sal_Bool*)Value.getValue());
+        sal_Bool bValue( sal_True );
+        OSL_VERIFY( Value >>= bValue );
+        pGrid->EnableHandle( bValue );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_ENABLED ) )
     {
-        if (Value.getValueType() == ::getBooleanCppuType())
-        {
-            // Im DesignModus nur das Datenfenster disablen
-            // Sonst kann das Control nicht mehr konfiguriert werden
-            if (isDesignMode())
-                pGrid->GetDataWindow().Enable(*(sal_Bool*)Value.getValue());
-            else
-                pGrid->Enable(*(sal_Bool*)Value.getValue());
-        }
+        sal_Bool bValue( sal_True );
+        OSL_VERIFY( Value >>= bValue );
+        pGrid->EnableHandle( bValue );
+
+        // Im DesignModus nur das Datenfenster disablen
+        // Sonst kann das Control nicht mehr konfiguriert werden
+        if (isDesignMode())
+            pGrid->GetDataWindow().Enable( bValue );
+        else
+            pGrid->Enable( bValue );
     }
     else
         VCLXWindow::setProperty( PropertyName, Value );
@@ -2106,7 +2111,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
     Window* pGrid = GetWindow();
     if ( pGrid )
     {
-        Reference< XAccessible > xAcc( pGrid->GetAccessible( TRUE ) );
+        Reference< XAccessible > xAcc( pGrid->GetAccessible( sal_True ) );
         if ( xAcc.is() )
             xContext = xAcc->getAccessibleContext();
         // TODO: this has a slight conceptual problem:
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 7cdf707eb811..b0ee4fe13a66 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -898,7 +898,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
             {
                 sal_Int16 nWheelBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY;
                 OSL_VERIFY( xModel->getPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) >>= nWheelBehavior );
-                USHORT nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
+                sal_uInt16 nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
                 switch ( nWheelBehavior )
                 {
                 case MouseWheelBehavior::SCROLL_DISABLED:   nVclSetting = MOUSE_WHEEL_DISABLE; break;
@@ -913,7 +913,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
                 MouseSettings aMouseSettings = aSettings.GetMouseSettings();
                 aMouseSettings.SetWheelBehavior( nVclSetting );
                 aSettings.SetMouseSettings( aMouseSettings );
-                m_pWindow->SetSettings( aSettings, TRUE );
+                m_pWindow->SetSettings( aSettings, sal_True );
             }
         }
         catch( const Exception& )
@@ -986,7 +986,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
         m_pPainter->SetTextFillColor( _rDev.GetTextColor() );
 
         Font aFont( _rDev.GetFont() );
-        aFont.SetTransparent( TRUE );
+        aFont.SetTransparent( sal_True );
         m_pPainter->SetFont( aFont );
 
         m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() );
@@ -1193,7 +1193,7 @@ String DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Re
     if ( _rxField.is() )
         try
         {
-            aString = getValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType);
+            aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType);
         }
         catch( const Exception& )
         {
@@ -1534,7 +1534,7 @@ String DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::X
             // ein double-Feld bindet und als Text formatiert, liefert m_rColumn.IsNumeric() sal_True. Das heisst
             // also einfach, dass ich den Inhalt der Variant mittels getDouble abfragen kann, und dann kann
             // ich den Rest (die Formatierung) dem FormattedField ueberlassen.
-            double dValue = getValue(_rxField, m_rColumn.GetParent().getNullDate(), m_nKeyType);
+            double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() );
             if (_rxField->wasNull())
                 return aText;
             ((FormattedField*)m_pPainter)->SetValue(dValue);
@@ -1578,7 +1578,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X
             // ein double-Feld bindet und als Text formatiert, liefert m_rColumn.IsNumeric() sal_True. Das heisst
             // also einfach, dass ich den Inhalt der Variant mittels getDouble abfragen kann, und dann kann
             // ich den Rest (die Formatierung) dem FormattedField ueberlassen.
-            double dValue = getValue(_rxField, m_rColumn.GetParent().getNullDate(), m_nKeyType);
+            double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() );
             if (_rxField->wasNull())
                 m_pWindow->SetText(String());
             else
@@ -2274,13 +2274,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
         static_cast< DateField* >( m_pWindow )->SetMin( nMin );
         static_cast< DateField* >( m_pWindow )->SetMax( nMax );
         static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict );
-        static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+        static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
 
         static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat );
         static_cast< DateField* >( m_pPainter )->SetMin( nMin );
         static_cast< DateField* >( m_pPainter )->SetMax( nMax );
         static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict );
-        static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+        static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
     }
 }
 
@@ -2384,13 +2384,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
         static_cast< TimeField* >( m_pWindow )->SetMin( nMin );
         static_cast< TimeField* >( m_pWindow )->SetMax( nMax );
         static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict );
-        static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+        static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
 
         static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat );
         static_cast< TimeField* >( m_pPainter )->SetMin( nMin );
         static_cast< TimeField* >( m_pPainter )->SetMax( nMax );
         static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict );
-        static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+        static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
     }
 }
 
@@ -2556,7 +2556,7 @@ String DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn
     if (_rxField.is())
         try
         {
-            aString = getValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType );
+            aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType );
         }
         catch( const Exception& )
         {
@@ -3167,7 +3167,7 @@ void DbFilterField::Update()
 
             while (!xListCursor->isAfterLast() && i++ < SHRT_MAX) // max anzahl eintraege
             {
-                aStr = getValue(xDataField, xFormatter, aNullDate, nFormatKey, nKeyType);
+                aStr = getFormattedValue(xDataField, xFormatter, aNullDate, nFormatKey, nKeyType);
                 aStringList.push_back(aStr);
                 xListCursor->next();
             }
@@ -3499,7 +3499,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
 }
 
 //------------------------------------------------------------------------------
-void FmXGridCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -3908,7 +3908,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
 }
 
 //------------------------------------------------------------------------------
-void FmXEditCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -4066,7 +4066,7 @@ Window* FmXCheckBoxCell::getEventWindow() const
 }
 
 //------------------------------------------------------------------
-void FmXCheckBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
     {
@@ -4403,7 +4403,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept
 }
 
 //------------------------------------------------------------------
-void FmXListBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     if  (   ( &_rWindow == m_pBox )
         &&  ( _nEventId == VCLEVENT_LISTBOX_SELECT )
@@ -4617,7 +4617,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run
 }
 
 //------------------------------------------------------------------------------
-void FmXComboBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
 
     switch ( _nEventId )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d54b091c6bd2..38342bf355ea 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -784,7 +784,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
     {
         case STATE_CHANGE_MIRRORING:
         {
-            BOOL bIsRTLEnabled = IsRTLEnabled();
+            sal_Bool bIsRTLEnabled = IsRTLEnabled();
             for ( size_t i=0; i < sizeof( pWindows ) / sizeof( pWindows[0] ); ++i )
                 pWindows[i]->EnableRTL( bIsRTLEnabled );
         }
@@ -945,7 +945,7 @@ DbGridControl::DbGridControl(
             ,m_nDeleteEvent(0)
             ,m_nOptions(OPT_READONLY)
             ,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE)
-            ,m_nLastColId((USHORT)-1)
+            ,m_nLastColId((sal_uInt16)-1)
             ,m_nLastRowId(-1)
             ,m_bDesignMode(sal_False)
             ,m_bRecordCountFinal(sal_False)
@@ -2323,7 +2323,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
     if (nNewPos < 0)    // keine Position gefunden
         return;
 
-    m_bInAdjustDataSource = TRUE;
+    m_bInAdjustDataSource = sal_True;
     if (nNewPos != m_nCurrentPos)
     {
         if (m_bSynchDisplay)
@@ -2341,7 +2341,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
         SetCurrent(nNewPos);
         RowModified(nNewPos);
     }
-    m_bInAdjustDataSource = FALSE;
+    m_bInAdjustDataSource = sal_False;
 
     // Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben
     SetNoSelection();
@@ -2734,7 +2734,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
     }
 }
 // -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const
+String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     DbGridColumn* pColumn = m_aColumns.GetObject( GetModelColumnPos( _nColId ) );
     String sRet;
@@ -3630,7 +3630,7 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const
 }
 
 //------------------------------------------------------------------------------
-void DbGridControl::implAdjustInSolarThread(BOOL _bRows)
+void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows)
 {
     TRACE_RANGE("DbGridControl::implAdjustInSolarThread");
     ::osl::MutexGuard aGuard(m_aAdjustSafety);
@@ -3862,7 +3862,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde
 // -----------------------------------------------------------------------------
 Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
 {
-    USHORT nColumnId = GetColumnId( _nColumnPos );
+    sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
     DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId));
     if ( pColumn )
     {
@@ -3883,7 +3883,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s
                     eValue = STATE_DONTKNOW;
                     break;
             }
-            return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,TRUE );
+            return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True );
         }
     }
     return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos );
diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk
deleted file mode 100644
index aa4e9eaba186..000000000000
--- a/svx/source/fmcomp/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=fmcomp
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=fmcomp
-SRC1FILES= \
-    gridctrl.src	
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-    $(SLO)$/dbaexchange.obj	\
-    $(SLO)$/gridcols.obj	\
-    $(SLO)$/gridctrl.obj	\
-    $(SLO)$/gridcell.obj	\
-    $(SLO)$/fmgridcl.obj	\
-    $(SLO)$/fmgridif.obj	\
-    $(SLO)$/trace.obj       \
-    $(SLO)$/xmlexchg.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-    $(SLO)$/dbaobjectex.obj
-
-.INCLUDE :  target.mk
-
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index f855111c0bc1..a8ab835548ac 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -36,7 +36,7 @@
 
 //------------------------------------------------------------------------------
 ::vos::OMutex Tracer::s_aMapSafety;
-::std::map< ::vos::OThread::TThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
+::std::map< ::vos::OThread::TThreadIdentifier, sal_Int32, ::std::less< ::vos::OThread::TThreadIdentifier > >
         Tracer::s_aThreadIndents;
 
 //------------------------------------------------------------------------------
@@ -44,13 +44,13 @@ Tracer::Tracer(const char* _pBlockDescription)
     :m_sBlockDescription(_pBlockDescription)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
+    sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -64,13 +64,13 @@ Tracer::Tracer(const char* _pBlockDescription)
 Tracer::~Tracer()
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -84,13 +84,13 @@ Tracer::~Tracer()
 void Tracer::TraceString(const char* _pMessage)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -105,13 +105,13 @@ void Tracer::TraceString(const char* _pMessage)
 void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    sal_Int32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::vos::OThread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);